dtool: Include what you use

dtool/src/cppparser/cppArrayType.cxx

@@ -12,8 +12,11 @@
  */
 
 #include "cppArrayType.h"
+
 #include "cppExpression.h"
-#include "cppPointerType.h"
+#include "cppFile.h"
+
+#include <map>
 
 /**
  *

dtool/src/cppparser/cppArrayType.h

@@ -16,9 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
 class CPPExpression;
+class CPPScope;
 
 /**
  *

dtool/src/cppparser/cppBison.yxx

@@ -6,8 +6,13 @@
 
 %{
 
+#include "dtoolbase.h"
+
 #include "cppBisonDefs.h"
+#include "cppDeclaration.h"
+#include "cppPreprocessor.h"
 #include "cppParser.h"
+#include "cppType.h"
 #include "cppClosureType.h"
 #include "cppExpression.h"
 #include "cppSimpleType.h"
@@ -16,12 +21,13 @@
 #include "cppEnumType.h"
 #include "cppFunctionType.h"
 #include "cppTBDType.h"
+#include "cppToken.h"
 #include "cppMakeProperty.h"
 #include "cppMakeSeq.h"
+#include "cppNameComponent.h"
 #include "cppParameterList.h"
 #include "cppInstance.h"
 #include "cppClassTemplateParameter.h"
-#include "cppTemplateParameterList.h"
 #include "cppInstanceIdentifier.h"
 #include "cppTypedefType.h"
 #include "cppTypeDeclaration.h"
@@ -32,6 +38,8 @@
 #include "cppNamespace.h"
 #include "cppUsing.h"
 
+#include <vector>
+
 using std::stringstream;
 using std::string;
 

dtool/src/cppparser/cppClassTemplateParameter.cxx

@@ -12,6 +12,8 @@
  */
 
 #include "cppClassTemplateParameter.h"
+
+#include "cppFile.h"
 #include "cppIdentifier.h"
 
 /**

dtool/src/cppparser/cppClassTemplateParameter.h

@@ -16,9 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
 class CPPIdentifier;
+class CPPScope;
 
 /**
  *

dtool/src/cppparser/cppClosureType.cxx

@@ -12,6 +12,8 @@
  */
 
 #include "cppClosureType.h"
+
+#include "cppType.h"
 #include "cppParameterList.h"
 #include "cppExpression.h"
 

dtool/src/cppparser/cppClosureType.h

@@ -16,8 +16,14 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppFunctionType.h"
 
+#include <vector>
+
+class CPPExpression;
+class CPPScope;
+
 /**
  * The type of a lambda expression.  This is like a function, but with
  * additional captures defined.

dtool/src/cppparser/cppConstType.cxx

@@ -13,6 +13,10 @@
 
 #include "cppConstType.h"
 
+#include "cppFile.h"
+
+#include <map>
+
 /**
  *
  */

dtool/src/cppparser/cppConstType.h

@@ -16,8 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
+class CPPScope;
+
 /**
  *
  */

dtool/src/cppparser/cppDeclaration.h

@@ -18,13 +18,11 @@
 
 #include "cppVisibility.h"
 #include "cppFile.h"
-#include "cppCommentBlock.h"
 
-#include <string>
-#include <vector>
 #include <map>
 #include <set>
 
+class CPPCommentBlock;
 class CPPInstance;
 class CPPTemplateParameterList;
 class CPPTypedefType;

dtool/src/cppparser/cppEnumType.cxx

@@ -12,12 +12,16 @@
  */
 
 #include "cppEnumType.h"
-#include "cppTypedefType.h"
+
+#include "cppCommentBlock.h"
 #include "cppExpression.h"
 #include "cppSimpleType.h"
 #include "cppConstType.h"
 #include "cppScope.h"
 #include "cppParser.h"
+#include "cppPreprocessor.h"
+#include "cppType.h"
+#include "cppInstance.h"
 #include "cppIdentifier.h"
 #include "indent.h"
 

dtool/src/cppparser/cppEnumType.h

@@ -17,14 +17,18 @@
 #include "dtoolbase.h"
 
 #include "cppBisonDefs.h"
+#include "cppDeclaration.h"
 #include "cppExtensionType.h"
 
 #include <vector>
 
+class CPPFile;
 class CPPExpression;
+class CPPIdentifier;
 class CPPInstance;
+class CPPPreprocessor;
 class CPPScope;
-
+class CPPType;
 
 /**
  *

dtool/src/cppparser/cppExpression.cxx

@@ -12,15 +12,16 @@
  */
 
 #include "cppExpression.h"
