diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 6384fa57d..5b2516973 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -744,7 +744,6 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	@echo '#define SCM_EXTENSIONS_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp
 	@echo '#define SCM_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp
 	@echo '#define SCM_SITE_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache"' >> libpath.tmp
-	@echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> libpath.tmp
 	@echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
 	@echo '	{ "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
 	@echo ' { "top_srcdir",    "@top_srcdir_absolute@" }, \' >> libpath.tmp
diff --git a/libguile/atomic.c b/libguile/atomic.c
index 714ae47c4..604a21e5a 100644
--- a/libguile/atomic.c
+++ b/libguile/atomic.c
@@ -29,6 +29,7 @@
 #include "extensions.h"
 #include "gsubr.h"
 #include "ports.h"
+#include "version.h"
 
 #include "atomic.h"
 
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 1602995a9..203bb835e 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -52,6 +52,7 @@
 #include "strings.h"
 #include "symbols.h"
 #include "uniform.h"
+#include "version.h"
 
 #include "bytevectors.h"
 
diff --git a/libguile/control.c b/libguile/control.c
index c659f8c89..5e24bb706 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -33,6 +33,7 @@
 #include "pairs.h"
 #include "programs.h"
 #include "threads.h"
+#include "version.h"
 #include "vm.h"
 
 #include "control.h"
diff --git a/libguile/extensions.h b/libguile/extensions.h
index 7b46cbada..fc690a48b 100644
--- a/libguile/extensions.h
+++ b/libguile/extensions.h
@@ -23,7 +23,6 @@
 
 
 #include "libguile/scm.h"
-#include "libguile/libpath.h"
 
 
 
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 192288f46..4b3fced02 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -31,6 +31,7 @@
 #include "numbers.h"
 #include "pairs.h"
 #include "threads.h"
+#include "version.h"
 
 #include "fdes-finalizers.h"
 
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index 7e72c2fa7..21dc2c007 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -35,6 +35,7 @@
 #include "procs.h"
 #include "threads.h"
 #include "variable.h"
+#include "version.h"
 
 #include "foreign-object.h"
 
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 68fa5b256..1368cc9da 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -49,6 +49,7 @@
 #include "symbols.h"
 #include "threads.h"
 #include "weak-table.h"
+#include "version.h"
 
 #include "foreign.h"
 
diff --git a/libguile/fports.c b/libguile/fports.c
index b805fa1a0..9aa2ea963 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -67,6 +67,7 @@
 #include "symbols.h"
 #include "syscalls.h"
 #include "variable.h"
+#include "version.h"
 
 #include "fports.h"
 
diff --git a/libguile/frames.c b/libguile/frames.c
index 0ad40edd3..0bb40579c 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -36,6 +36,7 @@
 #include "symbols.h"
 #include "threads.h"
 #include "variable.h"
+#include "version.h"
 #include "vm.h"
 
 #include "frames.h"
diff --git a/libguile/goops.c b/libguile/goops.c
index 5908c5823..fd312a8f1 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -53,6 +53,7 @@
 #include "symbols.h"
 #include "variable.h"
 #include "vectors.h"
+#include "version.h"
 #include "weak-table.h"
 
 #include "goops.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index a01ea8128..65cfbc7e9 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -47,6 +47,7 @@
 #include "threads.h"
 #include "values.h"
 #include "variable.h"
+#include "version.h"
 
 #include "i18n.h"
 
diff --git a/libguile/instructions.c b/libguile/instructions.c
index a9fdc0c19..ddd88b311 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -28,6 +28,7 @@
 #include "pairs.h"
 #include "symbols.h"
 #include "threads.h"
+#include "version.h"
 
 #include "instructions.h"
 
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c
index 0e7fbb4e0..a619fda90 100644
--- a/libguile/intrinsics.c
+++ b/libguile/intrinsics.c
@@ -36,6 +36,7 @@
 #include "numbers.h"
 #include "symbols.h"
 #include "threads.h"
+#include "version.h"
 
 #include "intrinsics.h"
 
diff --git a/libguile/ioext.c b/libguile/ioext.c
index 896eb279e..d08b68df3 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -48,6 +48,7 @@
 #include "strings.h"
 #include "syscalls.h"
 #include "weak-set.h"
+#include "version.h"
 
 #include "ioext.h"
 
diff --git a/libguile/load.c b/libguile/load.c
index aac789ba9..f6ad92de8 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -60,6 +60,7 @@
 #include "symbols.h"
 #include "throw.h"
 #include "variable.h"
+#include "version.h"
 #include "vm.h" /* for load-compiled/vm */
 
 #include "load.h"
diff --git a/libguile/loader.c b/libguile/loader.c
index f4ddfedf5..bf3f9de36 100644
--- a/libguile/loader.c
+++ b/libguile/loader.c
@@ -47,6 +47,7 @@
 #include "programs.h"
 #include "strings.h"
 #include "threads.h"
+#include "version.h"
 
 #include "loader.h"
 
diff --git a/libguile/poll.c b/libguile/poll.c
index 08d4c14f0..82281fff0 100644
--- a/libguile/poll.c
+++ b/libguile/poll.c
@@ -39,6 +39,7 @@
 #include "ports-internal.h"
 #include "syscalls.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "poll.h"
 
diff --git a/libguile/ports.c b/libguile/ports.c
index 263bb2fef..4a2e384db 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -77,6 +77,7 @@
 #include "syscalls.h"
 #include "variable.h"
 #include "vectors.h"
+#include "version.h"
 #include "weak-set.h"
 
 #include "ports.h"
diff --git a/libguile/posix.c b/libguile/posix.c
index 2e3fed67a..2ad6c89bb 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -85,6 +85,7 @@
 #include "threads.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "posix.h"
 
diff --git a/libguile/programs.c b/libguile/programs.c
index 274114762..a5f540ac8 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -35,6 +35,7 @@
 #include "ports.h"
 #include "procprop.h" /* scm_sym_name */
 #include "variable.h"
+#include "version.h"
 #include "vm.h"
 
 #include "programs.h"
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 4c78a867b..279114f10 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -40,6 +40,7 @@
 #include "syscalls.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "r6rs-ports.h"
 
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index 0c7944847..ca812935a 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -38,6 +38,7 @@
 #include "procs.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "srfi-1.h"
 
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 2fe8bc040..578106e8e 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -32,6 +32,7 @@
 #include "list.h"
 #include "numbers.h"
 #include "pairs.h"
+#include "version.h"
 
 #include "srfi-60.h"
 
diff --git a/libguile/threads.c b/libguile/threads.c
index bec7e706b..0e010629d 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -63,6 +63,7 @@
 #include "strings.h"
 #include "symbols.h"
 #include "variable.h"
+#include "version.h"
 #include "vm.h"
 
 #include "threads.h"
diff --git a/libguile/unicode.c b/libguile/unicode.c
index c932c1084..a48a2225a 100644
--- a/libguile/unicode.c
+++ b/libguile/unicode.c
@@ -34,6 +34,7 @@
 #include "extensions.h"
 #include "gsubr.h"
 #include "strings.h"
+#include "version.h"
 
 #include "unicode.h"
 
diff --git a/libguile/vm.c b/libguile/vm.c
index db7816acb..d6b76f9fe 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -69,6 +69,7 @@
 #include "symbols.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 #include "vm-builtins.h"
 
 #include "vm.h"
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index 1d682614d..b087891f6 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -32,6 +32,7 @@
 #include "list.h"
 #include "pairs.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "weak-vector.h"