diff --git a/dtool/metalibs/dtoolconfig/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx
index a4860a6e49..b446f0b7cc 100644
--- a/dtool/metalibs/dtoolconfig/pydtool.cxx
+++ b/dtool/metalibs/dtoolconfig/pydtool.cxx
@@ -6,10 +6,10 @@
 
 
 #include "interrogate_interface.h"
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #undef HAVE_LONG_LONG
-#include <Python.h>
+#include "Python.h"
 
 extern "C" {
 
diff --git a/dtool/src/cppparser/cppPointerType.h b/dtool/src/cppparser/cppPointerType.h
index e33401896f..d135f4fb1c 100644
--- a/dtool/src/cppparser/cppPointerType.h
+++ b/dtool/src/cppparser/cppPointerType.h
@@ -19,7 +19,7 @@
 #ifndef CPPPOINTERTYPE_H
 #define CPPPOINTERTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppPreprocessor.h b/dtool/src/cppparser/cppPreprocessor.h
index 05b26d20da..a6d1bcded4 100644
--- a/dtool/src/cppparser/cppPreprocessor.h
+++ b/dtool/src/cppparser/cppPreprocessor.h
@@ -19,7 +19,7 @@
 #ifndef CPPPREPROCESSOR_H
 #define CPPPREPROCESSOR_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppManifest.h"
 #include "cppToken.h"
diff --git a/dtool/src/cppparser/cppReferenceType.h b/dtool/src/cppparser/cppReferenceType.h
index 705d9010b1..fb8b8c72e2 100644
--- a/dtool/src/cppparser/cppReferenceType.h
+++ b/dtool/src/cppparser/cppReferenceType.h
@@ -19,7 +19,7 @@
 #ifndef CPPREFERENCETYPE_H
 #define CPPREFERENCETYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppScope.h b/dtool/src/cppparser/cppScope.h
index 0e3c0e661e..c1715e514c 100644
--- a/dtool/src/cppparser/cppScope.h
+++ b/dtool/src/cppparser/cppScope.h
@@ -19,7 +19,7 @@
 #ifndef CPPSCOPE_H
 #define CPPSCOPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppVisibility.h"
 #include "cppTemplateParameterList.h"
diff --git a/dtool/src/cppparser/cppSimpleType.h b/dtool/src/cppparser/cppSimpleType.h
index 3fc79b79ae..1481215fd2 100644
--- a/dtool/src/cppparser/cppSimpleType.h
+++ b/dtool/src/cppparser/cppSimpleType.h
@@ -19,7 +19,7 @@
 #ifndef CPPSIMPLETYPE_H
 #define CPPSIMPLETYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppStructType.h b/dtool/src/cppparser/cppStructType.h
index 525f5baa04..d77c47f3f8 100644
--- a/dtool/src/cppparser/cppStructType.h
+++ b/dtool/src/cppparser/cppStructType.h
@@ -19,7 +19,7 @@
 #ifndef CPPSTRUCTTYPE_H
 #define CPPSTRUCTTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppExtensionType.h"
 #include "cppVisibility.h"
diff --git a/dtool/src/cppparser/cppTBDType.h b/dtool/src/cppparser/cppTBDType.h
index d0db566825..29cec2a293 100644
--- a/dtool/src/cppparser/cppTBDType.h
+++ b/dtool/src/cppparser/cppTBDType.h
@@ -19,7 +19,7 @@
 #ifndef CPPTBDTYPE_H
 #define CPPTBDTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppTemplateParameterList.h b/dtool/src/cppparser/cppTemplateParameterList.h
index 0d2dd5e3af..ad49f6418b 100644
--- a/dtool/src/cppparser/cppTemplateParameterList.h
+++ b/dtool/src/cppparser/cppTemplateParameterList.h
@@ -19,7 +19,7 @@
 #ifndef CPPTEMPLATEPARAMETERLIST_H
 #define CPPTEMPLATEPARAMETERLIST_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 
diff --git a/dtool/src/cppparser/cppTemplateScope.h b/dtool/src/cppparser/cppTemplateScope.h
index 8b115426f3..6e8a13f32b 100644
--- a/dtool/src/cppparser/cppTemplateScope.h
+++ b/dtool/src/cppparser/cppTemplateScope.h
@@ -19,7 +19,7 @@
 #ifndef CPPTEMPLATESCOPE_H
 #define CPPTEMPLATESCOPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppScope.h"
 #include "cppTemplateParameterList.h"
diff --git a/dtool/src/cppparser/cppToken.h b/dtool/src/cppparser/cppToken.h
index 1d8c0309d7..8a916628fb 100644
--- a/dtool/src/cppparser/cppToken.h
+++ b/dtool/src/cppparser/cppToken.h
@@ -19,7 +19,7 @@
 #ifndef CPPTOKEN_H
 #define CPPTOKEN_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppBisonDefs.h"
 
diff --git a/dtool/src/cppparser/cppType.h b/dtool/src/cppparser/cppType.h
index b33e4165fe..0ed49ff03e 100644
--- a/dtool/src/cppparser/cppType.h
+++ b/dtool/src/cppparser/cppType.h
@@ -19,7 +19,7 @@
 #ifndef CPPTYPE_H
 #define CPPTYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 
diff --git a/dtool/src/cppparser/cppTypeDeclaration.h b/dtool/src/cppparser/cppTypeDeclaration.h
index 4bf420f392..2f12e29cc4 100644
--- a/dtool/src/cppparser/cppTypeDeclaration.h
+++ b/dtool/src/cppparser/cppTypeDeclaration.h
@@ -19,7 +19,7 @@
 #ifndef CPPTYPEDECLARATION_H
 #define CPPTYPEDECLARATION_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppInstance.h"
 
diff --git a/dtool/src/cppparser/cppTypeParser.h b/dtool/src/cppparser/cppTypeParser.h
index 3e1ef7addd..71865a8494 100644
--- a/dtool/src/cppparser/cppTypeParser.h
+++ b/dtool/src/cppparser/cppTypeParser.h
@@ -19,7 +19,7 @@
 #ifndef CPPTYPEPARSER_H
 #define CPPTYPEPARSER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppPreprocessor.h"
 
diff --git a/dtool/src/cppparser/cppTypeProxy.h b/dtool/src/cppparser/cppTypeProxy.h
index 83f774bc0e..02125ae81d 100644
--- a/dtool/src/cppparser/cppTypeProxy.h
+++ b/dtool/src/cppparser/cppTypeProxy.h
@@ -19,7 +19,7 @@
 #ifndef CPPTYPEPROXY_H
 #define CPPTYPEPROXY_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppType.h"
 
diff --git a/dtool/src/cppparser/cppTypedef.h b/dtool/src/cppparser/cppTypedef.h
index d2f9b644c0..f6cd7021fa 100644
--- a/dtool/src/cppparser/cppTypedef.h
+++ b/dtool/src/cppparser/cppTypedef.h
@@ -19,7 +19,7 @@
 #ifndef CPPTYPEDEF_H
 #define CPPTYPEDEF_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppInstance.h"
 
diff --git a/dtool/src/cppparser/cppUsing.h b/dtool/src/cppparser/cppUsing.h
index dbff0deba8..b7b4111225 100644
--- a/dtool/src/cppparser/cppUsing.h
+++ b/dtool/src/cppparser/cppUsing.h
@@ -19,7 +19,7 @@
 #ifndef CPPUSING_H
 #define CPPUSING_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "cppDeclaration.h"
 
diff --git a/dtool/src/cppparser/cppVisibility.h b/dtool/src/cppparser/cppVisibility.h
index a3d0ce8dfc..d109a320bd 100644
--- a/dtool/src/cppparser/cppVisibility.h
+++ b/dtool/src/cppparser/cppVisibility.h
@@ -19,7 +19,7 @@
 #ifndef CPPVISIBILITY_H
 #define CPPVISIBILITY_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 enum CPPVisibility {
   V_published,
diff --git a/dtool/src/cppparser/indent.h b/dtool/src/cppparser/indent.h
index c0f4b7dafc..b75c8cd97a 100644
--- a/dtool/src/cppparser/indent.h
+++ b/dtool/src/cppparser/indent.h
@@ -19,7 +19,7 @@
 #ifndef INDENT_H
 #define INDENT_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: indent
diff --git a/dtool/src/dconfig/notifyCategoryProxy.h b/dtool/src/dconfig/notifyCategoryProxy.h
index 8019133d92..7c4f9644c9 100644
--- a/dtool/src/dconfig/notifyCategoryProxy.h
+++ b/dtool/src/dconfig/notifyCategoryProxy.h
@@ -19,7 +19,7 @@
 #ifndef NOTIFYCATEGORYPROXY_H
 #define NOTIFYCATEGORYPROXY_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "notifyCategory.h"
 #include "notifySeverity.h"
diff --git a/dtool/src/dconfig/serialization.h b/dtool/src/dconfig/serialization.h
index 4e80456baa..18075d7198 100644
--- a/dtool/src/dconfig/serialization.h
+++ b/dtool/src/dconfig/serialization.h
@@ -19,7 +19,7 @@
 #ifndef __SERIALIZATION_H__
 #define __SERIALIZATION_H__
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "config_setup.h"
 
diff --git a/dtool/src/dconfig/symbolEnt.h b/dtool/src/dconfig/symbolEnt.h
index 19493f3be6..aaa3bab0a9 100644
--- a/dtool/src/dconfig/symbolEnt.h
+++ b/dtool/src/dconfig/symbolEnt.h
@@ -19,7 +19,7 @@
 #ifndef SYMBOLENT_H
 #define SYMBOLENT_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "config_setup.h"
 #include "pvector.h"
diff --git a/dtool/src/dtoolutil/executionEnvironment.h b/dtool/src/dtoolutil/executionEnvironment.h
index d8a9f079ff..6455fd93e3 100644
--- a/dtool/src/dtoolutil/executionEnvironment.h
+++ b/dtool/src/dtoolutil/executionEnvironment.h
@@ -19,7 +19,7 @@
 #ifndef EXECUTIONENVIRONMENT_H
 #define EXECUTIONENVIRONMENT_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "vector_string.h"
 #include "filename.h"
diff --git a/dtool/src/dtoolutil/gnu_getopt.c b/dtool/src/dtoolutil/gnu_getopt.c
index 8878db9ba0..8b8eb02dcc 100644
--- a/dtool/src/dtoolutil/gnu_getopt.c
+++ b/dtool/src/dtoolutil/gnu_getopt.c
@@ -17,7 +17,7 @@
    GNU General Public License for more details.  */
 
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_LONG_ONLY)
 