-#include "cppToken.h"
+
+#include "cppFile.h"
 #include "cppIdentifier.h"
 #include "cppType.h"
 #include "cppSimpleType.h"
 #include "cppPointerType.h"
+#include "cppExtensionType.h"
 #include "cppEnumType.h"
 #include "cppConstType.h"
 #include "cppArrayType.h"
-#include "cppPreprocessor.h"
 #include "cppInstance.h"
 #include "cppFunctionGroup.h"
 #include "cppFunctionType.h"
@@ -28,9 +29,11 @@
 #include "cppReferenceType.h"
 #include "cppStructType.h"
 #include "cppBison.h"
+#include "cppVisibility.h"
 #include "pdtoa.h"
 
-#include <assert.h>
+#include <ctype.h>
+#include <vector>
 
 using std::cerr;
 using std::string;

dtool/src/cppparser/cppExpression.h

@@ -18,10 +18,13 @@
 
 #include "cppDeclaration.h"
 
+class CPPClosureType;
+class CPPFunctionGroup;
 class CPPIdentifier;
-class CPPType;
+class CPPInstance;
 class CPPPreprocessor;
-class CPPFunctionGroup;
+class CPPScope;
+class CPPType;
 
 /**
  *

dtool/src/cppparser/cppExpressionParser.cxx

@@ -12,6 +12,9 @@
  */
 
 #include "cppExpressionParser.h"
+
+#include "cppBisonDefs.h"
+#include "cppDeclaration.h"
 #include "cppExpression.h"
 
 /**

dtool/src/cppparser/cppExtensionType.cxx

@@ -12,10 +12,12 @@
  */
 
 #include "cppExtensionType.h"
+
 #include "cppTypedefType.h"
 #include "cppIdentifier.h"
 #include "cppParser.h"
-#include "indent.h"
+
+#include <map>
 
 /**
  *

dtool/src/cppparser/cppExtensionType.h

@@ -16,9 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
-#include "cppInstance.h"
 
+class CPPExpression;
+class CPPFile;
 class CPPScope;
 class CPPIdentifier;
 

dtool/src/cppparser/cppFunctionGroup.cxx

@@ -12,8 +12,11 @@
  */
 
 #include "cppFunctionGroup.h"
+
+#include "cppFile.h"
 #include "cppFunctionType.h"
 #include "cppInstance.h"
+#include "cppType.h"
 #include "indent.h"
 
 /**

dtool/src/cppparser/cppFunctionGroup.h

@@ -18,7 +18,11 @@
 
 #include "cppDeclaration.h"
 
+#include <vector>
+
 class CPPInstance;
+class CPPScope;
+class CPPType;
 
 /**
  * This class is simply a container for one or more CPPInstances for functions

dtool/src/cppparser/cppFunctionType.cxx

@@ -12,6 +12,8 @@
  */
 
 #include "cppFunctionType.h"
+
+#include "cppFile.h"
 #include "cppParameterList.h"
 #include "cppSimpleType.h"
 #include "cppInstance.h"

dtool/src/cppparser/cppFunctionType.h

@@ -16,10 +16,12 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
 class CPPParameterList;
 class CPPIdentifier;
+class CPPScope;
 
 /**
  *

dtool/src/cppparser/cppIdentifier.cxx

@@ -12,10 +12,12 @@
  */
 
 #include "cppIdentifier.h"
+
+#include "cppFunctionGroup.h"
 #include "cppScope.h"
-#include "cppTemplateScope.h"
 #include "cppPreprocessor.h"
 #include "cppTemplateParameterList.h"
+#include "cppType.h"
 #include "cppTBDType.h"
 #include "cppStructType.h"
 

dtool/src/cppparser/cppIdentifier.h

@@ -27,7 +27,6 @@
 class CPPScope;
 class CPPType;
 class CPPPreprocessor;
-class CPPTemplateParameterList;
 
 /**
  *

dtool/src/cppparser/cppInstance.cxx

@@ -12,20 +12,21 @@
  */
 
 #include "cppInstance.h"
+
+#include "cppFile.h"
 #include "cppInstanceIdentifier.h"
 #include "cppIdentifier.h"
+#include "cppScope.h"
 #include "cppTemplateScope.h"
+#include "cppType.h"
 #include "cppFunctionType.h"
 #include "cppSimpleType.h"
 #include "cppExpression.h"
 #include "cppPreprocessor.h"
 #include "cppParameterList.h"
 #include "cppReferenceType.h"
-#include "cppConstType.h"
 #include "indent.h"
 
