diff --git a/direct/src/dcparser/dcbase.h b/direct/src/dcparser/dcbase.h
index 4eba1e177e..1e62a16441 100644
--- a/direct/src/dcparser/dcbase.h
+++ b/direct/src/dcparser/dcbase.h
@@ -30,10 +30,10 @@
 // On the other hand, if WITHIN_PANDA is defined, we *are* safely
 // within the Panda environment.
 
-#include <directbase.h>
-#include <notify.h>
-#include <filename.h>
-#include <numeric_types.h>
+#include "directbase.h"
+#include "notify.h"
+#include "filename.h"
+#include "numeric_types.h"
 #include "pvector.h"
 #include "pmap.h"
 
diff --git a/direct/src/deadrec/correction.h b/direct/src/deadrec/correction.h
index 35935b90d0..026bd90317 100644
--- a/direct/src/deadrec/correction.h
+++ b/direct/src/deadrec/correction.h
@@ -19,8 +19,8 @@
 #ifndef __CORRECTION_H__
 #define __CORRECTION_H__
 
-#include <directbase.h>
-#include <luse.h>
+#include "directbase.h"
+#include "luse.h"
 
 class Correction {
 protected:
diff --git a/direct/src/deadrec/prediction.h b/direct/src/deadrec/prediction.h
index 475a1c147c..f90d6d77c9 100644
--- a/direct/src/deadrec/prediction.h
+++ b/direct/src/deadrec/prediction.h
@@ -19,8 +19,8 @@
 #ifndef __PREDICTION_H__
 #define __PREDICTION_H__
 
-#include <directbase.h>
-#include <luse.h>
+#include "directbase.h"
+#include "luse.h"
 
 class Prediction {
 protected:
diff --git a/direct/src/directbase/directbase.h b/direct/src/directbase/directbase.h
index 0352f09cfa..75df42abb0 100644
--- a/direct/src/directbase/directbase.h
+++ b/direct/src/directbase/directbase.h
@@ -23,7 +23,7 @@
 #ifndef DIRECTBASE_H
 #define DIRECTBASE_H
 
-#include <pandabase.h>
+#include "pandabase.h"
 #include "directsymbols.h"
 
 #endif
diff --git a/dtool/src/cppparser/cppArrayType.h b/dtool/src/cppparser/cppArrayType.h
index 2045fa42b0..520e17f22e 100644
--- a/dtool/src/cppparser/cppArrayType.h
+++ b/dtool/src/cppparser/cppArrayType.h
@@ -19,7 +19,7 @@
 #ifndef CPPARRAYTYPE_H
 #define CPPARRAYTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppBisonDefs.h b/dtool/src/cppparser/cppBisonDefs.h
index 573aa05e19..475f0ed43d 100644
--- a/dtool/src/cppparser/cppBisonDefs.h
+++ b/dtool/src/cppparser/cppBisonDefs.h
@@ -24,7 +24,7 @@
 // to be used directly; they're defined here strictly to be used by
 // the CPPParser and CPPExpressionParser classes.
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include <string>
 
diff --git a/dtool/src/cppparser/cppClassTemplateParameter.h b/dtool/src/cppparser/cppClassTemplateParameter.h
index 280bc3ab20..f88cbce027 100644
--- a/dtool/src/cppparser/cppClassTemplateParameter.h
+++ b/dtool/src/cppparser/cppClassTemplateParameter.h
@@ -19,7 +19,7 @@
 #ifndef CPPCLASSTEMPLATEPARAMETER_H
 #define CPPCLASSTEMPLATEPARAMETER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppCommentBlock.h b/dtool/src/cppparser/cppCommentBlock.h
index 21e5b79ea8..7e1be12642 100644
--- a/dtool/src/cppparser/cppCommentBlock.h
+++ b/dtool/src/cppparser/cppCommentBlock.h
@@ -19,7 +19,7 @@
 #ifndef CPPCOMMENTBLOCK_H
 #define CPPCOMMENTBLOCK_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppFile.h"
 
diff --git a/dtool/src/cppparser/cppConstType.h b/dtool/src/cppparser/cppConstType.h
index b298b085f9..1e3caa0cb3 100644
--- a/dtool/src/cppparser/cppConstType.h
+++ b/dtool/src/cppparser/cppConstType.h
@@ -19,7 +19,7 @@
 #ifndef CPPCONSTTYPE_H
 #define CPPCONSTTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppDeclaration.h b/dtool/src/cppparser/cppDeclaration.h
index 463a6375a5..a641f017da 100644
--- a/dtool/src/cppparser/cppDeclaration.h
+++ b/dtool/src/cppparser/cppDeclaration.h
@@ -19,7 +19,7 @@
 #ifndef CPPDECLARATION_H
 #define CPPDECLARATION_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppVisibility.h"
 #include "cppFile.h"
diff --git a/dtool/src/cppparser/cppEnumType.h b/dtool/src/cppparser/cppEnumType.h
index 54c2412863..8889eef9a2 100644
--- a/dtool/src/cppparser/cppEnumType.h
+++ b/dtool/src/cppparser/cppEnumType.h
@@ -19,7 +19,7 @@
 #ifndef CPPENUMTYPE_H
 #define CPPENUMTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppExtensionType.h"
 
diff --git a/dtool/src/cppparser/cppExpression.h b/dtool/src/cppparser/cppExpression.h
index c4ced140d7..5946f425be 100644
--- a/dtool/src/cppparser/cppExpression.h
+++ b/dtool/src/cppparser/cppExpression.h
@@ -19,7 +19,7 @@
 #ifndef CPPEXPRESSION_H
 #define CPPEXPRESSION_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 
diff --git a/dtool/src/cppparser/cppExpressionParser.h b/dtool/src/cppparser/cppExpressionParser.h
index 069798c976..f93b6ebea0 100644
--- a/dtool/src/cppparser/cppExpressionParser.h
+++ b/dtool/src/cppparser/cppExpressionParser.h
@@ -19,7 +19,7 @@
 #ifndef CPPEXPRESSIONPARSER_H
 #define CPPEXPRESSIONPARSER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppPreprocessor.h"
 
diff --git a/dtool/src/cppparser/cppExtensionType.h b/dtool/src/cppparser/cppExtensionType.h
index c081600a11..f1ec4b4b36 100644
--- a/dtool/src/cppparser/cppExtensionType.h
+++ b/dtool/src/cppparser/cppExtensionType.h
@@ -19,7 +19,7 @@
 #ifndef CPPEXTENSIONTYPE_H
 #define CPPEXTENSIONTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 #include "cppInstance.h"
diff --git a/dtool/src/cppparser/cppFile.h b/dtool/src/cppparser/cppFile.h
index 2d1e5e0537..e3c18dc67c 100644
--- a/dtool/src/cppparser/cppFile.h
+++ b/dtool/src/cppparser/cppFile.h
@@ -19,8 +19,8 @@
 #ifndef CPPFILE_H
 #define CPPFILE_H
 
-#include <dtoolbase.h>
-#include <filename.h>
+#include "dtoolbase.h"
+#include "filename.h"
 
 ///////////////////////////////////////////////////////////////////
 //       Class : CPPFile
diff --git a/dtool/src/cppparser/cppFunctionGroup.h b/dtool/src/cppparser/cppFunctionGroup.h
index 9bc2ee081c..907351bb45 100644
--- a/dtool/src/cppparser/cppFunctionGroup.h
+++ b/dtool/src/cppparser/cppFunctionGroup.h
@@ -19,7 +19,7 @@
 #ifndef CPPFUNCTIONGROUP_H
 #define CPPFUNCTIONGROUP_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 
diff --git a/dtool/src/cppparser/cppFunctionType.h b/dtool/src/cppparser/cppFunctionType.h
index b86a7406bd..699947f67c 100644
--- a/dtool/src/cppparser/cppFunctionType.h
+++ b/dtool/src/cppparser/cppFunctionType.h
@@ -19,7 +19,7 @@
 #ifndef CPPFUNCTIONTYPE_H
 #define CPPFUNCTIONTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppGlobals.h b/dtool/src/cppparser/cppGlobals.h
index 01f37b47f7..2cf5348402 100644
--- a/dtool/src/cppparser/cppGlobals.h
+++ b/dtool/src/cppparser/cppGlobals.h
@@ -19,7 +19,7 @@
 #ifndef CPPGLOBALS_H
 #define CPPGLOBALS_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 // Some compilers (notably VC++) define a special keyword to represent
 // a 64-bit integer, but don't recognize "long long int".  To parse
diff --git a/dtool/src/cppparser/cppIdentifier.h b/dtool/src/cppparser/cppIdentifier.h
index e692031f75..f4990463b7 100644
--- a/dtool/src/cppparser/cppIdentifier.h
+++ b/dtool/src/cppparser/cppIdentifier.h
@@ -19,7 +19,7 @@
 #ifndef CPPIDENTIFIER_H
 #define CPPIDENTIFIER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 #include "cppNameComponent.h"
diff --git a/dtool/src/cppparser/cppInstance.h b/dtool/src/cppparser/cppInstance.h
index fde6962fd8..a7ef422ec1 100644
--- a/dtool/src/cppparser/cppInstance.h
+++ b/dtool/src/cppparser/cppInstance.h
@@ -19,7 +19,7 @@
 #ifndef CPPINSTANCE_H
 #define CPPINSTANCE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 #include "cppType.h"
diff --git a/dtool/src/cppparser/cppInstanceIdentifier.h b/dtool/src/cppparser/cppInstanceIdentifier.h
index d7ddff7d19..a67c03757e 100644
--- a/dtool/src/cppparser/cppInstanceIdentifier.h
+++ b/dtool/src/cppparser/cppInstanceIdentifier.h
@@ -19,7 +19,7 @@
 #ifndef CPPINSTANCEIDENTIFIER_H
 #define CPPINSTANCEIDENTIFIER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include <vector>
 #include <string>
diff --git a/dtool/src/cppparser/cppManifest.h b/dtool/src/cppparser/cppManifest.h
index eba373bbcb..3516e5ab39 100644
--- a/dtool/src/cppparser/cppManifest.h
+++ b/dtool/src/cppparser/cppManifest.h
@@ -19,7 +19,7 @@
 #ifndef CPPMANIFEST_H
 #define CPPMANIFEST_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppFile.h"
 #include "cppVisibility.h"
diff --git a/dtool/src/cppparser/cppNameComponent.h b/dtool/src/cppparser/cppNameComponent.h
index b3f2c970e3..c85c6fe1a7 100644
--- a/dtool/src/cppparser/cppNameComponent.h
+++ b/dtool/src/cppparser/cppNameComponent.h
@@ -19,7 +19,7 @@
 #ifndef CPPNAMECOMPONENT_H
 #define CPPNAMECOMPONENT_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include <string>
 
diff --git a/dtool/src/cppparser/cppNamespace.h b/dtool/src/cppparser/cppNamespace.h
index 36133becdf..74832ac19f 100644
--- a/dtool/src/cppparser/cppNamespace.h
+++ b/dtool/src/cppparser/cppNamespace.h
@@ -19,7 +19,7 @@
 #ifndef CPPNAMESPACE_H
 #define CPPNAMESPACE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 
diff --git a/dtool/src/cppparser/cppParameterList.h b/dtool/src/cppparser/cppParameterList.h
index b1bf367e01..f12ca3ec7e 100644
--- a/dtool/src/cppparser/cppParameterList.h
+++ b/dtool/src/cppparser/cppParameterList.h
@@ -19,7 +19,7 @@
 #ifndef CPPPARAMETERLIST_H
 #define CPPPARAMETERLIST_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 
diff --git a/dtool/src/cppparser/cppParser.h b/dtool/src/cppparser/cppParser.h
index 5f3f9a7c55..7cd4211e55 100644
--- a/dtool/src/cppparser/cppParser.h
+++ b/dtool/src/cppparser/cppParser.h
@@ -19,7 +19,7 @@
 #ifndef CPPPARSER_H
 #define CPPPARSER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppScope.h"
 #include "cppPreprocessor.h"