diff --git a/Makefile b/Makefile
index ecf35b3e3..0363edc06 100644
--- a/Makefile
+++ b/Makefile
@@ -8,16 +8,16 @@ ALL_TESTS=$(foreach COLLECTOR,$(COLLECTORS),$(addprefix $(COLLECTOR)-,$(TESTS)))
 
 all: $(ALL_TESTS)
 
-bdw-%: bdw.h conservative-roots.h %.c
+bdw-%: bdw.h conservative-roots.h %-types.h %.c
 	$(CC) $(CFLAGS) -DNDEBUG -lpthread `pkg-config --libs --cflags bdw-gc` -I. -DGC_BDW -o $@ $*.c
 
-semi-%: semi.h precise-roots.h %.c
+semi-%: semi.h precise-roots.h %-types.h heap-objects.h %.c
 	$(CC) $(CFLAGS) -I. -DNDEBUG -DGC_SEMI -o $@ $*.c
 
-mark-sweep-%: mark-sweep.h precise-roots.h serial-marker.h assert.h debug.h %.c
+mark-sweep-%: mark-sweep.h precise-roots.h serial-marker.h assert.h debug.h %-types.h heap-objects.h %.c
 	$(CC) $(CFLAGS) -I. -Wno-unused -DNDEBUG -DGC_MARK_SWEEP -o $@ $*.c
 
-parallel-mark-sweep-%: mark-sweep.h precise-roots.h parallel-marker.h assert.h debug.h %.c
+parallel-mark-sweep-%: mark-sweep.h precise-roots.h parallel-marker.h assert.h debug.h %-types.h heap-objects.h %.c
 	$(CC) $(CFLAGS) -I. -Wno-unused -DNDEBUG -DGC_PARALLEL_MARK_SWEEP -lpthread -o $@ $*.c
 
 check: $(addprefix test-$(TARGET),$(TARGETS))
diff --git a/gcbench-types.h b/gcbench-types.h
index 20cef8be4..a61b2b7d5 100644
--- a/gcbench-types.h
+++ b/gcbench-types.h
@@ -1,30 +1,10 @@
 #ifndef GCBENCH_TYPES_H
 #define GCBENCH_TYPES_H
 
-#include "inline.h"
-
 #define FOR_EACH_HEAP_OBJECT_KIND(M) \
   M(node, Node, NODE) \
   M(double_array, DoubleArray, DOUBLE_ARRAY)
 
-#define DECLARE_NODE_TYPE(name, Name, NAME) \
-  struct Name;                              \
-  typedef struct Name Name;
-FOR_EACH_HEAP_OBJECT_KIND(DECLARE_NODE_TYPE)
-#undef DECLARE_NODE_TYPE
-
-#define DEFINE_ENUM(name, Name, NAME) ALLOC_KIND_##NAME,
-enum alloc_kind {
-  FOR_EACH_HEAP_OBJECT_KIND(DEFINE_ENUM)
-};
-#undef DEFINE_ENUM
-
-#define DEFINE_METHODS(name, Name, NAME) \
-  static inline size_t name##_size(Name *obj) ALWAYS_INLINE; \
-  static inline void visit_##name##_fields(Name *obj,\
-                                           void (*visit)(void **loc, void *visit_data), \
-                                           void *visit_data) ALWAYS_INLINE;
-FOR_EACH_HEAP_OBJECT_KIND(DEFINE_METHODS)
-#undef DEFINE_METHODS
+#include "heap-objects.h"
 
 #endif // GCBENCH_TYPES_H
diff --git a/heap-objects.h b/heap-objects.h
new file mode 100644
index 000000000..db78e7b66
--- /dev/null
+++ b/heap-objects.h
@@ -0,0 +1,26 @@
+#ifndef HEAP_OBJECTS_H
+#define HEAP_OBJECTS_H
+
+#include "inline.h"
+
+#define DECLARE_NODE_TYPE(name, Name, NAME) \
+  struct Name;                              \
+  typedef struct Name Name;
+FOR_EACH_HEAP_OBJECT_KIND(DECLARE_NODE_TYPE)
+#undef DECLARE_NODE_TYPE
+
+#define DEFINE_ENUM(name, Name, NAME) ALLOC_KIND_##NAME,
+enum alloc_kind {
+  FOR_EACH_HEAP_OBJECT_KIND(DEFINE_ENUM)
+};
+#undef DEFINE_ENUM
+
+#define DEFINE_METHODS(name, Name, NAME) \
+  static inline size_t name##_size(Name *obj) ALWAYS_INLINE; \
+  static inline void visit_##name##_fields(Name *obj,\
+                                           void (*visit)(void **loc, void *visit_data), \
+                                           void *visit_data) ALWAYS_INLINE;
+FOR_EACH_HEAP_OBJECT_KIND(DEFINE_METHODS)
+#undef DEFINE_METHODS
+
+#endif // HEAP_OBJECTS_H