-#include <algorithm>
-
 using std::string;
 
 /**

dtool/src/cppparser/cppInstance.h

@@ -17,12 +17,16 @@
 #include "dtoolbase.h"
 
 #include "cppDeclaration.h"
-#include "cppType.h"
 #include "cppTemplateParameterList.h"
 
+#include <map>
+
+class CPPFile;
 class CPPInstanceIdentifier;
 class CPPIdentifier;
 class CPPParameterList;
+class CPPPreprocessor;
+class CPPType;
 class CPPScope;
 class CPPExpression;
 

dtool/src/cppparser/cppInstanceIdentifier.cxx

@@ -12,6 +12,8 @@
  */
 
 #include "cppInstanceIdentifier.h"
+
+#include "cppType.h"
 #include "cppPointerType.h"
 #include "cppReferenceType.h"
 #include "cppArrayType.h"

dtool/src/cppparser/cppInstanceIdentifier.h

@@ -17,7 +17,6 @@
 #include "dtoolbase.h"
 
 #include <vector>
-#include <string>
 
 class CPPIdentifier;
 class CPPParameterList;

dtool/src/cppparser/cppMakeProperty.cxx

@@ -12,7 +12,9 @@
  */
 
 #include "cppMakeProperty.h"
+
 #include "cppFunctionGroup.h"
+#include "cppIdentifier.h"
 
 /**
  *

dtool/src/cppparser/cppMakeProperty.h

@@ -17,7 +17,11 @@
 #include "dtoolbase.h"
 
 #include "cppDeclaration.h"
-#include "cppIdentifier.h"
+
+class CPPFile;
+class CPPFunctionGroup;
+class CPPIdentifier;
+class CPPScope;
 
 /**
  * This is a MAKE_PROPERTY() declaration appearing within a class body.  It

dtool/src/cppparser/cppMakeSeq.cxx

@@ -13,6 +13,9 @@
 
 #include "cppMakeSeq.h"
 
+#include "cppFunctionGroup.h"
+#include "cppIdentifier.h"
+
 /**
  *
  */

dtool/src/cppparser/cppMakeSeq.h

@@ -17,8 +17,11 @@
 #include "dtoolbase.h"
 
 #include "cppDeclaration.h"
-#include "cppIdentifier.h"
-#include "cppFunctionGroup.h"
+
+class CPPFile;
+class CPPFunctionGroup;
+class CPPIdentifier;
+class CPPScope;
 
 /**
  * This is a MAKE_SEQ() declaration appearing within a class body.  It means

dtool/src/cppparser/cppManifest.h

@@ -16,7 +16,6 @@
 
 #include "dtoolbase.h"
 
-#include "cppFile.h"
 #include "cppVisibility.h"
 #include "cppBisonDefs.h"
 

dtool/src/cppparser/cppNameComponent.h

@@ -15,7 +15,6 @@
 #define CPPNAMECOMPONENT_H
 
 #include "dtoolbase.h"
-#include "cppBisonDefs.h"
 
 #include <string>
 

dtool/src/cppparser/cppNamespace.h

@@ -18,6 +18,7 @@
 
 #include "cppDeclaration.h"
 
+class CPPFile;
 class CPPIdentifier;
 class CPPScope;
 

dtool/src/cppparser/cppParameterList.cxx

@@ -12,7 +12,11 @@
  */
 
 #include "cppParameterList.h"
+
 #include "cppInstance.h"
+#include "cppType.h"
+
+class CPPExpression;
 
 /**
  *

dtool/src/cppparser/cppParser.cxx

@@ -12,12 +12,14 @@
  */
 
 #include "cppParser.h"
+
+#include "cppBisonDefs.h"
 #include "cppFile.h"
+#include "cppNameComponent.h"
 #include "cppTypeParser.h"
-#include "cppBisonDefs.h"
+#include "cppVisibility.h"
 
 #include <set>
-#include <assert.h>
 
 bool cppparser_output_class_keyword = false;
 

dtool/src/cppparser/cppParser.h

@@ -20,7 +20,8 @@
 #include "cppPreprocessor.h"
 #include "filename.h"
 
-#include <set>
+class CPPExpression;
+class CPPType;
 
 /**
  *

dtool/src/cppparser/cppPointerType.cxx

@@ -12,6 +12,8 @@
  */
 
 #include "cppPointerType.h"
+
+#include "cppFile.h"
 #include "cppFunctionType.h"
 #include "cppIdentifier.h"
 #include "cppArrayType.h"

dtool/src/cppparser/cppPointerType.h

