diff --git a/aclocal.m4 b/aclocal.m4
index 36e3fda6f..ab6c5e5e6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.1i
+dnl aclocal.m4 generated automatically by aclocal 1.1k
 
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
diff --git a/ice-9/aclocal.m4 b/ice-9/aclocal.m4
index e659bad01..3036d6424 100644
--- a/ice-9/aclocal.m4
+++ b/ice-9/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.1i
+dnl aclocal.m4 generated automatically by aclocal 1.1k
 
 
 dnl Usage: AM_INIT_GUILE_MODULE(module-name)
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 37a272bef..0251b440e 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -37,9 +37,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-FD_SETTER = @FD_SETTER@
 RANLIB = @RANLIB@
 CC = @CC@
+FD_SETTER = @FD_SETTER@
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -109,7 +109,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(LDFLAGS) -o $@
 DATA =  $(modinclude_DATA)
 
-HEADERS =  $(include_HEADERS) $(modinclude_HEADERS)
+HEADERS =  $(modinclude_HEADERS) $(include_HEADERS)
 
 DIST_COMMON =  COPYING ChangeLog Makefile.am Makefile.in acconfig.h \
 acinclude.m4 aclocal.m4 configure configure.in fd.h.in scmconfig.h.in \
@@ -248,18 +248,6 @@ uninstall-modincludeDATA:
 	  rm -f $(modincludedir)/$$p; \
 	done
 
-install-includeHEADERS: $(include_HEADERS)
-	$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(includedir)
-	list="$(include_HEADERS)"; for p in $$list; do \
-	  $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \
-	done
-
-uninstall-includeHEADERS:
-	list="$(include_HEADERS)"; for p in $$list; do \
-	  rm -f $(includedir)/$$p; \
-	done
-
 install-modincludeHEADERS: $(modinclude_HEADERS)
 	$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(modincludedir)
@@ -272,6 +260,18 @@ uninstall-modincludeHEADERS:
 	  rm -f $(modincludedir)/$$p; \
 	done
 
+install-includeHEADERS: $(include_HEADERS)
+	$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(includedir)
+	list="$(include_HEADERS)"; for p in $$list; do \
+	  $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \
+	done
+
+uninstall-includeHEADERS:
+	list="$(include_HEADERS)"; for p in $$list; do \
+	  rm -f $(includedir)/$$p; \
+	done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES)
@@ -355,11 +355,11 @@ distclean-depend:
 maintainer-clean-depend:
 	rm -rf .deps
 
-.deps/%.P: $(srcdir)/%@EXT@
+.deps/%.P: $(srcdir)/%.c
 	@echo "Computing dependencies for $<..."
 	@o='o';				\
-ONLYC	test -n "$o" && o='$$o';	\
-	$(@MKDEP@) $< | sed "s/^\(.*\)\.o:/\1.$$o \1.l$$o:/" > $@
+	test -n "$o" && o='$$o';	\
+	$(MKDEP) $< | sed "s/^\(.*\)\.o:/\1.$$o \1.l$$o:/" > $@
 info:
 dvi:
 check: all
@@ -368,21 +368,21 @@ installcheck:
 install-exec: install-libLIBRARIES
 	$(NORMAL_INSTALL)
 
-install-data: install-modincludeDATA install-includeHEADERS install-modincludeHEADERS
+install-data: install-modincludeDATA install-modincludeHEADERS install-includeHEADERS
 	$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
 
-uninstall: uninstall-libLIBRARIES uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS
+uninstall: uninstall-libLIBRARIES uninstall-modincludeDATA uninstall-modincludeHEADERS uninstall-includeHEADERS
 
 all: $(LIBRARIES) $(DATA) $(HEADERS) Makefile scmconfig.h
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 installdirs:
-	$(mkinstalldirs)  $(libdir) $(modincludedir) $(includedir) \
-		$(modincludedir)
+	$(mkinstalldirs)  $(libdir) $(modincludedir) $(modincludedir) \
+		$(includedir)
 
 
 mostlyclean-generic:
@@ -423,14 +423,14 @@ maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \
 clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
 install-libLIBRARIES mostlyclean-compile distclean-compile \
 clean-compile maintainer-clean-compile uninstall-modincludeDATA \
