diff --git a/libguile/gc.c b/libguile/gc.c
index 0ea860e4d..4fb2350c8 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -240,7 +240,7 @@ static void alloc_some_heap (scm_freelist_t *);
 
 /* Debugging functions.  */
 
-#ifdef GUILE_DEBUG_FREELIST
+#if defined (GUILE_DEBUG) || defined (GUILE_DEBUG_FREELIST)
 
 /* Return the number of the heap segment containing CELL.  */
 static int
@@ -330,6 +330,9 @@ SCM_DEFINE (scm_map_free_list, "map-free-list", 0, 0, 0,
 }
 #undef FUNC_NAME
 
+#endif
+
+#ifdef GUILE_DEBUG_FREELIST
 
 /* Number of calls to SCM_NEWCELL since startup.  */
 static unsigned long scm_newcell_count;
diff --git a/libguile/gc.h b/libguile/gc.h
index 49cabacab..b10a38d5a 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -111,8 +111,10 @@ extern unsigned long scm_cells_allocated;
 extern long scm_mallocated;
 extern unsigned long scm_mtrigger;
 
-#ifdef GUILE_DEBUG_FREELIST
+#if defined (GUILE_DEBUG) || defined (GUILE_DEBUG_FREELIST)
 extern SCM scm_map_free_list (void);
+#endif
+#ifdef GUILE_DEBUG_FREELIST
 extern SCM scm_debug_newcell (void);
 extern SCM scm_debug_newcell2 (void);
 extern SCM scm_gc_set_debug_check_freelist_x (SCM flag);