@@ -16,8 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
+class CPPScope;
+
 /**
  *
  */

dtool/src/cppparser/cppPreprocessor.cxx

@@ -12,10 +12,12 @@
  */
 
 #include "cppPreprocessor.h"
+
 #include "cppExpressionParser.h"
 #include "cppExpression.h"
 #include "cppScope.h"
 #include "cppIdentifier.h"
+#include "cppInstance.h"
 #include "cppTemplateScope.h"
 #include "cppTemplateParameterList.h"
 #include "cppClassTemplateParameter.h"

dtool/src/cppparser/cppReferenceType.cxx

@@ -12,7 +12,8 @@
  */
 
 #include "cppReferenceType.h"
-#include "cppTypedefType.h"
+
+#include "cppFile.h"
 #include "cppStructType.h"
 
 /**

dtool/src/cppparser/cppReferenceType.h

@@ -16,8 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
+class CPPScope;
+
 /**
  * Either an lvalue- or rvalue-reference.
  */

dtool/src/cppparser/cppScope.cxx

@@ -15,19 +15,18 @@
 #include "cppParser.h"
 #include "cppDeclaration.h"
 #include "cppNamespace.h"
+#include "cppType.h"
 #include "cppTypedefType.h"
 #include "cppTypeDeclaration.h"
 #include "cppExtensionType.h"
 #include "cppEnumType.h"
 #include "cppInstance.h"
-#include "cppInstanceIdentifier.h"
 #include "cppIdentifier.h"
 #include "cppStructType.h"
 #include "cppFunctionGroup.h"
 #include "cppPreprocessor.h"
 #include "cppTemplateScope.h"
 #include "cppClassTemplateParameter.h"
-#include "cppFunctionType.h"
 #include "cppConstType.h"
 #include "cppUsing.h"
 #include "cppBisonDefs.h"

dtool/src/cppparser/cppScope.h

@@ -16,6 +16,7 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppVisibility.h"
 #include "cppTemplateParameterList.h"
 #include "cppNameComponent.h"
@@ -26,7 +27,6 @@
 #include <string>
 
 class CPPType;
-class CPPDeclaration;
 class CPPExtensionType;
 class CPPStructType;
 class CPPNamespace;
@@ -35,9 +35,7 @@ class CPPTypedefType;
 class CPPInstance;
 class CPPFunctionGroup;
 class CPPTemplateScope;
-class CPPTemplateParameterList;
 class CPPPreprocessor;
-class CPPNameComponent;
 struct cppyyltype;
 
 /**

dtool/src/cppparser/cppSimpleType.cxx

@@ -12,6 +12,8 @@
  */
 
 #include "cppSimpleType.h"
+
+#include "cppFile.h"
 #include "cppGlobals.h"
 
 /**

dtool/src/cppparser/cppSimpleType.h

@@ -16,8 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
+class CPPScope;
+
 /**
  * Represents a C++ fundamental type.
  */

dtool/src/cppparser/cppStructType.cxx

@@ -12,17 +12,24 @@
  */
 
 #include "cppStructType.h"
-#include "cppTypedefType.h"
+
+#include "cppFunctionGroup.h"
+#include "cppFunctionType.h"
+#include "cppNameComponent.h"
+#include "cppIdentifier.h"
+#include "cppInstance.h"
 #include "cppReferenceType.h"
 #include "cppScope.h"
+#include "cppType.h"
+#include "cppTypedefType.h"
 #include "cppTypeProxy.h"
+#include "cppTemplateParameterList.h"
 #include "cppTemplateScope.h"
-#include "cppFunctionGroup.h"
-#include "cppFunctionType.h"
 #include "cppParameterList.h"
 #include "cppTBDType.h"
-#include "indent.h"
 #include "cppParser.h"
+#include "cppPreprocessor.h"
+#include "indent.h"
 
 /**
  *

dtool/src/cppparser/cppStructType.h

@@ -16,15 +16,21 @@
 
 #include "dtoolbase.h"
 
-#include "cppIdentifier.h"
+#include "cppDeclaration.h"
 #include "cppExtensionType.h"
-#include "cppFunctionGroup.h"
 #include "cppVisibility.h"
 
 #include <vector>
 #include <list>
 
+class CPPFile;
+class CPPFunctionGroup;
+class CPPIdentifier;
+class CPPInstance;
+class CPPPreprocessor;
 class CPPScope;
+class CPPTemplateParameterList;
+class CPPType;
 class CPPTypeProxy;
 
 /**

dtool/src/cppparser/cppTBDType.cxx

@@ -12,9 +12,9 @@
  */
 
 #include "cppTBDType.h"
