Remove some obsolete declarations

Ensure that cmStandardIncludes.h is included before any platform header
in cmGeneratorExpressionEvaluator.h.  That file needs to change as
a result of removal of the cmMakefile.h header from
cmGeneratorExpressionNode.h, affecting the compilation of
cmGeneratorExpressionNode.cxx.

On AIX we need to include our own headers first to get large file
support macros defined consistently within system headers.  The old
order in this header worked only because it was always included after
other headers.

13 files changed, 3 insertions, 19 deletions

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 889fb08ec3..f10e4e435b 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -13,7 +13,6 @@
 #define cmComputeLinkDepends_h
 
 #include "cmStandardIncludes.h"
-#include "cmTarget.h"
 #include "cmLinkItem.h"
 
 #include "cmGraphAdjacencyList.h"
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 1741acf520..ff5d3ab5fb 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -17,7 +17,6 @@
 #include "cmake.h"
 #include "cmSourceFile.h"
 #include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
 
 #include <cmsys/SystemTools.hxx>
diff --git a/Source/cmExtraKateGenerator.h b/Source/cmExtraKateGenerator.h
index b20d0a701c..281c1efe32 100644
--- a/Source/cmExtraKateGenerator.h
+++ b/Source/cmExtraKateGenerator.h
@@ -16,8 +16,6 @@
 #include "cmExternalMakefileProjectGenerator.h"
 
 class cmLocalGenerator;
-class cmMakefile;
-class cmTarget;
 class cmGeneratedFileStream;
 
 /** \class cmExtraKateGenerator
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 5eed89da58..c3b0272ed9 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -12,7 +12,6 @@
 
 #include "cmGeneratorExpressionDAGChecker.h"
 
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmAlgorithms.h"
 
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 7c1bd8c6ff..407f83f195 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -12,13 +12,11 @@
 #ifndef cmGeneratorExpressionEvaluator_h
 #define cmGeneratorExpressionEvaluator_h
 
-#include <vector>
-#include <string>
-
 #include "cmListFileCache.h"
 #include "cmGeneratorExpressionContext.h"
 
-class cmTarget;
+#include <vector>
+#include <string>
 
 struct cmGeneratorExpressionDAGChecker;
 struct cmGeneratorExpressionNode;
diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx
index 7a7e4ffb35..af72123375 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -14,6 +14,7 @@
 #include "cmGlobalGenerator.h"
 #include "cmAlgorithms.h"
 #include "cmOutputConverter.h"
+#include "cmMakefile.h"
 
 //----------------------------------------------------------------------------
 std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h
index db65db14ce..854811b99e 100644
--- a/Source/cmGeneratorExpressionNode.h
+++ b/Source/cmGeneratorExpressionNode.h
@@ -12,8 +12,6 @@
 #ifndef cmGeneratorExpressionNode_h
 #define cmGeneratorExpressionNode_h
 
-#include "cmMakefile.h"
-
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionParser.h"
 #include "cmGeneratorExpressionDAGChecker.h"
diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h
index 28f14410fe..5bd67774d3 100644
--- a/Source/cmGeneratorExpressionParser.h
+++ b/Source/cmGeneratorExpressionParser.h
@@ -19,8 +19,6 @@
 
 #include "cmListFileCache.h"
 
-class cmMakefile;
-class cmTarget;
 struct cmGeneratorExpressionEvaluator;
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index c4e28cae2b..2fa0598e0b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -15,7 +15,6 @@
 #include "cmMakefile.h"
 #include "cmake.h"
 #include "cmGeneratedFileStream.h"
-#include "cmSourceFile.h"
 #include "cmGeneratorTarget.h"
 #include "cmAlgorithms.h"
 
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx
index edd6a0ecf2..ea27f61b05 100644
--- a/Source/cmInstallDirectoryGenerator.cxx
+++ b/Source/cmInstallDirectoryGenerator.cxx
@@ -11,7 +11,6 @@
 ============================================================================*/
 #include "cmInstallDirectoryGenerator.h"
 
-#include "cmTarget.h"
 #include "cmGeneratorExpression.h"
 #include "cmLocalGenerator.h"
 
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index d59fdc6bec..d0784add2e 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmLocalVisualStudio10Generator.h"
-#include "cmTarget.h"
 #include "cmMakefile.h"
 #include "cmVisualStudio10TargetGenerator.h"
 #include "cmGlobalVisualStudio10Generator.h"
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 1cae94f274..52ed578b5e 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -30,7 +30,6 @@ class cmake;
 class cmMakefile;
 class cmSourceFile;
 class cmGlobalGenerator;
-class cmComputeLinkInformation;
 class cmListFileBacktrace;
 class cmTarget;
 class cmGeneratorTarget;
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index d9975966c3..b411f15e46 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -13,10 +13,8 @@
 
 #include "cmGeneratorExpression.h"
 #include "cmOutputConverter.h"
-#include "cmMakefile.h"
 #include "cmLocalGenerator.h"
 #include "cmSystemTools.h"
-#include "cmTarget.h"
 #include "cmTest.h"
 
 //----------------------------------------------------------------------------