diff --git a/contrib/src/rplight/gpuCommand.I b/contrib/src/rplight/gpuCommand.I
index 0171442b08..e344b44817 100644
--- a/contrib/src/rplight/gpuCommand.I
+++ b/contrib/src/rplight/gpuCommand.I
@@ -24,7 +24,7 @@
  *
  */
 
-#include "stdint.h"
+#include <stdint.h>
 
 /**
  * @brief Appends an integer to the GPUCommand.
diff --git a/direct/src/plugin/fileSpec.cxx b/direct/src/plugin/fileSpec.cxx
index c291bfc14a..fd7169c4d1 100644
--- a/direct/src/plugin/fileSpec.cxx
+++ b/direct/src/plugin/fileSpec.cxx
@@ -13,7 +13,7 @@
 
 #include "fileSpec.h"
 #include "wstring_encode.h"
-#include "openssl/md5.h"
+#include <openssl/md5.h>
 
 #include <fstream>
 #include <fcntl.h>
diff --git a/direct/src/plugin/get_twirl_data.cxx b/direct/src/plugin/get_twirl_data.cxx
index 1022790978..8d1bbd73fd 100644
--- a/direct/src/plugin/get_twirl_data.cxx
+++ b/direct/src/plugin/get_twirl_data.cxx
@@ -12,7 +12,7 @@
  */
 
 #include "get_twirl_data.h"
