diff --git a/libguile/_scm.h b/libguile/_scm.h
index bbc2a6b44..dd1ac5eb0 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -36,7 +36,6 @@
 
 /* Include headers for those files central to the implementation.  The
    rest should be explicitly #included in the C files themselves.  */
-#include "libguile/gsubr.h"	/* Everyone defines global functions.  */
 #include "libguile/procs.h"	/* Same.  */
 #include "libguile/numbers.h"	/* Everyone deals with fixnums.  */
 #include "libguile/symbols.h"	/* For length, chars, values, miscellany.  */
diff --git a/libguile/snarf.h b/libguile/snarf.h
index 7719ff6f4..e20ac6488 100644
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -26,6 +26,7 @@
 
 
 #include <libguile/gc.h>
+#include <libguile/gsubr.h>
 
 /* Macros for snarfing initialization actions from C source. */