diff --git a/dtool/src/dtoolutil/gnu_getopt1.c b/dtool/src/dtoolutil/gnu_getopt1.c
index cc4db2ad2c..bb2a032e41 100644
--- a/dtool/src/dtoolutil/gnu_getopt1.c
+++ b/dtool/src/dtoolutil/gnu_getopt1.c
@@ -13,7 +13,7 @@
    GNU General Public License for more details.  */
 
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #ifndef HAVE_GETOPT_LONG_ONLY
 
diff --git a/dtool/src/dtoolutil/load_dso.h b/dtool/src/dtoolutil/load_dso.h
index 55cef6ca3c..081301db62 100644
--- a/dtool/src/dtoolutil/load_dso.h
+++ b/dtool/src/dtoolutil/load_dso.h
@@ -19,7 +19,7 @@
 #ifndef LOAD_DSO_H
 #define LOAD_DSO_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "filename.h"
 
diff --git a/dtool/src/dtoolutil/pfstreamBuf.h b/dtool/src/dtoolutil/pfstreamBuf.h
index a3a2db71a9..add3cb3748 100644
--- a/dtool/src/dtoolutil/pfstreamBuf.h
+++ b/dtool/src/dtoolutil/pfstreamBuf.h
@@ -19,7 +19,7 @@
 #ifndef __PFSTREAMBUF_H__
 #define __PFSTREAMBUF_H__
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 #include <string>
 #include <stdio.h>
 
