diff --git a/contrib/src/ai/aiBehaviors.h b/contrib/src/ai/aiBehaviors.h
index 3524a32b63..eb70906e4a 100644
--- a/contrib/src/ai/aiBehaviors.h
+++ b/contrib/src/ai/aiBehaviors.h
@@ -28,6 +28,9 @@ class PathFollow;
 class PathFind;
 class ObstacleAvoidance;
 
+#include "flee.h"
+#include "evade.h"
+
 typedef std::list<Flee, std::allocator<Flee> > ListFlee;
 typedef std::list<Evade, std::allocator<Evade> > ListEvade;
 
diff --git a/panda/src/collide/collisionInvSphere.cxx b/panda/src/collide/collisionInvSphere.cxx
index c6e5ee4a42..3abd9ae451 100644
--- a/panda/src/collide/collisionInvSphere.cxx
+++ b/panda/src/collide/collisionInvSphere.cxx
@@ -16,6 +16,7 @@
 #include "collisionSphere.h"
 #include "collisionCapsule.h"
 #include "collisionLine.h"
+#include "collisionParabola.h"
 #include "collisionRay.h"
 #include "collisionSegment.h"
 #include "collisionHandler.h"
diff --git a/panda/src/device/ioKitInputDevice.cxx b/panda/src/device/ioKitInputDevice.cxx
index 8468fd4816..5ff35c4ab3 100644
--- a/panda/src/device/ioKitInputDevice.cxx
+++ b/panda/src/device/ioKitInputDevice.cxx
@@ -15,8 +15,10 @@
 
 #if defined(__APPLE__) && !defined(CPPPARSER)
 
+#include <IOKit/hid/IOHIDLib.h>
 #include <IOKit/hid/IOHIDElement.h>
 
+#include "inputDeviceManager.h"
 #include "keyboardButton.h"
 #include "gamepadButton.h"
 #include "mouseButton.h"
diff --git a/panda/src/pgraph/pythonLoaderFileType.cxx b/panda/src/pgraph/pythonLoaderFileType.cxx
index 3006a13cd3..bbb0577106 100644
--- a/panda/src/pgraph/pythonLoaderFileType.cxx
+++ b/panda/src/pgraph/pythonLoaderFileType.cxx
@@ -15,6 +15,7 @@
 
 #ifdef HAVE_PYTHON
 
+#include "bamCacheRecord.h"
 #include "modelRoot.h"
 #include "pythonThread.h"
 #include "py_panda.h"
diff --git a/panda/src/pgraph/pythonLoaderFileType.h b/panda/src/pgraph/pythonLoaderFileType.h
index d53d90df6c..6532d1b6e1 100644
--- a/panda/src/pgraph/pythonLoaderFileType.h
+++ b/panda/src/pgraph/pythonLoaderFileType.h
@@ -21,6 +21,8 @@
 #include "loaderFileType.h"
 #include "extension.h"
 
+class LoaderFileTypeRegistry;
+
 /**
  * This defines a Python-based loader plug-in.  An instance of this can be
  * constructed by inheritance and explicitly registered, or it can be created
diff --git a/panda/src/text/textProperties.cxx b/panda/src/text/textProperties.cxx
index 42e7982638..1cbc8ddb9a 100644
--- a/panda/src/text/textProperties.cxx
+++ b/panda/src/text/textProperties.cxx
@@ -21,6 +21,7 @@
 #include "colorAttrib.h"
 #include "cullBinAttrib.h"
 #include "transparencyAttrib.h"
+#include "zStream.h"
 
 PT(TextFont) TextProperties::_default_font;
 bool TextProperties::_loaded_default_font = false;
diff --git a/pandatool/src/egg-qtess/qtessInputFile.h b/pandatool/src/egg-qtess/qtessInputFile.h
index d0e6b62464..c5cb5fab03 100644
--- a/pandatool/src/egg-qtess/qtessInputFile.h
+++ b/pandatool/src/egg-qtess/qtessInputFile.h
@@ -18,6 +18,7 @@
 #include "qtessInputEntry.h"
 #include "filename.h"
 #include "pvector.h"
+#include "vector_double.h"
 
 class QtessSurface;