-install-modincludeDATA uninstall-includeHEADERS install-includeHEADERS \
-uninstall-modincludeHEADERS install-modincludeHEADERS tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info dvi installcheck install-exec install-data \
-install uninstall all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+install-modincludeDATA uninstall-modincludeHEADERS \
+install-modincludeHEADERS uninstall-includeHEADERS \
+install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend info dvi installcheck install-exec \
+install-data install uninstall all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 libpath.h: Makefile
diff --git a/libguile/aclocal.m4 b/libguile/aclocal.m4
index 7b063e779..cce323288 100644
--- a/libguile/aclocal.m4
+++ b/libguile/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.1i
+dnl aclocal.m4 generated automatically by aclocal 1.1k
 
 dnl  On the NeXT, #including <utime.h> doesn't give you a definition for
 dnl  struct utime, unless you #define _POSIX_SOURCE.
diff --git a/qt/Makefile.in b/qt/Makefile.in
index 6bdc3b327..421853667 100644
--- a/qt/Makefile.in
+++ b/qt/Makefile.in
@@ -37,15 +37,15 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-host_triplet = @host@
 host_alias = @host_alias@
-target_libs = @target_libs@
+host_triplet = @host@
 RANLIB = @RANLIB@
-qtmdb_s = @qtmdb_s@
-qtmds_s = @qtmds_s@
-qtmdc_c = @qtmdc_c@
 qtmd_h = @qtmd_h@
 CC = @CC@
+target_libs = @target_libs@
+qtmdc_c = @qtmdc_c@
+qtmds_s = @qtmds_s@
+qtmdb_s = @qtmdb_s@
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -277,11 +277,11 @@ distclean-depend:
 maintainer-clean-depend:
 	rm -rf .deps
 
-.deps/%.P: $(srcdir)/%@EXT@
+.deps/%.P: $(srcdir)/%.c
 	@echo "Computing dependencies for $<..."
 	@o='o';				\
-ONLYC	test -n "$o" && o='$$o';	\
-	$(@MKDEP@) $< | sed "s/^\(.*\)\.o:/\1.$$o \1.l$$o:/" > $@
+	test -n "$o" && o='$$o';	\
+	$(MKDEP) $< | sed "s/^\(.*\)\.o:/\1.$$o \1.l$$o:/" > $@
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
diff --git a/qt/aclocal.m4 b/qt/aclocal.m4
index 36f9ce0ae..470d957aa 100644
--- a/qt/aclocal.m4
+++ b/qt/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.1i
+dnl aclocal.m4 generated automatically by aclocal 1.1k
 
 
 dnl Usage: AM_INIT_GUILE_MODULE(module-name)
diff --git a/qt/md/Makefile.in b/qt/md/Makefile.in
index a19bd9072..bf775f47b 100644
--- a/qt/md/Makefile.in
+++ b/qt/md/Makefile.in
@@ -37,15 +37,15 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-host_triplet = @host@
 host_alias = @host_alias@
-target_libs = @target_libs@
+host_triplet = @host@
 RANLIB = @RANLIB@
-qtmdb_s = @qtmdb_s@
-qtmds_s = @qtmds_s@
-qtmdc_c = @qtmdc_c@
 qtmd_h = @qtmd_h@
 CC = @CC@
+target_libs = @target_libs@
+qtmdc_c = @qtmdc_c@
+qtmds_s = @qtmds_s@
+qtmdb_s = @qtmdb_s@
 
 AUTOMAKE_OPTIONS = foreign
 
diff --git a/qt/time/Makefile.in b/qt/time/Makefile.in
index b874aa975..d7b3d04c8 100644
--- a/qt/time/Makefile.in
+++ b/qt/time/Makefile.in
@@ -37,15 +37,15 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-host_triplet = @host@
 host_alias = @host_alias@
-target_libs = @target_libs@
+host_triplet = @host@
 RANLIB = @RANLIB@
-qtmdb_s = @qtmdb_s@
-qtmds_s = @qtmds_s@
-qtmdc_c = @qtmdc_c@
 qtmd_h = @qtmd_h@
 CC = @CC@
+target_libs = @target_libs@
+qtmdc_c = @qtmdc_c@
+qtmds_s = @qtmds_s@
+qtmdb_s = @qtmdb_s@
 
 AUTOMAKE_OPTIONS = foreign