-#include "cppIdentifier.h"
 
-#include "cppSimpleType.h"
+#include "cppFile.h"
+#include "cppIdentifier.h"
 
 /**
  *

dtool/src/cppparser/cppTBDType.h

@@ -16,9 +16,11 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
 class CPPIdentifier;
+class CPPScope;
 
 /**
  * This represents a type whose exact meaning is still to-be-determined.  It

dtool/src/cppparser/cppTemplateParameterList.cxx

@@ -12,9 +12,11 @@
  */
 
 #include "cppTemplateParameterList.h"
+
 #include "cppClassTemplateParameter.h"
-#include "cppInstance.h"
 #include "cppExpression.h"
+#include "cppInstance.h"
+#include "cppType.h"
 
 /**
  *

dtool/src/cppparser/cppTemplateScope.cxx

@@ -12,10 +12,15 @@
  */
 
 #include "cppTemplateScope.h"
+
+#include "cppDeclaration.h"
 #include "cppExtensionType.h"
 #include "cppClassTemplateParameter.h"
+#include "cppNameComponent.h"
 #include "cppIdentifier.h"
+#include "cppInstance.h"
 #include "cppTypedefType.h"
+#include "cppVisibility.h"
 
 using std::string;
 

dtool/src/cppparser/cppTemplateScope.h

@@ -19,6 +19,15 @@
 #include "cppScope.h"
 #include "cppTemplateParameterList.h"
 
+class CPPDeclaration;
+class CPPExtensionType;
+class CPPInstance;
+class CPPNamespace;
+class CPPPreprocessor;
+class CPPTypedefType;
+class CPPUsing;
+struct cppyyltype;
+
 /**
  * This is an implicit scope that is created following the appearance of a
  * "template<class x, class y>" or some such line in a C++ file.  It simply

dtool/src/cppparser/cppToken.cxx

@@ -12,9 +12,11 @@
  */
 
 #include "cppToken.h"
+
+#include "cppDeclaration.h"
+#include "cppBison.h"
 #include "cppExpression.h"
 #include "cppIdentifier.h"
-#include "cppBison.h"
 
 #include <ctype.h>
 

dtool/src/cppparser/cppToken.h

@@ -17,6 +17,7 @@
 #include "dtoolbase.h"
 
 #include "cppBisonDefs.h"
+#include "cppFile.h"
 
 /**
  *

dtool/src/cppparser/cppType.cxx

@@ -12,13 +12,12 @@
  */
 
 #include "cppType.h"
+
 #include "cppConstType.h"
 #include "cppPointerType.h"
 #include "cppReferenceType.h"
-#include "cppStructType.h"
 #include "cppTypedefType.h"
 #include "cppExtensionType.h"
-#include <algorithm>
 
 using std::string;
 

dtool/src/cppparser/cppType.h

@@ -18,8 +18,12 @@
 
 #include "cppDeclaration.h"
 
+#include <map>
 #include <set>
+#include <vector>
 
+class CPPFile;
+class CPPScope;
 class CPPType;
 class CPPTypedefType;
 class CPPTypeDeclaration;

dtool/src/cppparser/cppTypeDeclaration.cxx

@@ -13,6 +13,8 @@
 
 #include "cppTypeDeclaration.h"
 
+#include "cppType.h"
+
 /**
  * Constructs a new CPPTypeDeclaration object for the given type.
  */

dtool/src/cppparser/cppTypeDeclaration.h

@@ -16,8 +16,12 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppInstance.h"
 
+class CPPScope;
+class CPPType;
+
 /**
  * A CPPTypeDeclaration is a special declaration that represents the top-level
  * declaration of a type in a source file.  Typically this is the first

dtool/src/cppparser/cppTypeParser.cxx

@@ -12,6 +12,9 @@
  */
 
 #include "cppTypeParser.h"
+
+#include "cppBisonDefs.h"
+#include "cppDeclaration.h"
 #include "cppType.h"
 
 /**

dtool/src/cppparser/cppTypeProxy.h

@@ -16,8 +16,22 @@
 
 #include "dtoolbase.h"
 
+#include "cppDeclaration.h"
 #include "cppType.h"
 
+class CPPArrayType;
+class CPPConstType;
+class CPPEnumType;
+class CPPExtensionType;
+class CPPFunctionType;
+class CPPPointerType;
+class CPPReferenceType;
+class CPPScope;
+class CPPSimpleType;
+class CPPStructType;
+class CPPTBDType;
+class CPPTypedefType;
+
 /**
  * This is a special kind of type that is a placeholder for some type,
  * currently unknown, that will be filled in later.  It's used when a type

dtool/src/cppparser/cppTypedefType.cxx

@@ -12,9 +12,12 @@
  */
 
 #include "cppTypedefType.h"