diff --git a/dtool/src/interrogate/interrogateBuilder.h b/dtool/src/interrogate/interrogateBuilder.h
index 0bbb8a103b..5207100eac 100644
--- a/dtool/src/interrogate/interrogateBuilder.h
+++ b/dtool/src/interrogate/interrogateBuilder.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATEBUILDER_H
 #define INTERROGATEBUILDER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "interrogate_interface.h"
 #include "interrogate_request.h"
diff --git a/dtool/src/interrogate/interrogate_module.cxx b/dtool/src/interrogate/interrogate_module.cxx
index 9b2eb6eeb9..856295eb81 100644
--- a/dtool/src/interrogate/interrogate_module.cxx
+++ b/dtool/src/interrogate/interrogate_module.cxx
@@ -80,9 +80,9 @@ upcase_string(const string &str) {
 
 int
 write_python_table(ostream &out) {
-  out << "\n#include <dtoolbase.h>\n"
-      << "#include <interrogate_request.h>\n\n"
-      << "#include <Python.h>\n\n";
+  out << "\n#include \"dtoolbase.h\"\n"
+      << "#include \"interrogate_request.h\"\n\n"
+      << "#include \"Python.h\"\n\n";
 
   int count = 0;
 
diff --git a/dtool/src/interrogate/parameterRemap.h b/dtool/src/interrogate/parameterRemap.h
index 2b697b5d01..48bb903b6d 100644
--- a/dtool/src/interrogate/parameterRemap.h
+++ b/dtool/src/interrogate/parameterRemap.h
@@ -19,9 +19,9 @@
 #ifndef PARAMETERREMAP_H
 #define PARAMETERREMAP_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
-#include <interrogate_interface.h>
+#include "interrogate_interface.h"
 
 class CPPType;
 class CPPExpression;
diff --git a/dtool/src/interrogate/parameterRemapBasicStringRefToString.h b/dtool/src/interrogate/parameterRemapBasicStringRefToString.h
index 91f4025df5..8b7e3fc7d7 100644
--- a/dtool/src/interrogate/parameterRemapBasicStringRefToString.h
+++ b/dtool/src/interrogate/parameterRemapBasicStringRefToString.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPBASICSTRINGREFTOSTRING_H
 #define PARAMETERREMAPBASICSTRINGREFTOSTRING_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemapToString.h"
 
diff --git a/dtool/src/interrogate/parameterRemapBasicStringToString.h b/dtool/src/interrogate/parameterRemapBasicStringToString.h
index c066208a89..b76b2f3020 100644
--- a/dtool/src/interrogate/parameterRemapBasicStringToString.h
+++ b/dtool/src/interrogate/parameterRemapBasicStringToString.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPBASICSTRINGTOSTRING_H
 #define PARAMETERREMAPBASICSTRINGTOSTRING_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemapToString.h"
 
diff --git a/dtool/src/interrogate/parameterRemapCharStarToString.h b/dtool/src/interrogate/parameterRemapCharStarToString.h
index 7b2876c7ca..ae7cf741b0 100644
--- a/dtool/src/interrogate/parameterRemapCharStarToString.h
+++ b/dtool/src/interrogate/parameterRemapCharStarToString.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPCHARSTARTOSTRING_H
 #define PARAMETERREMAPCHARSTARTOSTRING_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemapToString.h"
 
diff --git a/dtool/src/interrogate/parameterRemapConcreteToPointer.h b/dtool/src/interrogate/parameterRemapConcreteToPointer.h
index c2f6b4fd65..e5c2c14cd5 100644
--- a/dtool/src/interrogate/parameterRemapConcreteToPointer.h
+++ b/dtool/src/interrogate/parameterRemapConcreteToPointer.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPCONCRETETOPOINTER_H
 #define PARAMETERREMAPCONCRETETOPOINTER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapConstToNonConst.h b/dtool/src/interrogate/parameterRemapConstToNonConst.h
index 066ea4d76a..07c38189d4 100644
--- a/dtool/src/interrogate/parameterRemapConstToNonConst.h
+++ b/dtool/src/interrogate/parameterRemapConstToNonConst.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPCONSTTONONCONST_H
 #define PARAMETERREMAPCONSTTONONCONST_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapEnumToInt.h b/dtool/src/interrogate/parameterRemapEnumToInt.h
index 756b3204c2..74dd62ca81 100644
--- a/dtool/src/interrogate/parameterRemapEnumToInt.h
+++ b/dtool/src/interrogate/parameterRemapEnumToInt.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPENUMTOINT_H
 #define PARAMETERREMAPENUMTOINT_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapPTToPointer.h b/dtool/src/interrogate/parameterRemapPTToPointer.h
index b98fb656e5..eb414052a1 100644
--- a/dtool/src/interrogate/parameterRemapPTToPointer.h
+++ b/dtool/src/interrogate/parameterRemapPTToPointer.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPPTTOPOINTER_H
 #define PARAMETERREMAPPTTOPOINTER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapReferenceToConcrete.h b/dtool/src/interrogate/parameterRemapReferenceToConcrete.h
index 50d710c36b..f4aa6d33bc 100644
--- a/dtool/src/interrogate/parameterRemapReferenceToConcrete.h
+++ b/dtool/src/interrogate/parameterRemapReferenceToConcrete.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPREFERENCETOCONCRETE_H
 #define PARAMETERREMAPREFERENCETOCONCRETE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapReferenceToPointer.h b/dtool/src/interrogate/parameterRemapReferenceToPointer.h
index 2316028a4f..39a30ec847 100644
--- a/dtool/src/interrogate/parameterRemapReferenceToPointer.h
+++ b/dtool/src/interrogate/parameterRemapReferenceToPointer.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPREFERENCETOPOINTER_H
 #define PARAMETERREMAPREFERENCETOPOINTER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapThis.h b/dtool/src/interrogate/parameterRemapThis.h
index da00dd0d73..01444ed8f9 100644
--- a/dtool/src/interrogate/parameterRemapThis.h
+++ b/dtool/src/interrogate/parameterRemapThis.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPTHIS_H
 #define PARAMETERREMAPTHIS_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapToString.h b/dtool/src/interrogate/parameterRemapToString.h
index 2fd8691d06..a7954a1fb2 100644
--- a/dtool/src/interrogate/parameterRemapToString.h
+++ b/dtool/src/interrogate/parameterRemapToString.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPTOSTRING_H
 #define PARAMETERREMAPTOSTRING_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/parameterRemapUnchanged.h b/dtool/src/interrogate/parameterRemapUnchanged.h
index 9a2ff15efb..218a386dab 100644
--- a/dtool/src/interrogate/parameterRemapUnchanged.h
+++ b/dtool/src/interrogate/parameterRemapUnchanged.h
@@ -19,7 +19,7 @@
 #ifndef PARAMETERREMAPUNCHANGED_H
 #define PARAMETERREMAPUNCHANGED_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "parameterRemap.h"
 
diff --git a/dtool/src/interrogate/typeManager.h b/dtool/src/interrogate/typeManager.h
index 0e4c8598af..4dd260bfe3 100644
--- a/dtool/src/interrogate/typeManager.h
+++ b/dtool/src/interrogate/typeManager.h
@@ -19,7 +19,7 @@
 #ifndef TYPEMANAGER_H
 #define TYPEMANAGER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 class CPPFunctionGroup;
 class CPPInstance;
diff --git a/dtool/src/interrogatedb/config_interrogatedb.h b/dtool/src/interrogatedb/config_interrogatedb.h
index 8f276c5623..a42a125c2f 100644
--- a/dtool/src/interrogatedb/config_interrogatedb.h
+++ b/dtool/src/interrogatedb/config_interrogatedb.h
@@ -19,9 +19,9 @@
 #ifndef CONFIG_INTERROGATEDB_H
 #define CONFIG_INTERROGATEDB_H
 
-#include <dtoolbase.h>
-#include <notifyCategoryProxy.h>
-#include <dSearchPath.h>
+#include "dtoolbase.h"
+#include "notifyCategoryProxy.h"
+#include "dSearchPath.h"
 
 NotifyCategoryDecl(interrogatedb, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
 
diff --git a/dtool/src/interrogatedb/indexRemapper.h b/dtool/src/interrogatedb/indexRemapper.h
index 33f296ffec..f3c149dc42 100644
--- a/dtool/src/interrogatedb/indexRemapper.h
+++ b/dtool/src/interrogatedb/indexRemapper.h
@@ -19,7 +19,7 @@
 #ifndef INDEXREMAPPER_H
 #define INDEXREMAPPER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include <map>
 
diff --git a/dtool/src/interrogatedb/interrogateComponent.h b/dtool/src/interrogatedb/interrogateComponent.h
index 0ec39fd9c5..deaefcb3d2 100644
--- a/dtool/src/interrogatedb/interrogateComponent.h
+++ b/dtool/src/interrogatedb/interrogateComponent.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATECOMPONENT_H
 #define INTERROGATECOMPONENT_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "interrogate_interface.h"
 #include "interrogate_request.h"
diff --git a/dtool/src/interrogatedb/interrogateDatabase.h b/dtool/src/interrogatedb/interrogateDatabase.h
index aec745a2cc..38cc074a39 100644
--- a/dtool/src/interrogatedb/interrogateDatabase.h
+++ b/dtool/src/interrogatedb/interrogateDatabase.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATEDATABASE_H
 #define INTERROGATEDATABASE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "interrogate_interface.h"
 #include "interrogateType.h"
diff --git a/dtool/src/interrogatedb/interrogateElement.h b/dtool/src/interrogatedb/interrogateElement.h
index 54a8f60ea0..57ac6c1e77 100644
--- a/dtool/src/interrogatedb/interrogateElement.h
+++ b/dtool/src/interrogatedb/interrogateElement.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATEELEMENT_H
 #define INTERROGATEELEMENT_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "interrogateComponent.h"
 
diff --git a/dtool/src/interrogatedb/interrogateFunctionWrapper.h b/dtool/src/interrogatedb/interrogateFunctionWrapper.h
index 173c402421..93c66fdbfd 100644
--- a/dtool/src/interrogatedb/interrogateFunctionWrapper.h
+++ b/dtool/src/interrogatedb/interrogateFunctionWrapper.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATEFUNCTIONWRAPPER_H
 #define INTERROGATEFUNCTIONWRAPPER_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "interrogateComponent.h"
 
diff --git a/dtool/src/interrogatedb/interrogateManifest.h b/dtool/src/interrogatedb/interrogateManifest.h
index 4c0eb4e88e..f83a3740ee 100644
--- a/dtool/src/interrogatedb/interrogateManifest.h
+++ b/dtool/src/interrogatedb/interrogateManifest.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATEMANIFEST_H
 #define INTERROGATEMANIFEST_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "interrogateComponent.h"
 
diff --git a/dtool/src/interrogatedb/interrogateType.h b/dtool/src/interrogatedb/interrogateType.h
index f1424d50b6..20a9ff737b 100644
--- a/dtool/src/interrogatedb/interrogateType.h
+++ b/dtool/src/interrogatedb/interrogateType.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATETYPE_H
 #define INTERROGATETYPE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #include "interrogateComponent.h"
 
diff --git a/dtool/src/interrogatedb/interrogate_datafile.h b/dtool/src/interrogatedb/interrogate_datafile.h
index f515ad6190..ce7b1aab6a 100644
--- a/dtool/src/interrogatedb/interrogate_datafile.h
+++ b/dtool/src/interrogatedb/interrogate_datafile.h
@@ -22,7 +22,7 @@
 // This file defines some convenience functions for reading and
 // writing the interrogate database files.
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 #include <vector>
 
 void idf_output_string(ostream &out, const string &str, char whitespace = ' ');
diff --git a/dtool/src/interrogatedb/interrogate_interface.h b/dtool/src/interrogatedb/interrogate_interface.h
index d6df51e2f4..93e9d99b00 100644
--- a/dtool/src/interrogatedb/interrogate_interface.h
+++ b/dtool/src/interrogatedb/interrogate_interface.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATE_INTERFACE_H
 #define INTERROGATE_INTERFACE_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dtool/src/interrogatedb/interrogate_request.h b/dtool/src/interrogatedb/interrogate_request.h
index db78803c14..abf6ab4cd7 100644
--- a/dtool/src/interrogatedb/interrogate_request.h
+++ b/dtool/src/interrogatedb/interrogate_request.h
@@ -19,7 +19,7 @@
 #ifndef INTERROGATE_REQUEST
 #define INTERROGATE_REQUEST
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 /*
  * The functions here are simple functions that are intended to be
diff --git a/dtool/src/pystub/pystub.h b/dtool/src/pystub/pystub.h
index 7213b33125..7d58fa2053 100644
--- a/dtool/src/pystub/pystub.h
+++ b/dtool/src/pystub/pystub.h
@@ -19,7 +19,7 @@
 #ifndef PYSTUB_H
 #define PYSTUB_H
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
 // The sole purpose of this header file is to allow a program other
 // than Python to load in a module that includes Python wrappers.
diff --git a/dtool/src/test_interrogate/test_interrogate.cxx b/dtool/src/test_interrogate/test_interrogate.cxx
index c63d48816d..85b25b8fa3 100644
--- a/dtool/src/test_interrogate/test_interrogate.cxx
+++ b/dtool/src/test_interrogate/test_interrogate.cxx
@@ -16,13 +16,13 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include <dtoolbase.h>
+#include "dtoolbase.h"
 
-#include <interrogate_interface.h>
-#include <interrogate_request.h>
-#include <load_dso.h>
-#include <filename.h>
-#include <pystub.h>
+#include "interrogate_interface.h"
+#include "interrogate_request.h"
+#include "load_dso.h"
+#include "filename.h"
+#include "pystub.h"
 
 #include <stdlib.h>