diff --git a/CommandLineArguments.cxx b/CommandLineArguments.cxx
index 36368368bf58433dd5538cedc5e4d51aa56d4154..f713294da0e6cee5ec4a9fd51360c95c0e92d351 100644
--- a/CommandLineArguments.cxx
+++ b/CommandLineArguments.cxx
@@ -20,6 +20,7 @@
 #if 0
 # include "CommandLineArguments.hxx.in"
 # include "Configure.hxx.in"
+# include "String.hxx.in"
 #endif
 
 #include <vector>
diff --git a/ProcessWin32.c b/ProcessWin32.c
index 1f8749fbeaf7923ffe75506c6a17c52329c8e37c..eabd85fee51b14e1906a9f591775b4de11eac2d4 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -17,7 +17,7 @@
    duplicate the above list of headers.  */
 #if 0
 # include "Process.h.in"
-# include "Encoding_c.h.in"
+# include "Encoding.h.in"
 #endif
 
 /*
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index cddcc8dcb6e3a90bf03b6786d4dae0b86ad4a875..a33bb6f9abdae623931f4fbeb9cd74880739bdd2 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -43,7 +43,6 @@
 #if 0
 # include "SystemInformation.hxx.in"
 # include "Process.h.in"
-# include "Configure.hxx.in"
 #endif
 
 #include <iostream>
diff --git a/SystemTools.cxx b/SystemTools.cxx
index e3428f87832cae1dc42edd63b28c6d0b0893d1ec..3d8c79ab6e5199207a8ba4853d142caf0fbc9cc8 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -39,6 +39,7 @@
 // Work-around CMake dependency scanning limitation.  This must
 // duplicate the above list of headers.
 #if 0
+# include "RegularExpression.hxx.in"
 # include "SystemTools.hxx.in"
 # include "Directory.hxx.in"
 # include "FStream.hxx.in"
diff --git a/testHashSTL.cxx b/testHashSTL.cxx
index ab1f83e78026abcde42fe44bb646f752f97ecb89..ae66cebead079200285d3ff47287a042e81e3ad1 100644
--- a/testHashSTL.cxx
+++ b/testHashSTL.cxx
@@ -18,7 +18,6 @@
 #if 0
 # include "hash_map.hxx.in"
 # include "hash_set.hxx.in"
-# include "hashtable.hxx.in"
 #endif
 
 #include <iostream>
diff --git a/testIOS.cxx b/testIOS.cxx
index 396a09d47d01ec6e9c70b9991b3bdde0a2b5a5be..5ff7955bfa7d4e9496eaff2352bd89de0ade17a9 100644
--- a/testIOS.cxx
+++ b/testIOS.cxx
@@ -18,6 +18,12 @@
 #include <vector>
 #include <string.h> /* strlen */
 
+// Work-around CMake dependency scanning limitation.  This must
+// duplicate the above list of headers.
+#if 0
+# include "Configure.hxx.in"
+#endif
+
 int testIOS(int, char*[])
 {
   std::ostringstream ostr;