diff --git a/Makefile.in b/Makefile.in
index 33f4ae725..cd6e53232 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
 THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
 THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
 THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 qtdmdb_s = @qtdmdb_s@
 qthread_asflags = @qthread_asflags@
@@ -105,9 +105,10 @@ CONFIG_CLEAN_FILES =
 DATA =  $(aclocal_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 config.guess \
-config.sub configure configure.in install-sh ltconfig ltmain.sh \
-mdate-sh missing mkinstalldirs
+Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 aclocal.m4 \
+config.guess config.sub configure configure.in install-sh \
+libguile/scmconfig.h.in libguile/stamp-h.in ltconfig ltmain.sh mdate-sh \
+missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -131,6 +132,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
+libguile/scmconfig.h: libguile/stamp-h
+	@if test ! -f $@; then \
+		rm -f libguile/stamp-h; \
+		$(MAKE) libguile/stamp-h; \
+	else :; fi
+libguile/stamp-h: $(srcdir)/libguile/scmconfig.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=libguile/scmconfig.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > libguile/stamp-h 2> /dev/null
+$(srcdir)/libguile/scmconfig.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/libguile/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/libguile/stamp-h.in; \
+		$(MAKE) $(srcdir)/libguile/stamp-h.in; \
+	else :; fi
+$(srcdir)/libguile/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/libguile/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f libguile/scmconfig.h
+
+maintainer-clean-hdr:
+
 install-aclocalDATA: $(aclocal_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(aclocaldir)
@@ -339,29 +368,30 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-tags clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-tags distclean-generic clean-am
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: uninstall-aclocalDATA install-aclocalDATA install-data-recursive \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+uninstall-aclocalDATA install-aclocalDATA install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f420826d9..dccb151de 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
 THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
 THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
 THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 qtdmdb_s = @qtdmdb_s@
 qthread_asflags = @qthread_asflags@
diff --git a/guile-config/Makefile.in b/guile-config/Makefile.in
index d95c3dacf..a40bc3f3b 100644
--- a/guile-config/Makefile.in
+++ b/guile-config/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
 THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
 THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
 THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 qtdmdb_s = @qtdmdb_s@
 qthread_asflags = @qthread_asflags@
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 593ede62a..9511b1538 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
 THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
 THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
 THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 qtdmdb_s = @qtdmdb_s@
 qthread_asflags = @qthread_asflags@
@@ -103,10 +103,10 @@ bin_PROGRAMS = guile
 guile_SOURCES = guile.c
 guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
 
-libguile_la_SOURCES =      alist.c arbiters.c async.c backtrace.c boolean.c chars.c		    continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c	    evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c	    genio.c gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c	    gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c		    ioext.c keywords.c list.c load.c macros.c mallocs.c markers.c	    modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c	    ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c	    root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c		    srcprop.c stackchk.c stacks.c stime.c strings.c strop.c strorder.c	    strports.c struct.c symbols.c tag.c throw.c unif.c variable.c	    vectors.c version.c vports.c weaks.c
+libguile_la_SOURCES =      alist.c arbiters.c async.c backtrace.c boolean.c chars.c		    continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c	    evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c	    genio.c gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c	    gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c		    ioext.c keywords.c list.c load.c macros.c mallocs.c			    modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c	    ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c	    root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c		    srcprop.c stackchk.c stacks.c stime.c strings.c strop.c strorder.c	    strports.c struct.c symbols.c tag.c throw.c unif.c variable.c	    vectors.c version.c vports.c weaks.c
 
 
-BUILT_SOURCES =      cpp_err_symbols.c cpp_sig_symbols.c libpath.h alist.x arbiters.x	    async.x backtrace.x boolean.x chars.x continuations.x debug.x	    dynl.x dynwind.x eq.x error.x eval.x evalext.x feature.x filesys.x	    fluids.x fports.x gc.x gdbint.x genio.x gh_data.x gh_eval.x		    gh_funcs.x gh_init.x gh_io.x gh_list.x gh_predicates.x gsubr.x	    guardians.x hash.x hashtab.x init.x ioext.x iselect.x keywords.x	    list.x load.x macros.x mallocs.x markers.x modules.x net_db.x	    numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x	    print.x procprop.x procs.x random.x ramap.x read.x regex-posix.x	    root.x scmsigs.x script.x simpos.x smob.x socket.x sort.x		    srcprop.x stackchk.x stacks.x stime.x strings.x strop.x strorder.x	    strports.x struct.x symbols.x tag.x threads.x throw.x unif.x	    variable.x vectors.x version.x vports.x weaks.x
+BUILT_SOURCES =      cpp_err_symbols.c cpp_sig_symbols.c libpath.h alist.x arbiters.x	    async.x backtrace.x boolean.x chars.x continuations.x debug.x	    dynl.x dynwind.x eq.x error.x eval.x evalext.x feature.x filesys.x	    fluids.x fports.x gc.x gdbint.x genio.x gh_data.x gh_eval.x		    gh_funcs.x gh_init.x gh_io.x gh_list.x gh_predicates.x gsubr.x	    guardians.x hash.x hashtab.x init.x ioext.x iselect.x keywords.x	    list.x load.x macros.x mallocs.x modules.x net_db.x			    numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x	    print.x procprop.x procs.x random.x ramap.x read.x regex-posix.x	    root.x scmsigs.x script.x simpos.x smob.x socket.x sort.x		    srcprop.x stackchk.x stacks.x stime.x strings.x strop.x strorder.x	    strports.x struct.x symbols.x tag.x threads.x throw.x unif.x	    variable.x vectors.x version.x vports.x weaks.x
 
 
 EXTRA_libguile_la_SOURCES = _scm.h     strerror.c inet_aton.c putenv.c     threads.c alloca.c     regex-posix.c iselect.c
@@ -125,7 +125,7 @@ pkginclude_HEADERS = gh.h
 
 # These are headers visible as <libguile/mumble.h>.
 modincludedir = $(includedir)/libguile
-modinclude_HEADERS =      __scm.h alist.h arbiters.h async.h backtrace.h boolean.h chars.h	    continuations.h debug.h dynl.h dynwind.h eq.h error.h eval.h	    evalext.h feature.h filesys.h fports.h gc.h gdb_interface.h		    gdbint.h genio.h gsubr.h guardians.h hash.h hashtab.h init.h	    ioext.h keywords.h kw.h list.h load.h macros.h mallocs.h markers.h	    modules.h net_db.h numbers.h objects.h objprop.h options.h pairs.h	    ports.h posix.h regex-posix.h print.h procprop.h procs.h random.h	    ramap.h read.h root.h scmsigs.h script.h simpos.h smob.h socket.h	    sort.h srcprop.h stackchk.h stacks.h stime.h strings.h strop.h	    strorder.h strports.h struct.h symbols.h tag.h tags.h throw.h	    unif.h variable.h vectors.h version.h vports.h weaks.h snarf.h	    threads.h coop-defs.h fluids.h iselect.h
+modinclude_HEADERS =      __scm.h alist.h arbiters.h async.h backtrace.h boolean.h chars.h	    continuations.h debug.h dynl.h dynwind.h eq.h error.h eval.h	    evalext.h feature.h filesys.h fports.h gc.h gdb_interface.h		    gdbint.h genio.h gsubr.h guardians.h hash.h hashtab.h init.h	    ioext.h keywords.h kw.h list.h load.h macros.h mallocs.h 		    modules.h net_db.h numbers.h objects.h objprop.h options.h pairs.h	    ports.h posix.h regex-posix.h print.h procprop.h procs.h random.h	    ramap.h read.h root.h scmsigs.h script.h simpos.h smob.h socket.h	    sort.h srcprop.h stackchk.h stacks.h stime.h strings.h strop.h	    strorder.h strports.h struct.h symbols.h tag.h tags.h throw.h	    unif.h variable.h vectors.h version.h vports.h weaks.h snarf.h	    threads.h coop-defs.h fluids.h iselect.h
 
 
 modinclude_DATA = scmconfig.h
@@ -168,13 +168,12 @@ error.lo eval.lo evalext.lo feature.lo filesys.lo fluids.lo fports.lo \
 gc.lo gdbint.lo genio.lo gh_data.lo gh_eval.lo gh_funcs.lo gh_init.lo \
 gh_io.lo gh_list.lo gh_predicates.lo gsubr.lo guardians.lo hash.lo \
 hashtab.lo init.lo ioext.lo keywords.lo list.lo load.lo macros.lo \
-mallocs.lo markers.lo modules.lo net_db.lo numbers.lo objects.lo \
-objprop.lo options.lo pairs.lo ports.lo posix.lo print.lo procprop.lo \
-procs.lo ramap.lo random.lo read.lo root.lo scmsigs.lo script.lo \
-simpos.lo smob.lo socket.lo sort.lo srcprop.lo stackchk.lo stacks.lo \
-stime.lo strings.lo strop.lo strorder.lo strports.lo struct.lo \
-symbols.lo tag.lo throw.lo unif.lo variable.lo vectors.lo version.lo \
-vports.lo weaks.lo
+mallocs.lo modules.lo net_db.lo numbers.lo objects.lo objprop.lo \
+options.lo pairs.lo ports.lo posix.lo print.lo procprop.lo procs.lo \
+ramap.lo random.lo read.lo root.lo scmsigs.lo script.lo simpos.lo \
+smob.lo socket.lo sort.lo srcprop.lo stackchk.lo stacks.lo stime.lo \
+strings.lo strop.lo strorder.lo strports.lo struct.lo symbols.lo tag.lo \
+throw.lo unif.lo variable.lo vectors.lo version.lo vports.lo weaks.lo
 PROGRAMS =  $(bin_PROGRAMS)
 
 guile_OBJECTS =  guile.o
@@ -217,18 +216,18 @@ DEP_FILES =  .deps/alist.P .deps/alloca.P .deps/arbiters.P .deps/async.P \
 .deps/gh_test_repl.P .deps/gsubr.P .deps/guardians.P .deps/guile.P \
 .deps/hash.P .deps/hashtab.P .deps/inet_aton.P .deps/init.P \
 .deps/ioext.P .deps/iselect.P .deps/keywords.P .deps/list.P \
-.deps/load.P .deps/macros.P .deps/mallocs.P .deps/markers.P \
-.deps/modules.P .deps/net_db.P .deps/numbers.P .deps/objects.P \
-.deps/objprop.P .deps/options.P .deps/pairs.P .deps/ports.P \
-.deps/posix.P .deps/print.P .deps/procprop.P .deps/procs.P \
-.deps/putenv.P .deps/ramap.P .deps/random.P .deps/read.P \
-.deps/regex-posix.P .deps/root.P .deps/scmsigs.P .deps/script.P \
-.deps/simpos.P .deps/smob.P .deps/socket.P .deps/sort.P .deps/srcprop.P \
-.deps/stackchk.P .deps/stacks.P .deps/stime.P .deps/strerror.P \
-.deps/strings.P .deps/strop.P .deps/strorder.P .deps/strports.P \
-.deps/struct.P .deps/symbols.P .deps/tag.P .deps/threads.P \
-.deps/throw.P .deps/unif.P .deps/variable.P .deps/vectors.P \
-.deps/version.P .deps/vports.P .deps/weaks.P
+.deps/load.P .deps/macros.P .deps/mallocs.P .deps/modules.P \
+.deps/net_db.P .deps/numbers.P .deps/objects.P .deps/objprop.P \
+.deps/options.P .deps/pairs.P .deps/ports.P .deps/posix.P .deps/print.P \
+.deps/procprop.P .deps/procs.P .deps/putenv.P .deps/ramap.P \
+.deps/random.P .deps/read.P .deps/regex-posix.P .deps/root.P \
+.deps/scmsigs.P .deps/script.P .deps/simpos.P .deps/smob.P \
+.deps/socket.P .deps/sort.P .deps/srcprop.P .deps/stackchk.P \
+.deps/stacks.P .deps/stime.P .deps/strerror.P .deps/strings.P \
+.deps/strop.P .deps/strorder.P .deps/strports.P .deps/struct.P \
+.deps/symbols.P .deps/tag.P .deps/threads.P .deps/throw.P .deps/unif.P \
+.deps/variable.P .deps/vectors.P .deps/version.P .deps/vports.P \
+.deps/weaks.P
 SOURCES = $(libguile_la_SOURCES) $(EXTRA_libguile_la_SOURCES) $(guile_SOURCES) $(gh_test_c_SOURCES) $(gh_test_repl_SOURCES)
 OBJECTS = $(libguile_la_OBJECTS) $(guile_OBJECTS) $(gh_test_c_OBJECTS) $(gh_test_repl_OBJECTS)
 
diff --git a/qt/Makefile.in b/qt/Makefile.in
index bd95dadd3..df0e4acec 100644
--- a/qt/Makefile.in
+++ b/qt/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
 THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
 THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
 THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 qtdmdb_s = @qtdmdb_s@
 qthread_asflags = @qthread_asflags@
diff --git a/qt/md/Makefile.in b/qt/md/Makefile.in
index 208f0cf23..dc08ee64f 100644
--- a/qt/md/Makefile.in
+++ b/qt/md/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
 THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
 THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
 THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 qtdmdb_s = @qtdmdb_s@
 qthread_asflags = @qthread_asflags@
diff --git a/qt/time/Makefile.in b/qt/time/Makefile.in
index 66debdecb..d0bbdf1f8 100644
--- a/qt/time/Makefile.in
+++ b/qt/time/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
 THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
 THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
 THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 qtdmdb_s = @qtdmdb_s@
 qthread_asflags = @qthread_asflags@