+
+#include "cppFile.h"
 #include "cppIdentifier.h"
 #include "cppInstanceIdentifier.h"
 #include "cppTemplateScope.h"
+#include "cppTemplateParameterList.h"
 #include "indent.h"
 
 using std::string;

dtool/src/cppparser/cppTypedefType.h

@@ -15,10 +15,19 @@
 #define CPPTYPEDEFTYPE_H
 
 #include "dtoolbase.h"
+
+#include "cppDeclaration.h"
 #include "cppType.h"
 
+#include <vector>
+
+class CPPFile;
 class CPPIdentifier;
 class CPPInstanceIdentifier;
+class CPPPreprocessor;
+class CPPScope;
+class CPPTemplateParameterList;
+class CPPTypeProxy;
 
 /**
  * A type alias created by a C++ typedef or using declaration.  These aren't

dtool/src/cppparser/cppUsing.h

@@ -18,6 +18,7 @@
 
 #include "cppDeclaration.h"
 
+class CPPFile;
 class CPPIdentifier;
 class CPPScope;
 

dtool/src/dtoolbase/atomicAdjustDummyImpl.cxx

@@ -11,5 +11,4 @@
  * @date 2002-08-09
  */
 
-#include "selectThreadImpl.h"
 #include "atomicAdjustDummyImpl.h"

dtool/src/dtoolbase/atomicAdjustDummyImpl.h

@@ -17,8 +17,6 @@
 #include "dtoolbase.h"
 #include "selectThreadImpl.h"
 
-#include "numeric_types.h"
-
 /**
  * A trivial implementation for atomic adjustments for systems that don't
  * require multiprogramming, and therefore don't require special atomic

dtool/src/dtoolbase/atomicAdjustI386Impl.h

@@ -14,12 +14,11 @@
 #ifndef ATOMICADJUSTI386IMPL_H
 #define ATOMICADJUSTI386IMPL_H
 
-#include "dtoolbase.h"
-#include "selectThreadImpl.h"
-
 #if (defined(__i386__) || defined(_M_IX86)) && !defined(__APPLE__) && !defined(__ANDROID__)
 
-#include "numeric_types.h"
+#include "dtoolbase.h"
+
+#include "selectThreadImpl.h"
 
 /**
  * Uses assembly-language calls to atomically increment and decrement.

dtool/src/dtoolbase/atomicAdjustPosixImpl.cxx

@@ -11,7 +11,7 @@
  * @date 2006-02-10
  */
 
-#include "selectThreadImpl.h"
+#include "dtoolbase.h"
 
 #ifdef HAVE_POSIX_THREADS
 

dtool/src/dtoolbase/atomicAdjustPosixImpl.h

@@ -19,8 +19,6 @@
 
 #ifdef HAVE_POSIX_THREADS
 
-#include "numeric_types.h"
-
 #include <pthread.h>
 
 /**

dtool/src/dtoolbase/atomicAdjustWin32Impl.cxx

@@ -11,8 +11,6 @@
  * @date 2006-02-07
  */
 
-#include "selectThreadImpl.h"
-
 #ifdef WIN32_VC
 
 #include "atomicAdjustWin32Impl.h"

dtool/src/dtoolbase/deletedBufferChain.cxx

@@ -12,7 +12,8 @@
  */
 
 #include "deletedBufferChain.h"
