diff --git a/panda/src/collide/CMakeLists.txt b/panda/src/collide/CMakeLists.txt
new file mode 100644
index 0000000000..3b557b981b
--- /dev/null
+++ b/panda/src/collide/CMakeLists.txt
@@ -0,0 +1,79 @@
+set(P3COLLIDE_HEADERS
+  collisionBox.I collisionBox.h
+  collisionEntry.I collisionEntry.h
+  collisionGeom.I collisionGeom.h
+  collisionHandler.I collisionHandler.h
+  collisionHandlerEvent.I collisionHandlerEvent.h
+  collisionHandlerHighestEvent.h
+  collisionHandlerFloor.I collisionHandlerFloor.h
+  collisionHandlerGravity.I collisionHandlerGravity.h
+  collisionHandlerPhysical.I collisionHandlerPhysical.h
+  collisionHandlerPusher.I collisionHandlerPusher.h
+  collisionHandlerFluidPusher.I collisionHandlerFluidPusher.h
+  collisionHandlerQueue.h
+  collisionInvSphere.I collisionInvSphere.h
+  collisionLine.I collisionLine.h
+  collisionLevelStateBase.I collisionLevelStateBase.h
+  collisionLevelState.I collisionLevelState.h
+  collisionNode.I collisionNode.h
+  collisionParabola.I collisionParabola.h
+  collisionPlane.I collisionPlane.h
+  collisionPolygon.I collisionPolygon.h
+  collisionFloorMesh.I collisionFloorMesh.h
+  collisionRay.I collisionRay.h
+  collisionRecorder.I collisionRecorder.h
+  collisionSegment.I collisionSegment.h
+  collisionSolid.I collisionSolid.h
+  collisionSphere.I collisionSphere.h
+  collisionTraverser.I collisionTraverser.h
+  collisionTube.I collisionTube.h
+  collisionVisualizer.I collisionVisualizer.h
+)
+set(P3COLLIDE_SOURCES
+  collisionBox.cxx
+  collisionEntry.cxx
+  collisionGeom.cxx
+  collisionHandler.cxx
+  collisionHandlerEvent.cxx
+  collisionHandlerHighestEvent.cxx
+  collisionHandlerFloor.cxx
+  collisionHandlerGravity.cxx
+  collisionHandlerPhysical.cxx
+  collisionHandlerPusher.cxx
+  collisionHandlerFluidPusher.cxx
+  collisionHandlerQueue.cxx
+  collisionLevelStateBase.cxx
+  collisionLevelState.cxx
+  collisionInvSphere.cxx
+  collisionLine.cxx
+  collisionNode.cxx
+  collisionParabola.cxx
+  collisionPlane.cxx
+  collisionPolygon.cxx
+  collisionFloorMesh.cxx
+  collisionRay.cxx
+  collisionRecorder.cxx
+  collisionSegment.cxx
+  collisionSolid.cxx
+  collisionSphere.cxx
+  collisionTraverser.cxx
+  collisionTube.cxx
+  collisionVisualizer.cxx
+  config_collide.cxx
+)
+
+composite_sources(p3collide P3COLLIDE_SOURCES)
+add_library(p3collide ${P3COLLIDE_SOURCES} ${P3COLLIDE_HEADERS})
+target_link_libraries(p3collide p3tform)
+target_interrogate(p3collide ALL)
+
+#begin test_bin_target
+  #define TARGET test_collide
+  #define LOCAL_LIBS
+#    p3collide
+  #define OTHER_LIBS $[OTHER_LIBS] p3pystub
+
+  #define SOURCES
+#    test_collide.cxx
+
+#end test_bin_target
diff --git a/panda/src/collide/collisionFloorMesh.cxx b/panda/src/collide/collisionFloorMesh.cxx
index d67df63c76..63dbfd8eca 100755
--- a/panda/src/collide/collisionFloorMesh.cxx
+++ b/panda/src/collide/collisionFloorMesh.cxx
@@ -28,6 +28,7 @@
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "boundingBox.h"
 #include "boundingPlane.h"
 #include "geom.h"
 #include "geomTriangles.h"
