diff --git a/dtool/pptempl/Depends.pp b/dtool/pptempl/Depends.pp
index 31e3d1720f..a77ecb22df 100644
--- a/dtool/pptempl/Depends.pp
+++ b/dtool/pptempl/Depends.pp
@@ -28,11 +28,11 @@
 Warning: Lib(s) $[nonexisting], referenced in $[DIRNAME]/$[TARGET], not found.
     #endif
 
-    #set DEPENDABLE_HEADERS $[DEPENDABLE_HEADERS] $[filter %.h %.I %_src.cxx,$[all_sources]]
+    #set DEPENDABLE_HEADERS $[DEPENDABLE_HEADERS] $[filter %.h %.I %_src.cxx $[included_sources],$[all_sources]]
   #end metalib_target static_lib_target ss_lib_target lib_target noinst_lib_target bin_target noinst_bin_target
 
   #forscopes test_bin_target
-    #set DEPENDABLE_HEADERS $[DEPENDABLE_HEADERS] $[filter %.h %.I %_src.cxx,$[all_sources]]
+    #set DEPENDABLE_HEADERS $[DEPENDABLE_HEADERS] $[filter %.h %.I %_src.cxx $[included_sources],$[all_sources]]  
   #end test_bin_target
 
   // Allow the user to define additional EXTRA_DEPENDS targets in each
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index b052c7bfd0..c63c01f832 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -315,6 +315,8 @@
   $[IF_IPC_SOURCES] \
   $[IF_NET_SOURCES] \
   $[IF_PYTHON_SOURCES]
+  
+#defer included_sources $[INCLUDED_SOURCES]
 
 // This variable returns the set of sources that are to be
 // interrogated for the current target.
diff --git a/panda/src/sgattrib/composite1.cxx b/panda/src/sgattrib/composite1.cxx
new file mode 100644
index 0000000000..308ac573ce
--- /dev/null
+++ b/panda/src/sgattrib/composite1.cxx
@@ -0,0 +1,24 @@
+#include "alphaTransformAttribute.cxx"
+#include "clipPlaneAttribute.cxx"
+#include "colorAttribute.cxx"
+#include "colorBlendAttribute.cxx"
+#include "colorMaskAttribute.cxx"
+#include "colorMatrixAttribute.cxx"
+#include "cullFaceAttribute.cxx"
+#include "decalAttribute.cxx"
+#include "depthTestAttribute.cxx"
+#include "depthWriteAttribute.cxx"
+#include "fogAttribute.cxx"
+#include "linesmoothAttribute.cxx"
+#include "materialAttribute.cxx"
+#include "pointShapeAttribute.cxx"
+#include "polygonOffsetAttribute.cxx"
+#include "renderModeAttribute.cxx"
+#include "showHideAttribute.cxx"
+#include "stencilAttribute.cxx"
+#include "texGenAttribute.cxx"
+#include "texMatrixAttribute.cxx"
+#include "textureApplyAttribute.cxx"
+#include "textureAttribute.cxx"
+#include "transformAttribute.cxx"
+#include "transparencyAttribute.cxx"
diff --git a/panda/src/sgattrib/composite2.cxx b/panda/src/sgattrib/composite2.cxx
new file mode 100644
index 0000000000..33fe4d9d14
--- /dev/null
+++ b/panda/src/sgattrib/composite2.cxx
@@ -0,0 +1,29 @@
+#include "alphaTransformAttribute.cxx"
+#include "alphaTransformProperty.cxx"
+#include "alphaTransformTransition.cxx"
+#include "billboardTransition.cxx"
+#include "clipPlaneTransition.cxx"
+#include "colorBlendTransition.cxx"
+#include "colorMaskTransition.cxx"
+#include "colorMatrixTransition.cxx"
+#include "colorTransition.cxx"
+#include "cullFaceTransition.cxx"
+#include "decalTransition.cxx"
+#include "depthTestTransition.cxx"
+#include "depthWriteTransition.cxx"
+#include "drawBoundsTransition.cxx"
+#include "fogTransition.cxx"
+#include "linesmoothTransition.cxx"
+#include "materialTransition.cxx"
+#include "pointShapeTransition.cxx"
+#include "polygonOffsetTransition.cxx"
+#include "pruneTransition.cxx"
+#include "renderModeTransition.cxx"
+#include "showHideTransition.cxx"
+#include "stencilTransition.cxx"
+#include "texGenTransition.cxx"
+#include "texMatrixTransition.cxx"
+#include "textureApplyTransition.cxx"
+#include "textureTransition.cxx"
+#include "transformTransition.cxx"
+#include "transparencyTransition.cxx"
diff --git a/panda/src/sgattrib/composite3.cxx b/panda/src/sgattrib/composite3.cxx
new file mode 100644
index 0000000000..03c4031f94
--- /dev/null
+++ b/panda/src/sgattrib/composite3.cxx
@@ -0,0 +1,17 @@
+#include "config_sgattrib.cxx"
+#include "alphaTransformProperty.cxx"
+#include "attribTraverser.cxx"
+#include "colorBlendProperty.cxx"
+#include "colorMaskProperty.cxx"
+#include "colorProperty.cxx"
+#include "cullFaceProperty.cxx"
+#include "depthTestProperty.cxx"
+#include "pointShapeProperty.cxx"
+#include "polygonOffsetProperty.cxx"
+#include "renderModeProperty.cxx"
+#include "renderRelation.cxx"
+#include "stencilProperty.cxx"
+#include "texGenProperty.cxx"
+#include "textureApplyProperty.cxx"
+#include "transparencyProperty.cxx"
+