9 files changed, 15 insertions, 23 deletions
diff --git a/extra/gc.c b/extra/gc.c
index 6805a629..64ea4088 100644
--- a/extra/gc.c
+++ b/extra/gc.c
@@ -46,7 +46,6 @@
 #include "../obj_map.c"
 #include "../ptr_chck.c"
 
-#include "gc/gc_inline.h"
 #include "../allchblk.c"
 #include "../alloc.c"
 #include "../dbg_mlc.c"
diff --git a/fnlz_mlc.c b/fnlz_mlc.c
index 06d0fb84..746dc9b4 100644
--- a/fnlz_mlc.c
+++ b/fnlz_mlc.c
@@ -17,7 +17,6 @@
 #ifdef ENABLE_DISCLAIM
 
 #include "gc/gc_disclaim.h"
-#include "gc/gc_inline.h" /* for GC_malloc_kind */
 #include "private/dbg_mlc.h" /* for oh type */
 
 #if defined(KEEP_BACK_PTRS) || defined(MAKE_BACK_GRAPH)
diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index cc840026..0188bc28 100644
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -309,6 +309,19 @@ typedef int GC_bool;
 #   define GC_FAR
 #endif
 
+#ifdef GC_ASSERTIONS
+# define GC_ASSERT(expr) \
+        do { \
+          if (EXPECT(!(expr), FALSE)) { \
+            GC_err_printf("Assertion failure: %s:%d\n", __FILE__, __LINE__); \
+            ABORT("assertion failure"); \
+          } \
+        } while (0)
+#else
+# define GC_ASSERT(expr)
+#endif
+
+#include "gc/gc_inline.h"
 
 /*********************************/
 /*                               */
@@ -1734,8 +1747,8 @@ GC_EXTERN struct obj_kind {
 #endif /* SEPARATE_GLOBALS */
 
 /* Predefined kinds: */
-#define PTRFREE 0
-#define NORMAL  1
+#define PTRFREE GC_I_PTRFREE
+#define NORMAL  GC_I_NORMAL
 #define UNCOLLECTABLE 2
 #ifdef GC_ATOMIC_UNCOLLECTABLE
 # define AUNCOLLECTABLE 3
@@ -2869,18 +2882,8 @@ GC_INNER void *GC_store_debug_info_inner(void *p, word sz, const char *str,
 #endif /* NEED_PROC_MAPS */
 
 #ifdef GC_ASSERTIONS
-# define GC_ASSERT(expr) \
-              do { \
-                if (!(expr)) { \
-                  GC_err_printf("Assertion failure: %s:%d\n", \
-                                __FILE__, __LINE__); \
-                  ABORT("assertion failure"); \
-                } \
-              } while (0)
   GC_INNER word GC_compute_large_free_bytes(void);
   GC_INNER word GC_compute_root_size(void);
-#else
-# define GC_ASSERT(expr)
 #endif
 
 /* Check a compile time assertion at compile time.      */
diff --git a/include/private/thread_local_alloc.h b/include/private/thread_local_alloc.h
index 80c02360..12048209 100644
--- a/include/private/thread_local_alloc.h
+++ b/include/private/thread_local_alloc.h
@@ -26,8 +26,6 @@
 
 #ifdef THREAD_LOCAL_ALLOC
 
-#include "gc/gc_inline.h"
-
 #if defined(USE_HPUX_TLS)
 # error USE_HPUX_TLS macro was replaced by USE_COMPILER_TLS
 #endif
diff --git a/malloc.c b/malloc.c
index de47776c..df3b330f 100644
--- a/malloc.c
+++ b/malloc.c
@@ -15,7 +15,6 @@
  */
 
 #include "private/gc_priv.h"
-#include "gc/gc_inline.h" /* for GC_malloc_kind */
 
 #include <string.h>
 
diff --git a/mallocx.c b/mallocx.c
index bccab7cf..cb6dec07 100644
--- a/mallocx.c
+++ b/mallocx.c
@@ -16,7 +16,6 @@
  */
 
 #include "private/gc_priv.h"
-#include "gc/gc_inline.h" /* for GC_malloc_kind */
 
 /*
  * These are extra allocation routines which are likely to be less
diff --git a/pthread_support.c b/pthread_support.c
index 7bf782fd..6c46ea4b 100644
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -45,8 +45,6 @@
 # endif
 # include <signal.h>
 
-# include "gc/gc_inline.h"
-
 #if defined(GC_DARWIN_THREADS)
 # include "private/darwin_semaphore.h"
 #else
diff --git a/reclaim.c b/reclaim.c
index 77d877ca..e9ce779a 100644
--- a/reclaim.c
+++ b/reclaim.c
@@ -595,8 +595,6 @@ void GC_print_block_list(void)
               (unsigned long)pstats.total_bytes);
 }
 
-#include "gc/gc_inline.h" /* for GC_print_free_list prototype */
-
 /* Currently for debugger use only: */
 GC_API void GC_CALL GC_print_free_list(int kind, size_t sz_in_granules)
 {
diff --git a/typd_mlc.c b/typd_mlc.c
index 50530881..56f14632 100644
--- a/typd_mlc.c
+++ b/typd_mlc.c
@@ -15,7 +15,6 @@
  */
 
 #include "private/gc_pmark.h"
-#include "gc/gc_inline.h" /* for GC_malloc_kind */
 
 /*
  * Some simple primitives for allocation with explicit type information.