diff --git a/panda/src/collide/collisionHandlerFluidPusher.cxx b/panda/src/collide/collisionHandlerFluidPusher.cxx
index b3bb2f6141..8deab17d6c 100755
--- a/panda/src/collide/collisionHandlerFluidPusher.cxx
+++ b/panda/src/collide/collisionHandlerFluidPusher.cxx
@@ -16,6 +16,7 @@
 #include "collisionNode.h"
 #include "collisionEntry.h"
 #include "collisionPolygon.h"
+#include "collisionSphere.h"
 #include "config_collide.h"
 #include "dcast.h"
 
diff --git a/panda/src/collide/collisionParabola.cxx b/panda/src/collide/collisionParabola.cxx
index 6beea29da0..4ad5023e3b 100644
--- a/panda/src/collide/collisionParabola.cxx
+++ b/panda/src/collide/collisionParabola.cxx
@@ -22,6 +22,7 @@
 #include "geomLinestrips.h"
 #include "geomVertexWriter.h"
 #include "boundingHexahedron.h"
+#include "boundingSphere.h"
 #include "look_at.h"
 
 PStatCollector CollisionParabola::_volume_pcollector(
diff --git a/panda/src/collide/collisionPlane.cxx b/panda/src/collide/collisionPlane.cxx
index e5bb1a5038..5d02de8670 100644
--- a/panda/src/collide/collisionPlane.cxx
+++ b/panda/src/collide/collisionPlane.cxx
@@ -20,6 +20,7 @@
 #include "collisionLine.h"
 #include "collisionRay.h"
 #include "collisionSegment.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "pointerToArray.h"
 #include "geomNode.h"
diff --git a/panda/src/collide/collisionPolygon.cxx b/panda/src/collide/collisionPolygon.cxx
index d5358950a1..2e0bd42073 100644
--- a/panda/src/collide/collisionPolygon.cxx
+++ b/panda/src/collide/collisionPolygon.cxx
@@ -19,6 +19,7 @@
 #include "collisionLine.h"
 #include "collisionRay.h"
 #include "collisionSegment.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "cullTraverserData.h"
 #include "boundingBox.h"
diff --git a/panda/src/collide/collisionSegment.cxx b/panda/src/collide/collisionSegment.cxx
index 6014ca288b..af4444a0b3 100644
--- a/panda/src/collide/collisionSegment.cxx
+++ b/panda/src/collide/collisionSegment.cxx
@@ -28,8 +28,10 @@
 #include "bamWriter.h"
 #include "geom.h"
 #include "geomLines.h"
+#include "boundingSphere.h"
 #include "boundingHexahedron.h"
 #include "geomVertexWriter.h"
+#include "look_at.h"
 
 TypeHandle CollisionSegment::_type_handle;
 
diff --git a/panda/src/collide/collisionSphere.cxx b/panda/src/collide/collisionSphere.cxx
index 773b11c104..23e781ddeb 100644
--- a/panda/src/collide/collisionSphere.cxx
+++ b/panda/src/collide/collisionSphere.cxx
@@ -19,6 +19,7 @@
 #include "collisionSegment.h"
 #include "collisionHandler.h"
 #include "collisionEntry.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "boundingSphere.h"
 #include "datagram.h"
diff --git a/panda/src/collide/collisionTube.cxx b/panda/src/collide/collisionTube.cxx
index 20feabc9a5..f99c513e93 100644
--- a/panda/src/collide/collisionTube.cxx
+++ b/panda/src/collide/collisionTube.cxx
@@ -19,6 +19,7 @@
 #include "collisionSegment.h"
 #include "collisionHandler.h"
 #include "collisionEntry.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "look_at.h"
 #include "geom.h"