-#include "memoryHook.h"
+
+#include "neverFreeMemory.h"
 
 /**
  * Use the global MemoryHook to get a new DeletedBufferChain of the

dtool/src/dtoolbase/deletedBufferChain.h

@@ -15,12 +15,10 @@
 #define DELETEDBUFFERCHAIN_H
 
 #include "dtoolbase.h"
-#include "neverFreeMemory.h"
+
 #include "mutexImpl.h"
 #include "atomicAdjust.h"
-#include "numeric_types.h"
 #include "typeHandle.h"
-#include <assert.h>
 
 // Though it's tempting, it doesn't seem to be possible to implement
 // DeletedBufferChain via the atomic exchange operation.  Specifically, a

dtool/src/dtoolbase/lookup3.c

@@ -39,11 +39,6 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy.
 
 #include "lookup3.h"
 
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <time.h>
-
 #ifdef WORDS_BIGENDIAN
 # define HASH_LITTLE_ENDIAN 0
 # define HASH_BIG_ENDIAN 1

dtool/src/dtoolbase/lookup3.h

@@ -15,7 +15,6 @@
 #define LOOKUP3_H
 
 #include "dtoolbase.h"
-#include "numeric_types.h"
 
 #ifdef __cplusplus
 extern "C" {

dtool/src/dtoolbase/memoryHook.cxx

@@ -13,8 +13,6 @@
 
 #include "memoryHook.h"
 #include "deletedBufferChain.h"
-#include <stdlib.h>
-#include "typeRegistry.h"
 
 #ifdef WIN32
 
@@ -27,9 +25,8 @@
 #else
 
 // Posix case.
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/mman.h>
+#include <cstdio> // for perror
 
 #ifndef MAP_ANON
 #define MAP_ANON 0x1000

dtool/src/dtoolbase/memoryHook.h

@@ -15,7 +15,6 @@
 #define MEMORYHOOK_H
 
 #include "dtoolbase.h"
-#include "numeric_types.h"
 #include "atomicAdjust.h"
 #include "mutexImpl.h"
 #include <map>

dtool/src/dtoolbase/mutexDummyImpl.cxx

@@ -11,5 +11,4 @@
  * @date 2002-08-08
  */
 
-#include "selectThreadImpl.h"
 #include "mutexDummyImpl.h"

dtool/src/dtoolbase/mutexDummyImpl.h

@@ -15,7 +15,6 @@
 #define MUTEXDUMMYIMPL_H
 
 #include "dtoolbase.h"
-#include "selectThreadImpl.h"
 
 /**
  * A fake mutex implementation for single-threaded applications that don't

dtool/src/dtoolbase/mutexPosixImpl.cxx

@@ -11,7 +11,7 @@
  * @date 2006-02-10
  */
 
-#include "selectThreadImpl.h"
+#include "dtoolbase.h"
 
 #ifdef HAVE_POSIX_THREADS
 

dtool/src/dtoolbase/mutexPosixImpl.h

@@ -15,13 +15,11 @@
 #define MUTEXPOSIXIMPL_H
 
 #include "dtoolbase.h"
-#include "selectThreadImpl.h"
 
 #ifdef HAVE_POSIX_THREADS
 
-#include <pthread.h>
 #include <errno.h>
-#include <assert.h>
+#include <pthread.h>
 
 /**
  * Uses Posix threads to implement a mutex.

dtool/src/dtoolbase/mutexSpinlockImpl.cxx

@@ -11,7 +11,7 @@
  * @date 2006-04-11
  */
 
-#include "selectThreadImpl.h"
+#include "dtoolbase.h"
 
 #ifdef MUTEX_SPINLOCK
 

dtool/src/dtoolbase/mutexWin32Impl.cxx

@@ -11,7 +11,7 @@
  * @date 2006-02-07
  */
 
-#include "selectThreadImpl.h"
+#include "dtoolbase.h"
 
 #ifdef WIN32_VC
 

dtool/src/dtoolbase/pdtoa.cxx

@@ -24,10 +24,6 @@ THE SOFTWARE.
 #include "pdtoa.h"
 #include "cmath.h"
 
-#include <assert.h>
-#include <math.h>
-#include <stdint.h>
-
 #if defined(_MSC_VER)
 #include <intrin.h>
 #include <float.h>

dtool/src/dtoolbase/pstrtod.cxx

@@ -19,6 +19,8 @@
 
 #ifdef _WIN32
 #define strncasecmp _strnicmp
+#else
+#include <strings.h> // for strncasecmp
 #endif
 
 /**

dtool/src/dtoolbase/typeHandle.cxx

@@ -14,6 +14,7 @@
 #include "typeHandle.h"
 #include "typeRegistryNode.h"
 #include "atomicAdjust.h"
+#include "memoryHook.h"
 
 /**
  * Returns the total allocated memory used by objects of this type, for the

dtool/src/dtoolbase/typeRegistry.cxx

@@ -18,8 +18,6 @@
 #include "indent.h"
 #include "numeric_types.h"
 
-#include <algorithm>
-
 using std::cerr;
 using std::ostream;
 using std::ostringstream;

dtool/src/dtoolbase/typeRegistryNode.cxx

@@ -13,9 +13,6 @@
 
 #include "typeRegistryNode.h"
 
-#include <algorithm>
-#include <string.h>
-
 bool TypeRegistryNode::_paranoid_inheritance = false;
 
 /**

dtool/src/dtoolbase/typeRegistryNode.h

@@ -16,10 +16,9 @@
 
 #include "dtoolbase.h"
 
+#include "atomicAdjust.h"
 #include "typeHandle.h"
-#include "numeric_types.h"
 
-#include <assert.h>
 #include <vector>
 
 /**

dtool/src/dtoolutil/config_dtoolutil.h

@@ -16,9 +16,6 @@
 
 #include "dtoolbase.h"
 
-// Include this so interrogate can find it.
-#include <iostream>
-
 extern EXPCL_DTOOL_DTOOLUTIL void init_libdtoolutil();
 
 #endif

dtool/src/dtoolutil/dSearchPath.cxx

@@ -12,9 +12,9 @@
  */
 
 #include "dSearchPath.h"
