diff --git a/dtool/src/cppparser/cppEnumType.cxx b/dtool/src/cppparser/cppEnumType.cxx
index e3506d0ad1..abb8e595ed 100644
--- a/dtool/src/cppparser/cppEnumType.cxx
+++ b/dtool/src/cppparser/cppEnumType.cxx
@@ -19,6 +19,7 @@
 #include "cppConstType.h"
 #include "cppScope.h"
 #include "cppParser.h"
+#include "cppIdentifier.h"
 #include "indent.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/dtool/src/cppparser/cppPreprocessor.cxx b/dtool/src/cppparser/cppPreprocessor.cxx
index e405f2cf4c..e4e83c13e3 100644
--- a/dtool/src/cppparser/cppPreprocessor.cxx
+++ b/dtool/src/cppparser/cppPreprocessor.cxx
@@ -20,6 +20,11 @@
 #include "cppIdentifier.h"
 #include "cppTemplateScope.h"
 #include "cppTemplateParameterList.h"
+#include "cppConstType.h"
+#include "cppFunctionGroup.h"
+#include "cppFunctionType.h"
+#include "cppPointerType.h"
+#include "cppParameterList.h"
 #include "cppSimpleType.h"
 #include "cppGlobals.h"
 #include "cppCommentBlock.h"
diff --git a/dtool/src/cppparser/cppScope.cxx b/dtool/src/cppparser/cppScope.cxx
index 4118668ed4..fc221591c6 100644
--- a/dtool/src/cppparser/cppScope.cxx
+++ b/dtool/src/cppparser/cppScope.cxx
@@ -14,6 +14,7 @@
 
 
 #include "cppScope.h"
+#include "cppParser.h"
 #include "cppDeclaration.h"
 #include "cppNamespace.h"
 #include "cppTypedefType.h"
diff --git a/dtool/src/cppparser/cppStructType.h b/dtool/src/cppparser/cppStructType.h
index bbbbaa324a..66f9381964 100644
--- a/dtool/src/cppparser/cppStructType.h
+++ b/dtool/src/cppparser/cppStructType.h
@@ -17,7 +17,9 @@
 
 #include "dtoolbase.h"
 
+#include "cppIdentifier.h"
 #include "cppExtensionType.h"
+#include "cppFunctionGroup.h"
 #include "cppVisibility.h"
 
 #include <vector>
diff --git a/dtool/src/cppparser/cppToken.cxx b/dtool/src/cppparser/cppToken.cxx
index 56b215ad22..5f247fef68 100644
--- a/dtool/src/cppparser/cppToken.cxx
+++ b/dtool/src/cppparser/cppToken.cxx
@@ -14,6 +14,7 @@
 
 
 #include "cppToken.h"
+#include "cppExpression.h"
 #include "cppIdentifier.h"
 #include "cppBison.h"