1 files changed, 2 insertions, 16 deletions

diff --git a/src/solvers/h48/map.h b/src/solvers/h48/map.h
index e74a5dd..e6903ce 100644
--- a/src/solvers/h48/map.h
+++ b/src/solvers/h48/map.h
@@ -1,19 +1,5 @@
-#define MAP_UNSET             UINT64_C(0xFFFFFFFFFFFFFFFF)
-#define MAP_KEYMASK           UINT64_C(0xFFFFFFFFFF)
-#define MAP_KEYSHIFT          UINT64_C(40)
-#define MAP_UNSET_VAL         (MAP_UNSET >> MAP_KEYSHIFT)
-
-typedef struct {
-        uint64_t n;
-        uint64_t capacity;
-        uint64_t randomizer;
-        uint64_t *table;
-} h48map_t;
-
-typedef struct {
-        uint64_t key;
-        uint64_t val;
-} kvpair_t;
+/* Type definitions and macros are in a separate file for easier testing */
+#include "map_types_macros.h"
 
 STATIC void h48map_create(h48map_t *, uint64_t, uint64_t);
 STATIC void h48map_clear(h48map_t *);