diff --git a/Directory.cxx b/Directory.cxx
index bdc298fdfdf9f3a73345e938ee9bb35f64b32926..4d84223edaa54889ffbf2f2c3c7db66a12c947a4 100644
--- a/Directory.cxx
+++ b/Directory.cxx
@@ -26,6 +26,7 @@
 # include "Configure.hxx.in"
 # include "kwsys_stl.hxx.in"
 # include "kwsys_stl_string.hxx.in"
+# include "kwsys_stl_vector.hxx.in"
 #endif
 
 namespace KWSYS_NAMESPACE
diff --git a/Registry.cxx b/Registry.cxx
index 6e75c66e05e59b7224964685859189a72aa646f0..80d98979463c3b201e3a80048f8ab669e40d74e4 100644
--- a/Registry.cxx
+++ b/Registry.cxx
@@ -21,6 +21,18 @@
 #include KWSYS_HEADER(ios/iostream)
 #include KWSYS_HEADER(ios/fstream)
 #include KWSYS_HEADER(ios/sstream)
+// Work-around CMake dependency scanning limitation.  This must
+// duplicate the above list of headers.
+#if 0
+# include "Registry.hxx.in"
+# include "Configure.hxx.in"
+# include "kwsys_stl.hxx.in"
+# include "kwsys_stl_string.hxx.in"
+# include "kwsys_stl_map.hxx.in"
+# include "kwsys_ios_iostream.h.in"
+# include "kwsys_ios_fstream.h.in"
+# include "kwsys_ios_sstream.h.in"
+#endif
 
 #include <ctype.h> // for isspace
 #include <stdio.h>