diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 35f637266..7061f5dd2 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -22,6 +22,8 @@
 #include "cmMakefile.h"
 #include "cmCPluginAPI.h"
 
+#include "cmSourceFile.h"
+
 extern "C" 
 {
   
diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx
index 28323d370..f39d1ecb1 100644
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@@ -16,6 +16,8 @@
 =========================================================================*/
 #include "cmFLTKWrapUICommand.h"
 
+#include "cmSourceFile.h"
+
 // cmFLTKWrapUICommand
 bool cmFLTKWrapUICommand::InitialPass(std::vector<std::string> const& args)
 {
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx
index 43063af66..296ff0cb9 100644
--- a/Source/cmGetCMakePropertyCommand.cxx
+++ b/Source/cmGetCMakePropertyCommand.cxx
@@ -16,6 +16,8 @@
 =========================================================================*/
 #include "cmGetCMakePropertyCommand.h"
 
+#include "cmake.h"
+
 // cmGetCMakePropertyCommand
 bool cmGetCMakePropertyCommand::InitialPass(
   std::vector<std::string> const& args)
diff --git a/Source/cmGetSourceFilePropertyCommand.cxx b/Source/cmGetSourceFilePropertyCommand.cxx
index 8e4d3b280..51404ef9d 100644
--- a/Source/cmGetSourceFilePropertyCommand.cxx
+++ b/Source/cmGetSourceFilePropertyCommand.cxx
@@ -16,6 +16,8 @@
 =========================================================================*/
 #include "cmGetSourceFilePropertyCommand.h"
 
+#include "cmSourceFile.h"
+
 // cmSetSourceFilePropertyCommand
 bool cmGetSourceFilePropertyCommand::InitialPass(
   std::vector<std::string> const& args)
diff --git a/Source/cmLoadCacheCommand.h b/Source/cmLoadCacheCommand.h
index 1eef5b8f2..40d6cf8ef 100644
--- a/Source/cmLoadCacheCommand.h
+++ b/Source/cmLoadCacheCommand.h
@@ -17,6 +17,8 @@
 #ifndef cmLoadCacheCommand_h
 #define cmLoadCacheCommand_h
 
+#include "cmCommand.h"
+
 /** \class cmLoadCacheCommand
  * \brief load a cache file
  *
diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h
index 3448f4a5d..88225bf1b 100644
--- a/Source/cmOutputRequiredFilesCommand.h
+++ b/Source/cmOutputRequiredFilesCommand.h
@@ -18,6 +18,7 @@
 #define cmOutputRequiredFilesCommand_h
 
 #include "cmCommand.h"
+#include "cmMakeDepend.h"
 
 /** \class cmOutputRequiredFilesCommand
  * \brief Output a list of required files for a source file
diff --git a/Source/cmQTWrapCPPCommand.h b/Source/cmQTWrapCPPCommand.h
index 5e755d257..fd2e88c39 100644
--- a/Source/cmQTWrapCPPCommand.h
+++ b/Source/cmQTWrapCPPCommand.h
@@ -19,6 +19,8 @@
 
 #include "cmCommand.h"
 
+#include "cmSourceFile.h"
+
 /** \class cmQTWrapCPPCommand
  * \brief Create moc file rules for QT classes
  *
diff --git a/Source/cmQTWrapUICommand.h b/Source/cmQTWrapUICommand.h
index 793d2b021..cf0046d62 100644
--- a/Source/cmQTWrapUICommand.h
+++ b/Source/cmQTWrapUICommand.h
@@ -19,6 +19,8 @@
 
 #include "cmCommand.h"
 
+#include "cmSourceFile.h"
+
 /** \class cmQTWrapUICommand
  * \brief Create .h and .cxx files rules for QT user interfaces files
  *
diff --git a/Source/cmSetSourceFilesPropertiesCommand.cxx b/Source/cmSetSourceFilesPropertiesCommand.cxx
index 49768a015..4ce53a5b6 100644
--- a/Source/cmSetSourceFilesPropertiesCommand.cxx
+++ b/Source/cmSetSourceFilesPropertiesCommand.cxx
@@ -16,6 +16,8 @@
 =========================================================================*/
 #include "cmSetSourceFilesPropertiesCommand.h"
 
+#include "cmSourceFile.h"
+
 // cmSetSourceFilesPropertiesCommand
 bool cmSetSourceFilesPropertiesCommand::InitialPass(
   std::vector<std::string> const& args)
diff --git a/Source/cmSourceFilesCommand.cxx b/Source/cmSourceFilesCommand.cxx
index 0655c2078..4dd978c50 100644
--- a/Source/cmSourceFilesCommand.cxx
+++ b/Source/cmSourceFilesCommand.cxx
@@ -15,6 +15,9 @@
 
 =========================================================================*/
 #include "cmSourceFilesCommand.h"
+
+#include "cmSourceFile.h"
+
 #include <stdlib.h> // required for atof
 
 bool cmSourceFilesCommand::IsDeprecated(int major, int minor)
diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index 05cce86c1..53223cf44 100644
--- a/Source/cmUseMangledMesaCommand.h
+++ b/Source/cmUseMangledMesaCommand.h
@@ -19,6 +19,8 @@
 
 #include "cmCommand.h"
 
+#include "cmSourceFile.h"
+
 /** \class cmUseMangledMesaCommand
  * \brief Create Tcl Wrappers for VTK classes.
  *
diff --git a/Source/cmVTKMakeInstantiatorCommand.cxx b/Source/cmVTKMakeInstantiatorCommand.cxx
index 560f313da..662692464 100644
--- a/Source/cmVTKMakeInstantiatorCommand.cxx
+++ b/Source/cmVTKMakeInstantiatorCommand.cxx
@@ -15,8 +15,10 @@
 
 =========================================================================*/
 #include "cmVTKMakeInstantiatorCommand.h"
+
 #include "cmCacheManager.h"
 #include "cmGeneratedFileStream.h"
+#include "cmSourceFile.h"
 
 bool
 cmVTKMakeInstantiatorCommand
diff --git a/Source/cmVTKWrapJavaCommand.h b/Source/cmVTKWrapJavaCommand.h
index f4938beb9..1702eb6b1 100644
--- a/Source/cmVTKWrapJavaCommand.h
+++ b/Source/cmVTKWrapJavaCommand.h
@@ -19,6 +19,8 @@
 
 #include "cmCommand.h"
 
+#include "cmSourceFile.h"
+
 /** \class cmVTKWrapJavaCommand
  * \brief Create Java Language bindings for classes
  *
diff --git a/Source/cmVTKWrapPythonCommand.h b/Source/cmVTKWrapPythonCommand.h
index a9a7ebc17..ed9cf0363 100644
--- a/Source/cmVTKWrapPythonCommand.h
+++ b/Source/cmVTKWrapPythonCommand.h
@@ -19,6 +19,8 @@
 
 #include "cmCommand.h"
 
+#include "cmSourceFile.h"
+
 /** \class cmVTKWrapPythonCommand
  * \brief Create Python Language bindings for classes
  *
diff --git a/Source/cmVTKWrapTclCommand.h b/Source/cmVTKWrapTclCommand.h
index b86c5abf1..06d497da4 100644
--- a/Source/cmVTKWrapTclCommand.h
+++ b/Source/cmVTKWrapTclCommand.h
@@ -19,6 +19,8 @@
 
 #include "cmCommand.h"
 
+#include "cmSourceFile.h"
+
 /** \class cmVTKWrapTclCommand
  * \brief Create Tcl Wrappers for VTK classes.
  *
diff --git a/Source/cmWrapExcludeFilesCommand.cxx b/Source/cmWrapExcludeFilesCommand.cxx
index be7199364..5141b9022 100644
--- a/Source/cmWrapExcludeFilesCommand.cxx
+++ b/Source/cmWrapExcludeFilesCommand.cxx
@@ -15,6 +15,9 @@
 
 =========================================================================*/
 #include "cmWrapExcludeFilesCommand.h"
+
+#include "cmSourceFile.h"
+
 #include <stdlib.h> // required for atof
 
 // cmWrapExcludeFilesCommand