+
 #include "filename.h"
 
-#include <algorithm>
 #include <iterator>
 
 using std::ostream;

dtool/src/dtoolutil/executionEnvironment.cxx

@@ -12,9 +12,11 @@
  */
 
 #include "executionEnvironment.h"
+
+#include "pandaFileStream.h"
 #include "pandaVersion.h"
 
-#include <assert.h>
+#include <ctype.h>
 #include <errno.h>
 #include <stdio.h>  // for perror
 

dtool/src/dtoolutil/filename.cxx

@@ -21,7 +21,6 @@
 #include <stdio.h>  // For rename() and tempnam()
 #include <time.h>   // for clock() and time()
 #include <sys/stat.h>
-#include <algorithm>
 
 #ifdef PHAVE_UTIME_H
 #include <utime.h>
@@ -42,12 +41,6 @@
 #include <dirent.h>
 #endif
 
-// It's true that dtoolbase.h includes this already, but we include this again
-// in case we are building this file within ppremake.
-#ifdef PHAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #if defined(__ANDROID__) && !defined(PHAVE_LOCKF)
 // Needed for flock.
 #include <sys/file.h>

dtool/src/dtoolutil/filename.h

@@ -15,14 +15,13 @@
 #define FILENAME_H
 
 #include "dtoolbase.h"
+#include "atomicAdjust.h"
 #include "pandaFileStream.h"
 #include "typeHandle.h"
 #include "register_type.h"
 #include "vector_string.h"
 #include "textEncoder.h"
 
-#include <assert.h>
-
 class DSearchPath;
 
 /**

dtool/src/dtoolutil/globPattern.cxx

@@ -12,8 +12,11 @@
  */
 
 #include "globPattern.h"
+
 #include "string_utils.h"
+
 #include <ctype.h>
+#include <iterator> // for std::distance
 
 using std::string;
 

dtool/src/dtoolutil/lineStreamBuf.cxx

@@ -13,6 +13,8 @@
 
 #include "lineStreamBuf.h"
 
+#include <cstdio> // for EOF
+
 using std::string;
 
 /**

dtool/src/dtoolutil/lineStreamBuf.h

@@ -16,8 +16,6 @@
 
 #include "dtoolbase.h"
 
-#include <string>
-
 /**
  * Used by LineStream to implement an ostream that writes to a memory buffer,
  * whose contents can be continuously extracted as a sequence of lines of

dtool/src/dtoolutil/pandaFileStreamBuf.cxx

@@ -12,15 +12,16 @@
  */
 
 #include "pandaFileStreamBuf.h"
-#include "memoryHook.h"
+
+#ifdef USE_PANDAFILESTREAM
+
 #include "filename.h"
+#include "memoryHook.h"
 #include "textEncoder.h"
 
-#ifdef USE_PANDAFILESTREAM
+#include <cstdio> // for EOF
 
 #ifndef _WIN32
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #endif  // _WIN32

dtool/src/dtoolutil/pandaSystem.cxx

@@ -12,7 +12,9 @@
  */
 
 #include "pandaSystem.h"
+
 #include "pandaVersion.h"
+#include "memoryHook.h"
 #include "dtool_platform.h"
 
 using std::string;

dtool/src/dtoolutil/pandaSystem.h

@@ -15,8 +15,11 @@
 #define PANDASYSTEM_H
 
 #include "dtoolbase.h"
+
 #include "pmap.h"
 #include "pvector.h"
+#include "register_type.h"
+#include "typeHandle.h"
 
 /**
  * This class is used as a namespace to group several global properties of

dtool/src/dtoolutil/pfstream.h

@@ -14,6 +14,8 @@
 #ifndef __PFSTREAM_H__
 #define __PFSTREAM_H__
 
+#include "dtoolbase.h"
+
 #include "pfstreamBuf.h"
 
 class EXPCL_DTOOL_DTOOLUTIL IPipeStream : public std::istream {