diff --git a/libguile/_scm.h b/libguile/_scm.h
index e35bf2122..01c99c01b 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/foreign.h"	/* Snarfing needs the foreign data structures. */
 #include "libguile/programs.h"	/* ... and program.h. */
 #include "libguile/strings.h"
 
diff --git a/libguile/eq.c b/libguile/eq.c
index 51f656446..d6e914934 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -36,6 +36,7 @@
 #include "libguile/bytevectors.h"
 #include "libguile/eq.h"
 #include "libguile/eval.h"
+#include "libguile/foreign.h"
 #include "libguile/generalized-arrays.h"
 #include "libguile/goops.h"
 #include "libguile/hashtab.h"
diff --git a/libguile/goops.c b/libguile/goops.c
index f3304d4d0..dac7c1e2e 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -35,6 +35,7 @@
 #include "libguile/dynwind.h"
 #include "libguile/eval.h"
 #include "libguile/extensions.h"
+#include "libguile/foreign.h"
 #include "libguile/gsubr.h"
 #include "libguile/hashtab.h"
 #include "libguile/keywords.h"
diff --git a/libguile/hash.c b/libguile/hash.c
index 18a878d3b..69227f210 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -34,6 +34,7 @@
 #include "libguile/_scm.h"
 #include "libguile/gsubr.h"
 #include "libguile/chars.h"
+#include "libguile/foreign.h"
 #include "libguile/pairs.h"
 #include "libguile/ports.h"
 #include "libguile/numbers.h"
diff --git a/libguile/init.c b/libguile/init.c
index cd5e67558..a9e946cb9 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -61,6 +61,7 @@
 #include "libguile/filesys.h"
 #include "libguile/finalizers.h"
 #include "libguile/fluids.h"
+#include "libguile/foreign.h"
 #include "libguile/fports.h"
 #include "libguile/frames.h"
 #include "libguile/gc.h"
diff --git a/libguile/print.c b/libguile/print.c
index 477eaed6d..f6231d90f 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -39,6 +39,7 @@
 #include "libguile/smob.h"
 #include "libguile/control.h"
 #include "libguile/eval.h"
+#include "libguile/foreign.h"
 #include "libguile/goops.h"
 #include "libguile/hashtab.h"
 #include "libguile/weak-set.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 98e3e3e16..0d34e6906 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -50,6 +50,7 @@
 #include "libguile/keywords.h"
 #include "libguile/dynwind.h"
 #include "libguile/extensions.h"
+#include "libguile/foreign.h"
 #include "libguile/alist.h"
 #include "libguile/modules.h"
 #include "libguile/numbers.h"