diff --git a/panda/src/pgraph/Sources.pp b/panda/src/pgraph/Sources.pp
index 87ce1d210c..059cf5c535 100644
--- a/panda/src/pgraph/Sources.pp
+++ b/panda/src/pgraph/Sources.pp
@@ -104,7 +104,9 @@
     weakNodePath.I weakNodePath.h \
     workingNodePath.I workingNodePath.h
 
-  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
+  #define COMBINED_SOURCES \
+    $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx \
+    $[TARGET]_composite3.cxx $[TARGET]_composite4.cxx
   #define INCLUDED_SOURCES \
     accumulatedAttribs.cxx \
     alphaTestAttrib.cxx \  
diff --git a/panda/src/pgraph/pgraph_composite1.cxx b/panda/src/pgraph/pgraph_composite1.cxx
index e509339a39..a0a0494275 100644
--- a/panda/src/pgraph/pgraph_composite1.cxx
+++ b/panda/src/pgraph/pgraph_composite1.cxx
@@ -13,32 +13,3 @@
 #include "colorWriteAttrib.cxx"
 #include "compassEffect.cxx"
 #include "config_pgraph.cxx"
-#include "cullBin.cxx"
-#include "cullBinAttrib.cxx"
-#include "cullBinBackToFront.cxx"
-#include "cullBinFixed.cxx"
-#include "cullBinFrontToBack.cxx"
-#include "cullBinManager.cxx"
-#include "cullBinStateSorted.cxx"
-#include "cullBinUnsorted.cxx"
-#include "cullFaceAttrib.cxx"
-#include "cullHandler.cxx"
-#include "cullResult.cxx"
-#include "cullTraverser.cxx"
-#include "cullTraverserData.cxx"
-#include "cullableObject.cxx"
-#include "decalEffect.cxx"
-#include "depthOffsetAttrib.cxx"
-#include "depthTestAttrib.cxx"
-#include "depthWriteAttrib.cxx"
-#include "alphaTestAttrib.cxx"
-#include "directionalLight.cxx"
-#include "drawCullHandler.cxx"
-#include "fadeLodNode.cxx"
-#include "fadeLodNodeData.cxx"
-#include "findApproxPath.cxx"
-#include "findApproxLevelEntry.cxx"
-#include "fog.cxx"
-#include "fogAttrib.cxx"
-#include "geomNode.cxx"
-#include "geomTransformer.cxx"
diff --git a/panda/src/pgraph/pgraph_composite2.cxx b/panda/src/pgraph/pgraph_composite2.cxx
index 56278b5cf5..285e37c4b9 100644
--- a/panda/src/pgraph/pgraph_composite2.cxx
+++ b/panda/src/pgraph/pgraph_composite2.cxx
@@ -1,49 +1,29 @@
-#include "lensNode.cxx"
-#include "light.cxx"
-#include "lightAttrib.cxx"
-#include "lightLensNode.cxx"
-#include "lightNode.cxx"
-#include "loader.cxx"
-#include "loaderFileType.cxx"
-#include "loaderFileTypeBam.cxx"
-#include "loaderFileTypeRegistry.cxx"
-#include "lodNode.cxx"
-#include "materialAttrib.cxx"
-#include "modelNode.cxx"
-#include "modelPool.cxx"
-#include "modelRoot.cxx"
-#include "nodePathCollection.cxx"
-#include "nodePathComponent.cxx"
-#include "nodePathLerps.cxx"
-#include "pandaNode.cxx"
-#include "planeNode.cxx"
-#include "pointLight.cxx"
-#include "polylightNode.cxx"
-#include "polylightEffect.cxx"
-#include "portalNode.cxx"
-#include "portalClipper.cxx"
-#include "renderAttrib.cxx"
-#include "renderEffect.cxx"
-#include "renderEffects.cxx"
-#include "renderModeAttrib.cxx"
-#include "renderState.cxx"
-#include "rescaleNormalAttrib.cxx"
-#include "sceneGraphAnalyzer.cxx"
-#include "sceneGraphReducer.cxx"
-#include "selectiveChildNode.cxx"
-#include "sequenceNode.cxx"
-#include "shadeModelAttrib.cxx"
-#include "showBoundsEffect.cxx"
-#include "spotlight.cxx"
-#include "switchNode.cxx"
-#include "texMatrixAttrib.cxx"
-#include "texProjectorEffect.cxx"
-#include "textureApplyAttrib.cxx"
-#include "textureAttrib.cxx"
-#include "texGenAttrib.cxx"
-#include "textureCollection.cxx"
-#include "textureStageCollection.cxx"
-#include "transformState.cxx"
-#include "transparencyAttrib.cxx"
-#include "weakNodePath.cxx"
-#include "workingNodePath.cxx"
+#include "cullBin.cxx"
+#include "cullBinAttrib.cxx"
+#include "cullBinBackToFront.cxx"
+#include "cullBinFixed.cxx"
+#include "cullBinFrontToBack.cxx"
+#include "cullBinManager.cxx"
+#include "cullBinStateSorted.cxx"
+#include "cullBinUnsorted.cxx"
+#include "cullFaceAttrib.cxx"
+#include "cullHandler.cxx"
+#include "cullResult.cxx"
+#include "cullTraverser.cxx"
+#include "cullTraverserData.cxx"
+#include "cullableObject.cxx"
+#include "decalEffect.cxx"
+#include "depthOffsetAttrib.cxx"
+#include "depthTestAttrib.cxx"
+#include "depthWriteAttrib.cxx"
+#include "alphaTestAttrib.cxx"
+#include "directionalLight.cxx"
+#include "drawCullHandler.cxx"
+#include "fadeLodNode.cxx"
+#include "fadeLodNodeData.cxx"
+#include "findApproxPath.cxx"
+#include "findApproxLevelEntry.cxx"
+#include "fog.cxx"
+#include "fogAttrib.cxx"
+#include "geomNode.cxx"
+#include "geomTransformer.cxx"
diff --git a/panda/src/pgraph/pgraph_composite3.cxx b/panda/src/pgraph/pgraph_composite3.cxx
new file mode 100644
index 0000000000..573bd57a5c
--- /dev/null
+++ b/panda/src/pgraph/pgraph_composite3.cxx
@@ -0,0 +1,24 @@
+#include "lensNode.cxx"
+#include "light.cxx"
+#include "lightAttrib.cxx"
+#include "lightLensNode.cxx"
+#include "lightNode.cxx"
+#include "loader.cxx"
+#include "loaderFileType.cxx"
+#include "loaderFileTypeBam.cxx"
+#include "loaderFileTypeRegistry.cxx"
+#include "lodNode.cxx"
+#include "materialAttrib.cxx"
+#include "modelNode.cxx"
+#include "modelPool.cxx"
+#include "modelRoot.cxx"
+#include "nodePathCollection.cxx"
+#include "nodePathComponent.cxx"
+#include "nodePathLerps.cxx"
+#include "pandaNode.cxx"
+#include "planeNode.cxx"
+#include "pointLight.cxx"
+#include "polylightNode.cxx"
+#include "polylightEffect.cxx"
+#include "portalNode.cxx"
+#include "portalClipper.cxx"
diff --git a/panda/src/pgraph/pgraph_composite4.cxx b/panda/src/pgraph/pgraph_composite4.cxx
new file mode 100644
index 0000000000..e05f8bdc93
--- /dev/null
+++ b/panda/src/pgraph/pgraph_composite4.cxx
@@ -0,0 +1,25 @@
+#include "renderAttrib.cxx"
+#include "renderEffect.cxx"
+#include "renderEffects.cxx"
+#include "renderModeAttrib.cxx"
+#include "renderState.cxx"
+#include "rescaleNormalAttrib.cxx"
+#include "sceneGraphAnalyzer.cxx"
+#include "sceneGraphReducer.cxx"
+#include "selectiveChildNode.cxx"
+#include "sequenceNode.cxx"
+#include "shadeModelAttrib.cxx"
+#include "showBoundsEffect.cxx"
+#include "spotlight.cxx"
+#include "switchNode.cxx"
+#include "texMatrixAttrib.cxx"
+#include "texProjectorEffect.cxx"
+#include "textureApplyAttrib.cxx"
+#include "textureAttrib.cxx"
+#include "texGenAttrib.cxx"
+#include "textureCollection.cxx"
+#include "textureStageCollection.cxx"
+#include "transformState.cxx"
+#include "transparencyAttrib.cxx"
+#include "weakNodePath.cxx"
+#include "workingNodePath.cxx"
diff --git a/panda/src/pgraph/sceneGraphReducer.cxx b/panda/src/pgraph/sceneGraphReducer.cxx
index c12729517b..3b934b9c93 100644
--- a/panda/src/pgraph/sceneGraphReducer.cxx
+++ b/panda/src/pgraph/sceneGraphReducer.cxx
@@ -19,6 +19,7 @@
 #include "sceneGraphReducer.h"
 #include "config_pgraph.h"
 #include "accumulatedAttribs.h"
+#include "boundingSphere.h"
 #include "modelNode.h"
 #include "pointerTo.h"
 #include "plist.h"