-#include "string.h"
+#include <string.h>
 
 struct twirl_flip {
   int _index;
diff --git a/direct/src/plugin/load_plugin.cxx b/direct/src/plugin/load_plugin.cxx
index 75def4fc10..a1575ff087 100644
--- a/direct/src/plugin/load_plugin.cxx
+++ b/direct/src/plugin/load_plugin.cxx
@@ -16,7 +16,7 @@
 #include "is_pathsep.h"
 #include "wstring_encode.h"
 
-#include "assert.h"
+#include <assert.h>
 
 #include <iostream>
 
diff --git a/direct/src/plugin/p3dCert.h b/direct/src/plugin/p3dCert.h
index 3c856c6ec3..c17c8129e8 100644
--- a/direct/src/plugin/p3dCert.h
+++ b/direct/src/plugin/p3dCert.h
@@ -18,9 +18,9 @@
 #include <FL/Fl_Window.H>
 
 #define OPENSSL_NO_KRB5
-#include "openssl/x509.h"
-#include "openssl/x509_vfy.h"
-#include "openssl/pem.h"
+#include <openssl/x509.h>
+#include <openssl/x509_vfy.h>
+#include <openssl/pem.h>
 
 #include <string>
 #include <iostream>
diff --git a/direct/src/plugin/p3dCert_wx.cxx b/direct/src/plugin/p3dCert_wx.cxx
index 125732adda..e7002db46a 100644
--- a/direct/src/plugin/p3dCert_wx.cxx
+++ b/direct/src/plugin/p3dCert_wx.cxx
@@ -15,8 +15,8 @@
 #include "wstring_encode.h"
 #include "mkdir_complete.h"
 
-#include "wx/cmdline.h"
-#include "wx/filename.h"
+#include <wx/cmdline.h>
+#include <wx/filename.h>
 
 #include "ca_bundle_data_src.c"
 
diff --git a/direct/src/plugin/p3dCert_wx.h b/direct/src/plugin/p3dCert_wx.h
index 1ea8765a17..b0b3dda12e 100644
--- a/direct/src/plugin/p3dCert_wx.h
+++ b/direct/src/plugin/p3dCert_wx.h
@@ -14,12 +14,12 @@
 #ifndef P3DCERT_WX_H
 #define P3DCERT_WX_H
 
-#include "wx/wx.h"
+#include <wx/wx.h>
 
 #define OPENSSL_NO_KRB5
-#include "openssl/x509.h"
-#include "openssl/x509_vfy.h"
-#include "openssl/pem.h"
+#include <openssl/x509.h>
+#include <openssl/x509_vfy.h>
+#include <openssl/pem.h>
 
 #include <string>
 #include <iostream>
diff --git a/direct/src/plugin/p3dHost.cxx b/direct/src/plugin/p3dHost.cxx
index 991a66df3e..db189e14c4 100644
--- a/direct/src/plugin/p3dHost.cxx
+++ b/direct/src/plugin/p3dHost.cxx
@@ -17,7 +17,7 @@
 #include "mkdir_complete.h"
 #include "wstring_encode.h"
 #include "xml_helpers.h"
-#include "openssl/md5.h"
+#include <openssl/md5.h>
 
 #include <algorithm>
 
diff --git a/direct/src/plugin/p3dInstanceManager.h b/direct/src/plugin/p3dInstanceManager.h
index f175e90aeb..08591e14cc 100644
--- a/direct/src/plugin/p3dInstanceManager.h
+++ b/direct/src/plugin/p3dInstanceManager.h
@@ -26,9 +26,9 @@
 #endif
 
 #define OPENSSL_NO_KRB5
-#include "openssl/x509.h"
-#include "openssl/pem.h"
-#include "openssl/md5.h"
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/md5.h>
 
 class P3DInstance;
 class P3DSession;
diff --git a/direct/src/plugin/p3dPackage.cxx b/direct/src/plugin/p3dPackage.cxx
index fad2dd97f2..4ea29f339d 100644
--- a/direct/src/plugin/p3dPackage.cxx
+++ b/direct/src/plugin/p3dPackage.cxx
@@ -20,7 +20,7 @@
 #include "mkdir_complete.h"
 #include "wstring_encode.h"
 
-#include "zlib.h"
+#include <zlib.h>
 
 #include <algorithm>
 #include <fstream>
diff --git a/direct/src/plugin_activex/P3DActiveX.cpp b/direct/src/plugin_activex/P3DActiveX.cpp
index c5c718c78e..500effc38f 100644
--- a/direct/src/plugin_activex/P3DActiveX.cpp
+++ b/direct/src/plugin_activex/P3DActiveX.cpp
@@ -16,9 +16,9 @@
 #include "stdafx.h"
 #include "P3DActiveX.h"
 
-#include "comcat.h"
-#include "strsafe.h"
-#include "objsafe.h"
+#include <comcat.h>
+#include <strsafe.h>
+#include <objsafe.h>
 
 
 #ifdef _DEBUG
diff --git a/direct/src/plugin_activex/P3DActiveXCtrl.cpp b/direct/src/plugin_activex/P3DActiveXCtrl.cpp
index 78c5125a62..a446bacbfb 100644
--- a/direct/src/plugin_activex/P3DActiveXCtrl.cpp
+++ b/direct/src/plugin_activex/P3DActiveXCtrl.cpp
@@ -20,9 +20,9 @@
 #include "P3DActiveXPropPage.h"
 #include "PPBrowserObject.h"
 
-#include "Mshtml.h"
-#include "atlconv.h"
-#include "comutil.h"
+#include <Mshtml.h>
+#include <atlconv.h>
+#include <comutil.h>
 
 #include <strstream>
 
diff --git a/direct/src/plugin_activex/P3DActiveXCtrl.h b/direct/src/plugin_activex/P3DActiveXCtrl.h
index 133ce29d27..dc1bd9df39 100644
--- a/direct/src/plugin_activex/P3DActiveXCtrl.h
+++ b/direct/src/plugin_activex/P3DActiveXCtrl.h
@@ -19,7 +19,7 @@
 #include "PPPandaObject.h"
 #include "PPInterface.h"
 #include "get_twirl_data.h"
-#include "Mshtml.h"
+#include <Mshtml.h>
 
 #include <vector>
 
diff --git a/direct/src/plugin_activex/PPInstance.h b/direct/src/plugin_activex/PPInstance.h
index 8b59b6a3ac..c8da8ca650 100644
--- a/direct/src/plugin_activex/PPInstance.h
+++ b/direct/src/plugin_activex/PPInstance.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 #include <math.h>
-#include "afxmt.h"
+#include <afxmt.h>
 
 #include "p3d_plugin.h"
 #include "PPDownloadCallback.h"
diff --git a/direct/src/plugin_activex/PPInterface.cpp b/direct/src/plugin_activex/PPInterface.cpp
index 25a8750c30..01eee14d08 100644
--- a/direct/src/plugin_activex/PPInterface.cpp
+++ b/direct/src/plugin_activex/PPInterface.cpp
@@ -20,7 +20,7 @@
 #include "P3DActiveXCtrl.h"
 
 #include <strstream>
-#include "Mshtml.h"
+#include <Mshtml.h>
 
 PPInterface::PPInterface( )
 {
diff --git a/direct/src/plugin_activex/PPLogger.cpp b/direct/src/plugin_activex/PPLogger.cpp
index 6dbfa01768..a49f85829d 100644
--- a/direct/src/plugin_activex/PPLogger.cpp
+++ b/direct/src/plugin_activex/PPLogger.cpp
@@ -13,11 +13,12 @@
 
 #include "stdafx.h"
 
-#include "windows.h"
 #include "PPLogger.h"
 #include "mkdir_complete.h"
 #include "wstring_encode.h"
 
+#include <windows.h>
+
 std::ofstream PPLogger::m_logfile;
 bool PPLogger::m_isOpen = false;
 
diff --git a/direct/src/plugin_npapi/nppanda3d_common.h b/direct/src/plugin_npapi/nppanda3d_common.h
index c1b7cd61af..e6eeca6d99 100644
--- a/direct/src/plugin_npapi/nppanda3d_common.h
+++ b/direct/src/plugin_npapi/nppanda3d_common.h
@@ -64,7 +64,7 @@ extern bool has_plugin_thread_async_call;
 
 #include "npapi.h"
 #if NP_VERSION_MAJOR == 0 && NP_VERSION_MINOR <= 19
-  #include "npupp.h"
+  #include <npupp.h>
 #else
   // Somewhere between version 0.19 and 0.22, Mozilla renamed npupp.h to
   // npfunctions.h.
diff --git a/direct/src/showutil/FreezeTool.py b/direct/src/showutil/FreezeTool.py
index c734c56101..aafbc24124 100644
--- a/direct/src/showutil/FreezeTool.py
+++ b/direct/src/showutil/FreezeTool.py
@@ -246,7 +246,7 @@ class CompilationEnvironment:
 frozenMainCode = """
 /* Python interpreter main program for frozen scripts */
 
-#include "Python.h"
+#include <Python.h>
 
 #if PY_MAJOR_VERSION >= 3
 #include <locale.h>
@@ -386,7 +386,7 @@ error:
 # The code from frozen_dllmain.c in the Python source repository.
 # Windows only.
 frozenDllMainCode = """
-#include "windows.h"
+#include <windows.h>
 
 static char *possibleModules[] = {
     "pywintypes",
@@ -555,9 +555,9 @@ static PyMethodDef nullMethods[] = {
 """
 
 programFile = """
-#include "Python.h"
+#include <Python.h>
 #ifdef _WIN32
-#include "malloc.h"
+#include <malloc.h>
 #endif
 
 %(moduleDefs)s
diff --git a/dtool/metalibs/dtoolconfig/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx
index b83fb05e11..7f2e0185f6 100644
--- a/dtool/metalibs/dtoolconfig/pydtool.cxx
+++ b/dtool/metalibs/dtoolconfig/pydtool.cxx
@@ -17,7 +17,7 @@
 #if PYTHON_FRAMEWORK
   #include <Python/Python.h>
 #else
-  #include "Python.h"
+  #include <Python.h>
 #endif
 
 static PyObject *_inP07yttbRf(PyObject *self, PyObject *args);
diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
index 1a2282d83f..425a61a1ae 100644
--- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx
+++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
@@ -31,13 +31,13 @@
 #include "cppSimpleType.h"
 #include "cppStructType.h"
 #include "cppExpression.h"
-#include "vector"
 #include "cppParameterList.h"
-#include "algorithm"
 #include "lineStream.h"
 
-#include <set>
+#include <algorithm>
 #include <map>
+#include <set>
+#include <vector>
 
 using std::dec;
 using std::hex;
diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.h b/dtool/src/interrogate/interfaceMakerPythonNative.h
index 00374397c9..8b18ef1957 100644
--- a/dtool/src/interrogate/interfaceMakerPythonNative.h
+++ b/dtool/src/interrogate/interfaceMakerPythonNative.h
@@ -11,8 +11,8 @@
 
 #ifndef INTERFACEMAKERPYTHONNATIVE_H
 #define INTERFACEMAKERPYTHONNATIVE_H
-#include "map"
-#include "set"
+#include <map>
+#include <set>
 #include "dtoolbase.h"
 
 #include "interfaceMakerPython.h"
diff --git a/dtool/src/interrogatedb/py_compat.h b/dtool/src/interrogatedb/py_compat.h
index fbe49a5287..4872faedc7 100644
--- a/dtool/src/interrogatedb/py_compat.h
+++ b/dtool/src/interrogatedb/py_compat.h
@@ -29,7 +29,7 @@
 // See PEP 353
 #define PY_SSIZE_T_CLEAN 1
 
-#include "Python.h"
+#include <Python.h>
 
 /* Python 2.4 */
 
diff --git a/dtool/src/interrogatedb/py_panda.h b/dtool/src/interrogatedb/py_panda.h
index 34693e8b90..fa7981697b 100644
--- a/dtool/src/interrogatedb/py_panda.h
+++ b/dtool/src/interrogatedb/py_panda.h
@@ -21,7 +21,7 @@
 
 // py_compat.h includes Python.h.
 #include "py_compat.h"
-#include "structmember.h"
+#include <structmember.h>
 
 using namespace std;
 
diff --git a/dtool/src/prc/configPage.cxx b/dtool/src/prc/configPage.cxx
index b7f1d06bd9..af53f66122 100644
--- a/dtool/src/prc/configPage.cxx
+++ b/dtool/src/prc/configPage.cxx
@@ -22,7 +22,7 @@
 #include <ctype.h>
 
 #ifdef HAVE_OPENSSL
-#include "openssl/evp.h"
+#include <openssl/evp.h>
 #endif
 
 using std::istream;
diff --git a/dtool/src/prc/encryptStreamBuf.cxx b/dtool/src/prc/encryptStreamBuf.cxx
index 192c1181c6..fe562e59e6 100644
--- a/dtool/src/prc/encryptStreamBuf.cxx
+++ b/dtool/src/prc/encryptStreamBuf.cxx
@@ -20,8 +20,8 @@
 
 #ifdef HAVE_OPENSSL
 
-#include "openssl/rand.h"
-#include "openssl/evp.h"
+#include <openssl/rand.h>
+#include <openssl/evp.h>
 
 // The iteration count is scaled by this factor for writing to the stream.
 static const int iteration_count_factor = 1000;
diff --git a/dtool/src/prc/prcKeyRegistry.cxx b/dtool/src/prc/prcKeyRegistry.cxx
index e505b96ecc..c498d074d1 100644
--- a/dtool/src/prc/prcKeyRegistry.cxx
+++ b/dtool/src/prc/prcKeyRegistry.cxx
@@ -19,8 +19,8 @@
 
 #ifdef HAVE_OPENSSL
 
-#include "openssl/evp.h"
-#include "openssl/pem.h"
+#include <openssl/evp.h>
+#include <openssl/pem.h>
 
 // Some versions of OpenSSL appear to define this as a macro.  Yucky.
 #undef set_key
diff --git a/dtool/src/prckeys/makePrcKey.cxx b/dtool/src/prckeys/makePrcKey.cxx
index a6ee834b04..23bf0914b0 100644
--- a/dtool/src/prckeys/makePrcKey.cxx
+++ b/dtool/src/prckeys/makePrcKey.cxx
@@ -24,11 +24,11 @@
 #include PRC_PUBLIC_KEYS_INCLUDE
 #endif
 
-#include "openssl/rsa.h"
-#include "openssl/err.h"
-#include "openssl/pem.h"
-#include "openssl/rand.h"
-#include "openssl/bio.h"
+#include <openssl/rsa.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/rand.h>
+#include <openssl/bio.h>
 
 using std::cerr;
 using std::string;
diff --git a/dtool/src/prckeys/signPrcFile_src.cxx b/dtool/src/prckeys/signPrcFile_src.cxx
index 5e9d04a1b4..f349626ec1 100644
--- a/dtool/src/prckeys/signPrcFile_src.cxx
+++ b/dtool/src/prckeys/signPrcFile_src.cxx
@@ -24,11 +24,11 @@
 
 #include <time.h>
 
-#include "openssl/err.h"
-#include "openssl/pem.h"
-#include "openssl/rand.h"
-#include "openssl/bio.h"
-#include "openssl/evp.h"
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/rand.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 
 using std::cerr;
 using std::string;
diff --git a/panda/src/android/android_main.cxx b/panda/src/android/android_main.cxx
index 626111ed83..2f7d7e3dcc 100644
--- a/panda/src/android/android_main.cxx
+++ b/panda/src/android/android_main.cxx
@@ -19,10 +19,11 @@
 #include "thread.h"
 #include "urlSpec.h"
 
+#include "android_native_app_glue.h"
+
 #include "config_display.h"
 // #define OPENGLES_1 #include "config_androiddisplay.h"
 
-#include <android_native_app_glue.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
diff --git a/panda/src/audiotraits/fmodAudioSound.h b/panda/src/audiotraits/fmodAudioSound.h
index 922ee976b7..112a078138 100644
--- a/panda/src/audiotraits/fmodAudioSound.h
+++ b/panda/src/audiotraits/fmodAudioSound.h
@@ -61,7 +61,7 @@
 #ifndef __FMOD_AUDIO_SOUND_H__
 #define __FMOD_AUDIO_SOUND_H__
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include "audioSound.h"
 #include "reMutex.h"
diff --git a/panda/src/audiotraits/globalMilesManager.h b/panda/src/audiotraits/globalMilesManager.h
index 3e9f2f0084..c48d48e5ba 100644
--- a/panda/src/audiotraits/globalMilesManager.h
+++ b/panda/src/audiotraits/globalMilesManager.h
@@ -17,11 +17,12 @@
 #include "pandabase.h"
 #ifdef HAVE_RAD_MSS //[
 
-#include "mss.h"
 #include "pset.h"
 #include "lightMutex.h"
 #include "lightMutexHolder.h"
 
+#include <mss.h>
+
 #ifndef UINTa
 #define UINTa U32
 #endif
diff --git a/panda/src/audiotraits/milesAudioManager.h b/panda/src/audiotraits/milesAudioManager.h
index 0ff36dbb91..b3df5adad8 100644
--- a/panda/src/audiotraits/milesAudioManager.h
+++ b/panda/src/audiotraits/milesAudioManager.h
@@ -19,7 +19,6 @@
 #ifdef HAVE_RAD_MSS //[
 
 #include "audioManager.h"
-#include "mss.h"
 #include "pset.h"
 #include "pmap.h"
 #include "pdeque.h"
@@ -30,6 +29,8 @@
 #include "conditionVar.h"
 #include "vector_uchar.h"
 
+#include <mss.h>
+
 class MilesAudioSound;
 
 class EXPCL_MILES_AUDIO MilesAudioManager: public AudioManager {
diff --git a/panda/src/audiotraits/milesAudioSample.h b/panda/src/audiotraits/milesAudioSample.h
index 22f5e5d457..d61f4de553 100644
--- a/panda/src/audiotraits/milesAudioSample.h
+++ b/panda/src/audiotraits/milesAudioSample.h
@@ -20,7 +20,8 @@
 
 #include "milesAudioSound.h"
 #include "milesAudioManager.h"
-#include "mss.h"
+
+#include <mss.h>
 
 /**
  * A sound file, such as a WAV or MP3 file, that is preloaded into memory and
diff --git a/panda/src/audiotraits/milesAudioSequence.h b/panda/src/audiotraits/milesAudioSequence.h
index 2386c6d17b..4ab1fe6d90 100644
--- a/panda/src/audiotraits/milesAudioSequence.h
+++ b/panda/src/audiotraits/milesAudioSequence.h
@@ -19,7 +19,8 @@
 
 #include "milesAudioSound.h"
 #include "milesAudioManager.h"
-#include "mss.h"
+
+#include <mss.h>
 
 /**
  * A MIDI file, preloaded and played from a memory buffer.  MIDI files cannot
diff --git a/panda/src/audiotraits/milesAudioSound.h b/panda/src/audiotraits/milesAudioSound.h
index c44584d69a..db5c4118b2 100644
--- a/panda/src/audiotraits/milesAudioSound.h
+++ b/panda/src/audiotraits/milesAudioSound.h
@@ -19,7 +19,8 @@
 
 #include "audioSound.h"
 #include "milesAudioManager.h"
-#include "mss.h"
+
+#include <mss.h>
 
 /**
  * The base class for both MilesAudioStream and MilesAudioSample.
diff --git a/panda/src/audiotraits/milesAudioStream.h b/panda/src/audiotraits/milesAudioStream.h
index 42bda6b6ab..15eac4f285 100644
--- a/panda/src/audiotraits/milesAudioStream.h
+++ b/panda/src/audiotraits/milesAudioStream.h
@@ -19,7 +19,8 @@
 
 #include "milesAudioSound.h"
 #include "milesAudioManager.h"
-#include "mss.h"
+
+#include <mss.h>
 
 /**
  * This represents a sound file played by the Miles Sound System, similar to
diff --git a/panda/src/awesomium/awWebCore.cxx b/panda/src/awesomium/awWebCore.cxx
index 7b1e28f778..adc5989367 100644
--- a/panda/src/awesomium/awWebCore.cxx
+++ b/panda/src/awesomium/awWebCore.cxx
@@ -13,7 +13,8 @@
 
 #include "config_awesomium.h"
 #include "awWebCore.h"
-#include "WebCore.h"
+
+#include <WebCore.h>
 
 TypeHandle AwWebCore::_type_handle;
 
diff --git a/panda/src/awesomium/awesomium_includes.h b/panda/src/awesomium/awesomium_includes.h
index f892ac06d5..27b8b9b9b0 100644
--- a/panda/src/awesomium/awesomium_includes.h
+++ b/panda/src/awesomium/awesomium_includes.h
@@ -14,8 +14,8 @@
 #ifndef _AWESOMIUM_INCLUDES_H_
 #define _AWESOMIUM_INCLUDES_H_
 
-#include "WebCore.h"
-#include "WebView.h"
-#include "WebViewListener.h"
+#include <WebCore.h>
+#include <WebView.h>
+#include <WebViewListener.h>
 
 #endif
diff --git a/panda/src/bullet/bullet_includes.h b/panda/src/bullet/bullet_includes.h
index 4c11b5f0b7..3b7589469b 100644
--- a/panda/src/bullet/bullet_includes.h
+++ b/panda/src/bullet/bullet_includes.h
@@ -16,23 +16,23 @@
 
 #include "pandabase.h"
 
-#include "btBulletDynamicsCommon.h"
+#include <btBulletDynamicsCommon.h>
 
 #ifndef CPPPARSER
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btGhostObject.h"
-#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
-#include "BulletCollision/CollisionShapes/btConvexPointCloudShape.h"
-#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"
-#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
-#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"
-#include "BulletCollision/Gimpact/btGImpactShape.h"
-#include "BulletDynamics/Character/btKinematicCharacterController.h"
-#include "BulletDynamics/Vehicle/btRaycastVehicle.h"
-#include "BulletSoftBody/btSoftBodyHelpers.h"
-#include "BulletSoftBody/btSoftBodyInternals.h"
-#include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h"
-#include "BulletSoftBody/btSoftRigidDynamicsWorld.h"
+#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
+#include <BulletCollision/CollisionDispatch/btGhostObject.h>
+#include <BulletCollision/CollisionDispatch/btManifoldResult.h>
+#include <BulletCollision/CollisionShapes/btConvexPointCloudShape.h>
+#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
+#include <BulletCollision/CollisionShapes/btMinkowskiSumShape.h>
+#include <BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h>
+#include <BulletCollision/Gimpact/btGImpactShape.h>
+#include <BulletDynamics/Character/btKinematicCharacterController.h>
+#include <BulletDynamics/Vehicle/btRaycastVehicle.h>
+#include <BulletSoftBody/btSoftBodyHelpers.h>
+#include <BulletSoftBody/btSoftBodyInternals.h>
+#include <BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h>
+#include <BulletSoftBody/btSoftRigidDynamicsWorld.h>
 #endif
 
 #endif // __BULLET_INCLUDES_H__
diff --git a/panda/src/device/clientBase.h b/panda/src/device/clientBase.h
index f32b526172..6a3106a385 100644
--- a/panda/src/device/clientBase.h
+++ b/panda/src/device/clientBase.h
@@ -27,7 +27,7 @@
 #include "coordinateSystem.h"
 
 #ifdef OLD_HAVE_IPC
-#include "ipc_thread.h"
+#include <ipc_thread.h>
 #endif
 
 #include "pmap.h"
diff --git a/panda/src/downloader/bioPtr.cxx b/panda/src/downloader/bioPtr.cxx
index eb12b2bd8b..56a288987b 100644
--- a/panda/src/downloader/bioPtr.cxx
+++ b/panda/src/downloader/bioPtr.cxx
@@ -19,7 +19,7 @@
 #include "config_downloader.h"
 
 #include "openSSLWrapper.h"  // must be included before any other openssl.
-#include "openssl/ssl.h"
+#include <openssl/ssl.h>
 
 #ifdef _WIN32
 #include <winsock2.h>
diff --git a/panda/src/downloader/httpCookie.cxx b/panda/src/downloader/httpCookie.cxx
index d09f12b856..6ba75d1abd 100644
--- a/panda/src/downloader/httpCookie.cxx
+++ b/panda/src/downloader/httpCookie.cxx
@@ -15,9 +15,10 @@
 
 #ifdef HAVE_OPENSSL
 
-#include "ctype.h"
 #include "httpChannel.h"
 
+#include <ctype.h>
+
 using std::string;
 
 /**
diff --git a/panda/src/downloader/httpDigestAuthorization.cxx b/panda/src/downloader/httpDigestAuthorization.cxx
index 1e59ea560c..9b2af25e00 100644
--- a/panda/src/downloader/httpDigestAuthorization.cxx
+++ b/panda/src/downloader/httpDigestAuthorization.cxx
@@ -17,8 +17,8 @@
 
 #include "httpChannel.h"
 #include "openSSLWrapper.h"  // must be included before any other openssl.
-#include "openssl/ssl.h"
-#include "openssl/md5.h"
+#include <openssl/ssl.h>
+#include <openssl/md5.h>
 #include <time.h>
 
 using std::ostream;
diff --git a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
index b7b0f7d3e7..e39e246841 100644
--- a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
+++ b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
@@ -66,7 +66,7 @@
 #include "config_pgraph.h"
 #include "shaderGenerator.h"
 #ifdef HAVE_CG
-#include "Cg/cgD3D9.h"
+#include <Cg/cgD3D9.h>
 #endif
 
 #include <mmsystem.h>
diff --git a/panda/src/express/hashVal.cxx b/panda/src/express/hashVal.cxx
index 3d2e6f42f5..5d74f1dac4 100644
--- a/panda/src/express/hashVal.cxx
+++ b/panda/src/express/hashVal.cxx
@@ -17,7 +17,7 @@
 
 #ifdef HAVE_OPENSSL
 #include "openSSLWrapper.h"  // must be included before any other openssl.
-#include "openssl/md5.h"
+#include <openssl/md5.h>
 #endif  // HAVE_OPENSSL
 
 using std::istream;
diff --git a/panda/src/express/openSSLWrapper.h b/panda/src/express/openSSLWrapper.h
index 1be8eabb2f..5baabc24c5 100644
--- a/panda/src/express/openSSLWrapper.h
+++ b/panda/src/express/openSSLWrapper.h
@@ -27,11 +27,11 @@
 #define OPENSSL_NO_KRB5
 #endif
 
-#include "openssl/ssl.h"
-#include "openssl/rand.h"
-#include "openssl/err.h"
-#include "openssl/x509.h"
-#include "openssl/x509v3.h"
+#include <openssl/ssl.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
 // Windows may define this macro inappropriately.
 #ifdef X509_NAME
diff --git a/panda/src/express/password_hash.cxx b/panda/src/express/password_hash.cxx
index b061904965..06c7571340 100644
--- a/panda/src/express/password_hash.cxx
+++ b/panda/src/express/password_hash.cxx
@@ -18,7 +18,7 @@
 #ifdef HAVE_OPENSSL
 
 #include "pnotify.h"
-#include "openssl/evp.h"
+#include <openssl/evp.h>
 #include "memoryHook.h"
 
 using std::string;
diff --git a/panda/src/express/patchfile.cxx b/panda/src/express/patchfile.cxx
index a527d78a02..5aef4416d1 100644
--- a/panda/src/express/patchfile.cxx
+++ b/panda/src/express/patchfile.cxx
@@ -27,7 +27,7 @@
 #include <string.h>  // for strstr
 
 #ifdef HAVE_TAR
-#include "libtar.h"
+#include <libtar.h>
 #include <fcntl.h>  // for O_RDONLY
 #endif  // HAVE_TAR
 
diff --git a/panda/src/ffmpeg/config_ffmpeg.cxx b/panda/src/ffmpeg/config_ffmpeg.cxx
index 27270757a8..0dbe147d27 100644
--- a/panda/src/ffmpeg/config_ffmpeg.cxx
+++ b/panda/src/ffmpeg/config_ffmpeg.cxx
@@ -21,9 +21,9 @@
 #include "movieTypeRegistry.h"
 
 extern "C" {
-  #include "libavcodec/avcodec.h"
-  #include "libavformat/avformat.h"
-  #include "libavutil/avutil.h"
+  #include <libavcodec/avcodec.h>
+  #include <libavformat/avformat.h>
+  #include <libavutil/avutil.h>
 }
 
 #if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) && !defined(BUILDING_FFMPEG)
diff --git a/panda/src/ffmpeg/ffmpegAudioCursor.cxx b/panda/src/ffmpeg/ffmpegAudioCursor.cxx
index 621de7fe8a..809797fb85 100644
--- a/panda/src/ffmpeg/ffmpegAudioCursor.cxx
+++ b/panda/src/ffmpeg/ffmpegAudioCursor.cxx
@@ -16,15 +16,15 @@
 
 #include "ffmpegAudio.h"
 extern "C" {
-  #include "libavutil/dict.h"
-  #include "libavutil/opt.h"
-  #include "libavcodec/avcodec.h"
-  #include "libavformat/avformat.h"
+  #include <libavutil/dict.h>
+  #include <libavutil/opt.h>
+  #include <libavcodec/avcodec.h>
+  #include <libavformat/avformat.h>
 }
 
 #ifdef HAVE_SWRESAMPLE
 extern "C" {
-  #include "libswresample/swresample.h"
+  #include <libswresample/swresample.h>
 }
 #endif
 
diff --git a/panda/src/ffmpeg/ffmpegAudioCursor.h b/panda/src/ffmpeg/ffmpegAudioCursor.h
index ff37fa8bc6..f3963ff527 100644
--- a/panda/src/ffmpeg/ffmpegAudioCursor.h
+++ b/panda/src/ffmpeg/ffmpegAudioCursor.h
@@ -23,7 +23,7 @@
 #include "ffmpegVirtualFile.h"
 
 extern "C" {
-  #include "libavcodec/avcodec.h"
+  #include <libavcodec/avcodec.h>
 }
 
 class FfmpegAudio;
diff --git a/panda/src/ffmpeg/ffmpegVideoCursor.cxx b/panda/src/ffmpeg/ffmpegVideoCursor.cxx
index f8c2163b73..47c6a54ae2 100644
--- a/panda/src/ffmpeg/ffmpegVideoCursor.cxx
+++ b/panda/src/ffmpeg/ffmpegVideoCursor.cxx
@@ -20,11 +20,11 @@
 #include "ffmpegVideo.h"
 #include "bamReader.h"
 extern "C" {
-  #include "libavcodec/avcodec.h"
-  #include "libavformat/avformat.h"
-  #include "libavutil/pixdesc.h"
+  #include <libavcodec/avcodec.h>
+  #include <libavformat/avformat.h>
+  #include <libavutil/pixdesc.h>
 #ifdef HAVE_SWSCALE
-  #include "libswscale/swscale.h"
+  #include <libswscale/swscale.h>
 #endif
 }
 
diff --git a/panda/src/ffmpeg/ffmpegVirtualFile.cxx b/panda/src/ffmpeg/ffmpegVirtualFile.cxx
index 3fd88f640f..8ca576cd90 100644
--- a/panda/src/ffmpeg/ffmpegVirtualFile.cxx
+++ b/panda/src/ffmpeg/ffmpegVirtualFile.cxx
@@ -21,8 +21,8 @@ using std::streampos;
 using std::streamsize;
 
 extern "C" {
-  #include "libavcodec/avcodec.h"
-  #include "libavformat/avformat.h"
+  #include <libavcodec/avcodec.h>
+  #include <libavformat/avformat.h>
 }
 
 #ifndef AVSEEK_SIZE
diff --git a/panda/src/ffmpeg/ffmpegVirtualFile.h b/panda/src/ffmpeg/ffmpegVirtualFile.h
index 3e7bd4f796..14514e4f32 100644
--- a/panda/src/ffmpeg/ffmpegVirtualFile.h
+++ b/panda/src/ffmpeg/ffmpegVirtualFile.h
@@ -21,7 +21,7 @@
 
 #include <stdarg.h>
 extern "C" {
-  #include "libavformat/avio.h"
+  #include <libavformat/avio.h>
 }
 
 struct URLContext;
diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
index 3da843c94a..6ce88525f5 100644
--- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
+++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
@@ -68,7 +68,7 @@
 #include "displayInformation.h"
 
 #if defined(HAVE_CG) && !defined(OPENGLES)
-#include "Cg/cgGL.h"
+#include <Cg/cgGL.h>
 #endif
 
 #include <algorithm>
diff --git a/panda/src/grutil/movieTexture.cxx b/panda/src/grutil/movieTexture.cxx
index 36f4913085..2942a47467 100644
--- a/panda/src/grutil/movieTexture.cxx
+++ b/panda/src/grutil/movieTexture.cxx
@@ -25,9 +25,10 @@
 #include "bamCacheRecord.h"
 #include "bamReader.h"
 #include "bamWriter.h"
-#include "math.h"
 #include "audioSound.h"
 
+#include <math.h>
+
 TypeHandle MovieTexture::_type_handle;
 
 /**
diff --git a/panda/src/mathutil/fftCompressor.cxx b/panda/src/mathutil/fftCompressor.cxx
index b8a9764d8f..76d5f52d01 100644
--- a/panda/src/mathutil/fftCompressor.cxx
+++ b/panda/src/mathutil/fftCompressor.cxx
@@ -29,7 +29,7 @@
 #undef howmany
 #endif
 
-#include "fftw3.h"
+#include <fftw3.h>
 
 // These FFTW support objects can only be defined if we actually have the FFTW
 // library available.
diff --git a/panda/src/ode/ode_includes.h b/panda/src/ode/ode_includes.h
index 3d3ec15132..fbf670dd13 100644
--- a/panda/src/ode/ode_includes.h
+++ b/panda/src/ode/ode_includes.h
@@ -35,7 +35,7 @@
 #define int32 ode_int32
 #define uint32 ode_uint32
 
-#include "ode/ode.h"
+#include <ode/ode.h>
 
 // These are the ones that conflict with other defines in Panda.  It may be
 // necessary to add to this list at a later time.
diff --git a/panda/src/physx/physxFileStream.cxx b/panda/src/physx/physxFileStream.cxx
index a93444148b..61ee73c1c9 100644
--- a/panda/src/physx/physxFileStream.cxx
+++ b/panda/src/physx/physxFileStream.cxx
@@ -13,7 +13,7 @@
 
 #include "physxFileStream.h"
 
-#include "stdio.h"
+#include <stdio.h>
 
 #include "virtualFileSystem.h"
 
diff --git a/panda/src/physx/physx_includes.h b/panda/src/physx/physx_includes.h
index b4dac0da9a..fb46a62fae 100644
--- a/panda/src/physx/physx_includes.h
+++ b/panda/src/physx/physx_includes.h
@@ -15,7 +15,7 @@
 #define PHYSX_INCLUDES_H
 
 // This one is safe to include
-#include "NxVersionNumber.h"
+#include <NxVersionNumber.h>
 
 // Platform-specific defines
 #if defined(_WIN64)
@@ -49,15 +49,15 @@
 
 
 // PhysX headers
-#include "Nxp.h"
-#include "NxPhysics.h"
-#include "NxExtended.h"
-#include "NxStream.h"
-#include "NxCooking.h"
-#include "NxController.h"
-#include "NxControllerManager.h"
-#include "NxBoxController.h"
-#include "NxCapsuleController.h"
+#include <Nxp.h>
+#include <NxPhysics.h>
+#include <NxExtended.h>
+#include <NxStream.h>
+#include <NxCooking.h>
+#include <NxController.h>
+#include <NxControllerManager.h>
+#include <NxBoxController.h>
+#include <NxCapsuleController.h>
 
 
 #endif // PHYSX_INCLUDES_H
diff --git a/panda/src/speedtree/speedTreeNode.cxx b/panda/src/speedtree/speedTreeNode.cxx
index 48cda1204b..b00af199bb 100644
--- a/panda/src/speedtree/speedTreeNode.cxx
+++ b/panda/src/speedtree/speedTreeNode.cxx
@@ -35,7 +35,7 @@
 #include "pStatTimer.h"
 
 #ifdef SPEEDTREE_OPENGL
-#include "glew/glew.h"
+#include <glew/glew.h>
 #endif  // SPEEDTREE_OPENGL
 
 #ifdef SPEEDTREE_DIRECTX9
diff --git a/panda/src/speedtree/speedtree_api.h b/panda/src/speedtree/speedtree_api.h
index 54252ed163..29761a97a4 100644
--- a/panda/src/speedtree/speedtree_api.h
+++ b/panda/src/speedtree/speedtree_api.h
@@ -18,14 +18,14 @@
 // headers from the SpeedTree API, needed in this directory.
 
 #include "speedtree_parameters.h"
-#include "Core/Core.h"
-#include "Forest/Forest.h"
+#include <Core/Core.h>
+#include <Forest/Forest.h>
 
 #if defined(SPEEDTREE_OPENGL)
-  #include "Renderers/OpenGL/OpenGLRenderer.h"
+  #include <Renderers/OpenGL/OpenGLRenderer.h>
 #elif defined(SPEEDTREE_DIRECTX9)
   #undef Configure
-  #include "Renderers/DirectX9/DirectX9Renderer.h"
+  #include <Renderers/DirectX9/DirectX9Renderer.h>
 #else
   #error Unexpected graphics API.
 #endif
diff --git a/panda/src/tinydisplay/tinySDLGraphicsWindow.h b/panda/src/tinydisplay/tinySDLGraphicsWindow.h
index b1be27b557..8073663ce5 100644
--- a/panda/src/tinydisplay/tinySDLGraphicsWindow.h
+++ b/panda/src/tinydisplay/tinySDLGraphicsWindow.h
@@ -21,9 +21,10 @@
 #include "tinySDLGraphicsPipe.h"
 #include "graphicsWindow.h"
 #include "buttonHandle.h"
-#include "SDL.h"
 #include "zbuffer.h"
 
+#include <SDL.h>
+
 /**
  * This graphics window class is implemented via SDL.
  */
diff --git a/panda/src/tinydisplay/vertex.cxx b/panda/src/tinydisplay/vertex.cxx
index 5410f963bd..03eb032e3e 100644
--- a/panda/src/tinydisplay/vertex.cxx
+++ b/panda/src/tinydisplay/vertex.cxx
@@ -1,5 +1,5 @@
 #include "zgl.h"
-#include "string.h"
+#include <string.h>
 
 void gl_eval_viewport(GLContext * c) {
   GLViewport *v = &c->viewport;
diff --git a/panda/src/vision/arToolKit.cxx b/panda/src/vision/arToolKit.cxx
index cb9a73508d..4208ba6eee 100644
--- a/panda/src/vision/arToolKit.cxx
+++ b/panda/src/vision/arToolKit.cxx
@@ -22,7 +22,7 @@
 #include "compose_matrix.h"
 #include "config_vision.h"
 extern "C" {
-  #include "AR/ar.h"
+  #include <AR/ar.h>
 };
 
 ARToolKit::PatternTable ARToolKit::_pattern_table;
diff --git a/panda/src/vrpn/vrpn_interface.h b/panda/src/vrpn/vrpn_interface.h
index c85c05e31b..a16c899aaf 100644
--- a/panda/src/vrpn/vrpn_interface.h
+++ b/panda/src/vrpn/vrpn_interface.h
@@ -21,14 +21,14 @@
 
 // Prevent VRPN from defining this function, which we don't need,
 // and cause compilation errors in MSVC 2015.
-#include "vrpn_Configure.h"
+#include <vrpn_Configure.h>
 #undef VRPN_EXPORT_GETTIMEOFDAY
 
-#include "vrpn_Connection.h"
-#include "vrpn_Tracker.h"
-#include "vrpn_Analog.h"
-#include "vrpn_Button.h"
-#include "vrpn_Dial.h"
+#include <vrpn_Connection.h>
+#include <vrpn_Tracker.h>
+#include <vrpn_Analog.h>
+#include <vrpn_Button.h>
+#include <vrpn_Dial.h>
 
 #ifdef sleep
 #undef sleep
diff --git a/panda/src/windisplay/winGraphicsPipe.cxx b/panda/src/windisplay/winGraphicsPipe.cxx
index 6f19ca2f14..7da40c64f1 100644
--- a/panda/src/windisplay/winGraphicsPipe.cxx
+++ b/panda/src/windisplay/winGraphicsPipe.cxx
@@ -18,8 +18,8 @@
 #include "dtool_config.h"
 #include "pbitops.h"
 
-#include "psapi.h"
-#include "powrprof.h"
+#include <psapi.h>
+#include <powrprof.h>
 #include <intrin.h>
 
 TypeHandle WinGraphicsPipe::_type_handle;
diff --git a/pandatool/src/daeegg/daeCharacter.cxx b/pandatool/src/daeegg/daeCharacter.cxx
index 39aee067bd..a73071d9d4 100644
--- a/pandatool/src/daeegg/daeCharacter.cxx
+++ b/pandatool/src/daeegg/daeCharacter.cxx
@@ -21,16 +21,16 @@
 
 #include "eggExternalReference.h"
 
-#include "FCDocument/FCDocument.h"
-#include "FCDocument/FCDController.h"
-#include "FCDocument/FCDGeometry.h"
-#include "FCDocument/FCDSceneNodeTools.h"
+#include <FCDocument/FCDocument.h>
+#include <FCDocument/FCDController.h>
+#include <FCDocument/FCDGeometry.h>
+#include <FCDocument/FCDSceneNodeTools.h>
 
-#include "FCDocument/FCDSceneNode.h"
-#include "FCDocument/FCDTransform.h"
-#include "FCDocument/FCDAnimated.h"
-#include "FCDocument/FCDAnimationCurve.h"
-#include "FCDocument/FCDAnimationKey.h"
+#include <FCDocument/FCDSceneNode.h>
+#include <FCDocument/FCDTransform.h>
+#include <FCDocument/FCDAnimated.h>
+#include <FCDocument/FCDAnimationCurve.h>
+#include <FCDocument/FCDAnimationKey.h>
 
 TypeHandle DaeCharacter::_type_handle;
 
diff --git a/pandatool/src/daeegg/daeCharacter.h b/pandatool/src/daeegg/daeCharacter.h
index 25378b684d..97b8aea384 100644
--- a/pandatool/src/daeegg/daeCharacter.h
+++ b/pandatool/src/daeegg/daeCharacter.h
@@ -21,11 +21,11 @@
 #include "epvector.h"
 
 #include "pre_fcollada_include.h"
-#include "FCollada.h"
-#include "FCDocument/FCDSceneNode.h"
-#include "FCDocument/FCDControllerInstance.h"
-#include "FCDocument/FCDSkinController.h"
-#include "FCDocument/FCDGeometryMesh.h"
+#include <FCollada.h>
+#include <FCDocument/FCDSceneNode.h>
+#include <FCDocument/FCDControllerInstance.h>
+#include <FCDocument/FCDSkinController.h>
+#include <FCDocument/FCDGeometryMesh.h>
 
 class DAEToEggConverter;
 
diff --git a/pandatool/src/daeegg/daeMaterials.cxx b/pandatool/src/daeegg/daeMaterials.cxx
index 6aab105cc7..36bf6fd895 100644
--- a/pandatool/src/daeegg/daeMaterials.cxx
+++ b/pandatool/src/daeegg/daeMaterials.cxx
@@ -15,12 +15,12 @@
 #include "config_daeegg.h"
 #include "fcollada_utils.h"
 
-#include "FCDocument/FCDocument.h"
-#include "FCDocument/FCDMaterial.h"
-#include "FCDocument/FCDEffect.h"
-#include "FCDocument/FCDTexture.h"
-#include "FCDocument/FCDEffectParameterSampler.h"
-#include "FCDocument/FCDImage.h"
+#include <FCDocument/FCDocument.h>
+#include <FCDocument/FCDMaterial.h>
+#include <FCDocument/FCDEffect.h>
+#include <FCDocument/FCDTexture.h>
+#include <FCDocument/FCDEffectParameterSampler.h>
+#include <FCDocument/FCDImage.h>
 
 #include "filename.h"
 #include "string_utils.h"
diff --git a/pandatool/src/daeegg/daeMaterials.h b/pandatool/src/daeegg/daeMaterials.h
index c18e631535..08cfed03d3 100644
--- a/pandatool/src/daeegg/daeMaterials.h
+++ b/pandatool/src/daeegg/daeMaterials.h
@@ -24,12 +24,12 @@
 #include "pt_EggMaterial.h"
 
 #include "pre_fcollada_include.h"
-#include "FCollada.h"
-#include "FCDocument/FCDGeometryInstance.h"
-#include "FCDocument/FCDMaterialInstance.h"
-#include "FCDocument/FCDEffectStandard.h"
-#include "FCDocument/FCDEffectParameterSampler.h"
-#include "FCDocument/FCDExtra.h"
+#include <FCollada.h>
+#include <FCDocument/FCDGeometryInstance.h>
+#include <FCDocument/FCDMaterialInstance.h>
+#include <FCDocument/FCDEffectStandard.h>
+#include <FCDocument/FCDEffectParameterSampler.h>
+#include <FCDocument/FCDExtra.h>
 
 /**
  * This class is seperated from the converter file because otherwise it would
diff --git a/pandatool/src/daeegg/daeToEggConverter.cxx b/pandatool/src/daeegg/daeToEggConverter.cxx
index 00c20a36da..a923a67264 100644
--- a/pandatool/src/daeegg/daeToEggConverter.cxx
+++ b/pandatool/src/daeegg/daeToEggConverter.cxx
@@ -28,24 +28,24 @@
 #include "eggSAnimData.h"
 #include "pt_EggVertex.h"
 
-#include "FCDocument/FCDAsset.h"
-#include "FCDocument/FCDocumentTools.h"
-#include "FCDocument/FCDSceneNode.h"
-#include "FCDocument/FCDSceneNodeTools.h"
-#include "FCDocument/FCDGeometry.h"
-#include "FCDocument/FCDGeometryInstance.h"
-#include "FCDocument/FCDGeometryPolygons.h"
-#include "FCDocument/FCDGeometrySource.h"
-#include "FCDocument/FCDSkinController.h"
-#include "FCDocument/FCDController.h"
-#include "FCDocument/FCDControllerInstance.h"
-#include "FCDocument/FCDMorphController.h"
-#include "FCDocument/FCDMaterialInstance.h"
-#include "FCDocument/FCDExtra.h"
-#include "FCDocument/FCDEffect.h"
-#include "FCDocument/FCDEffectStandard.h"
+#include <FCDocument/FCDAsset.h>
+#include <FCDocument/FCDocumentTools.h>
+#include <FCDocument/FCDSceneNode.h>
+#include <FCDocument/FCDSceneNodeTools.h>
+#include <FCDocument/FCDGeometry.h>
+#include <FCDocument/FCDGeometryInstance.h>
+#include <FCDocument/FCDGeometryPolygons.h>
+#include <FCDocument/FCDGeometrySource.h>
+#include <FCDocument/FCDSkinController.h>
+#include <FCDocument/FCDController.h>
+#include <FCDocument/FCDControllerInstance.h>
+#include <FCDocument/FCDMorphController.h>
+#include <FCDocument/FCDMaterialInstance.h>
+#include <FCDocument/FCDExtra.h>
+#include <FCDocument/FCDEffect.h>
+#include <FCDocument/FCDEffectStandard.h>
 #if FCOLLADA_VERSION >= 0x00030005
-  #include "FCDocument/FCDGeometryPolygonsInput.h"
+  #include <FCDocument/FCDGeometryPolygonsInput.h>
 #endif
 
 using std::endl;
diff --git a/pandatool/src/daeegg/daeToEggConverter.h b/pandatool/src/daeegg/daeToEggConverter.h
index a1203c2f2c..bb3b6f550b 100644
--- a/pandatool/src/daeegg/daeToEggConverter.h
+++ b/pandatool/src/daeegg/daeToEggConverter.h
@@ -23,15 +23,15 @@
 #include "eggNurbsCurve.h"
 
 #include "pre_fcollada_include.h"
-#include "FCollada.h"
-#include "FCDocument/FCDocument.h"
-#include "FCDocument/FCDTransform.h"
-#include "FCDocument/FCDEntityInstance.h"
-#include "FCDocument/FCDControllerInstance.h"
-#include "FCDocument/FCDGeometryMesh.h"
-#include "FCDocument/FCDGeometrySpline.h"
-#include "FCDocument/FCDMaterial.h"
-#include "FMath/FMMatrix44.h"
+#include <FCollada.h>
+#include <FCDocument/FCDocument.h>
+#include <FCDocument/FCDTransform.h>
+#include <FCDocument/FCDEntityInstance.h>
+#include <FCDocument/FCDControllerInstance.h>
+#include <FCDocument/FCDGeometryMesh.h>
+#include <FCDocument/FCDGeometrySpline.h>
+#include <FCDocument/FCDMaterial.h>
+#include <FMath/FMMatrix44.h>
 
 #include "daeMaterials.h"
 #include "daeCharacter.h"
diff --git a/pandatool/src/daeegg/fcollada_utils.h b/pandatool/src/daeegg/fcollada_utils.h
index cf1a3069f3..3a8ae692e4 100644
--- a/pandatool/src/daeegg/fcollada_utils.h
+++ b/pandatool/src/daeegg/fcollada_utils.h
@@ -18,7 +18,7 @@
 #define FCOLLADA_UTILS_H
 
 #include "pre_fcollada_include.h"
-#include "FCollada.h"
+#include <FCollada.h>
 
 // Useful conversion stuff
 inline LVecBase3d TO_VEC3(FMVector3 v) {
diff --git a/pandatool/src/daeprogs/eggToDAE.cxx b/pandatool/src/daeprogs/eggToDAE.cxx
index b9652e698f..d3c616c3c4 100644
--- a/pandatool/src/daeprogs/eggToDAE.cxx
+++ b/pandatool/src/daeprogs/eggToDAE.cxx
@@ -15,9 +15,9 @@
 #include "dcast.h"
 #include "pandaVersion.h"
 
-#include "FCDocument/FCDocument.h"
-#include "FCDocument/FCDAsset.h"
-#include "FCDocument/FCDTransform.h"
+#include <FCDocument/FCDocument.h>
+#include <FCDocument/FCDAsset.h>
+#include <FCDocument/FCDTransform.h>
 
 // Useful conversion stuff
 #define TO_VEC3(v) (LVecBase3d(v[0], v[1], v[2]))
diff --git a/pandatool/src/daeprogs/eggToDAE.h b/pandatool/src/daeprogs/eggToDAE.h
index 5a13546485..c7782a421e 100644
--- a/pandatool/src/daeprogs/eggToDAE.h
+++ b/pandatool/src/daeprogs/eggToDAE.h
@@ -20,8 +20,8 @@
 #include "eggTransform.h"
 
 #include "pre_fcollada_include.h"
-#include "FCollada.h"
-#include "FCDocument/FCDSceneNode.h"
+#include <FCollada.h>
+#include <FCDocument/FCDSceneNode.h>
 
 /**
  * A program to read an egg file and write a DAE file.
diff --git a/pandatool/src/maxegg/maxEgg.h b/pandatool/src/maxegg/maxEgg.h
index 2d9765ee01..97d9b1dea4 100644
--- a/pandatool/src/maxegg/maxEgg.h
+++ b/pandatool/src/maxegg/maxEgg.h
@@ -18,12 +18,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <crtdbg.h>
-#include "errno.h"
+#include <errno.h>
 
 using std::min;
 using std::max;
 
-#include "Max.h"
 #include "eggGroup.h"
 #include "eggTable.h"
 #include "eggXfmSAnim.h"
@@ -31,26 +30,25 @@ using std::max;
 #include "referenceCount.h"
 #include "pointerTo.h"
 #include "namable.h"
-#include "modstack.h"
 
 #include <iostream>
 #include <fstream>
 #include <vector>
 
 #define WIN32_LEAN_AND_MEAN
-#include "windef.h"
-#include "windows.h"
+#include <windef.h>
+#include <windows.h>
 
-#include "Max.h"
-#include "iparamb2.h"
-#include "iparamm2.h"
-#include "istdplug.h"
-#include "iskin.h"
-#include "maxResource.h"
-#include "stdmat.h"
-#include "phyexp.h"
-#include "surf_api.h"
-#include "bipexp.h"
+#include <Max.h>
+#include <iparamb2.h>
+#include <iparamm2.h>
+#include <istdplug.h>
+#include <iskin.h>
+#include <stdmat.h>
+#include <phyexp.h>
+#include <surf_api.h>
+#include <bipexp.h>
+#include <modstack.h>
 
 #include "eggCoordinateSystem.h"
 #include "eggGroup.h"
@@ -67,6 +65,7 @@ using std::max;
 #include "maxNodeDesc.h"
 #include "maxNodeTree.h"
 #include "maxOptionsDialog.h"
+#include "maxResource.h"
 #include "maxToEggConverter.h"
 
 #define MaxEggPlugin_CLASS_ID   Class_ID(0x7ac0d6b7, 0x55731ef6)
diff --git a/pandatool/src/maxegg/maxEggLoader.cxx b/pandatool/src/maxegg/maxEggLoader.cxx
index a6855657e6..09970789c3 100644
--- a/pandatool/src/maxegg/maxEggLoader.cxx
+++ b/pandatool/src/maxegg/maxEggLoader.cxx
@@ -30,15 +30,15 @@ using std::min;
 using std::max;
 
 #include <stdio.h>
-#include "Max.h"
-#include "istdplug.h"
-#include "stdmat.h"
-#include "decomp.h"
-#include "shape.h"
-#include "simpobj.h"
-#include "iparamb2.h"
-#include "iskin.h"
-#include "modstack.h"
+#include <Max.h>
+#include <istdplug.h>
+#include <stdmat.h>
+#include <decomp.h>
+#include <shape.h>
+#include <simpobj.h>
+#include <iparamb2.h>
+#include <iskin.h>
+#include <modstack.h>
 
 #include "maxEggLoader.h"
 
diff --git a/pandatool/src/maxprogs/maxEggImport.cxx b/pandatool/src/maxprogs/maxEggImport.cxx
index 08a0184a8e..3776da2097 100644
--- a/pandatool/src/maxprogs/maxEggImport.cxx
+++ b/pandatool/src/maxprogs/maxEggImport.cxx
@@ -25,11 +25,13 @@
 using std::min;
 using std::max;
 
-// MAX includes
+// local includes
 #include "maxEggLoader.h"
-#include "Max.h"
 #include "maxImportRes.h"
-#include "istdplug.h"
+
+// MAX includes
+#include <Max.h>
+#include <istdplug.h>
 
 // panda includes.
 #include "notifyCategoryProxy.h"