diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
index adbe0c84f..212fbca89 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -32,7 +32,7 @@ TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
 
 test_cflags =					\
   -I$(top_srcdir)/test-suite/standalone		\
-  -I$(top_srcdir)				\
+  -I$(top_srcdir) -I$(top_builddir)		\
   -I$(top_srcdir)/lib -I$(top_builddir)/lib	\
   $(EXTRA_DEFS) $(GUILE_CFLAGS) $(GCC_CFLAGS)
 
@@ -40,7 +40,7 @@ AM_LDFLAGS = $(GUILE_CFLAGS)
 
 snarfcppopts =								\
   $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS) -I$(top_srcdir)	\
-  -I$(top_srcdir)/lib -I$(top_builddir)/lib
+  -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_builddir)
 
 SUFFIXES = .x
 .c.x:
diff --git a/test-suite/standalone/test-asmobs-lib.c b/test-suite/standalone/test-asmobs-lib.c
index 88cf847c5..b85f923cd 100644
--- a/test-suite/standalone/test-asmobs-lib.c
+++ b/test-suite/standalone/test-asmobs-lib.c
@@ -15,6 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 
 long asmob000;
diff --git a/test-suite/standalone/test-gh.c b/test-suite/standalone/test-gh.c
index b273b4499..9f1601a8e 100644
--- a/test-suite/standalone/test-gh.c
+++ b/test-suite/standalone/test-gh.c
@@ -17,6 +17,10 @@
 
 /* some bits originally by Jim Blandy <jimb@red-bean.com> */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 #include <libguile/gh.h>
 
diff --git a/test-suite/standalone/test-list.c b/test-suite/standalone/test-list.c
index 3396dff83..02634f676 100644
--- a/test-suite/standalone/test-list.c
+++ b/test-suite/standalone/test-list.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 
 #include <stdio.h>
diff --git a/test-suite/standalone/test-num2integral.c b/test-suite/standalone/test-num2integral.c
index d2de418e9..1e8a016d5 100644
--- a/test-suite/standalone/test-num2integral.c
+++ b/test-suite/standalone/test-num2integral.c
@@ -15,6 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 
 #include <stdio.h>
diff --git a/test-suite/standalone/test-with-guile-module.c b/test-suite/standalone/test-with-guile-module.c
index 14d3afdc7..babc22b22 100644
--- a/test-suite/standalone/test-with-guile-module.c
+++ b/test-suite/standalone/test-with-guile-module.c
@@ -15,6 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <pthread.h>
 #include <libguile.h>