diff --git a/panda/src/tinydisplay/Sources.pp b/panda/src/tinydisplay/Sources.pp
index a0c7e1173a..9beb9b1650 100644
--- a/panda/src/tinydisplay/Sources.pp
+++ b/panda/src/tinydisplay/Sources.pp
@@ -13,32 +13,58 @@
     gsgmisc gsgbase gobj display \
     putil linmath mathutil pnmimage windisplay
 
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
+
   #define SOURCES \
-    config_tinydisplay.cxx config_tinydisplay.h \
-    tinyGeomMunger.I tinyGeomMunger.cxx tinyGeomMunger.h \
-    tinySDLGraphicsPipe.I tinySDLGraphicsPipe.cxx tinySDLGraphicsPipe.h \
-    tinySDLGraphicsWindow.h tinySDLGraphicsWindow.I tinySDLGraphicsWindow.cxx \
-    tinyGraphicsBuffer.h tinyGraphicsBuffer.I tinyGraphicsBuffer.cxx \
+    config_tinydisplay.h \
+    tinyGeomMunger.I tinyGeomMunger.h \
+    tinySDLGraphicsPipe.I tinySDLGraphicsPipe.h \
+    tinySDLGraphicsWindow.h tinySDLGraphicsWindow.I \
+    tinyGraphicsBuffer.h tinyGraphicsBuffer.I \
     tinyGraphicsStateGuardian.h tinyGraphicsStateGuardian.I \
-    tinyGraphicsStateGuardian.cxx \
-    tinyTextureContext.I tinyTextureContext.cxx tinyTextureContext.h \
-    tinyWinGraphicsPipe.I tinyWinGraphicsPipe.cxx tinyWinGraphicsPipe.h \
-    tinyWinGraphicsWindow.h tinyWinGraphicsWindow.I tinyWinGraphicsWindow.cxx \
-    tinyXGraphicsPipe.I tinyXGraphicsPipe.cxx tinyXGraphicsPipe.h \
-    tinyXGraphicsWindow.h tinyXGraphicsWindow.I tinyXGraphicsWindow.cxx \
-    tinyOsxGraphicsPipe.I tinyOsxGraphicsPipe.cxx tinyOsxGraphicsPipe.h \
+    tinyTextureContext.I tinyTextureContext.h \
+    tinyWinGraphicsPipe.I tinyWinGraphicsPipe.h \
+    tinyWinGraphicsWindow.h tinyWinGraphicsWindow.I \
+    tinyXGraphicsPipe.I tinyXGraphicsPipe.h \
+    tinyXGraphicsWindow.h tinyXGraphicsWindow.I \
+    tinyOsxGraphicsPipe.I tinyOsxGraphicsPipe.h \
     tinyOsxGraphicsWindow.h tinyOsxGraphicsWindow.I \
     $[if $[IS_OSX],tinyOsxGraphicsWindow.mm,] \
-    clip.cxx error.cxx \
-    image_util.cxx init.cxx light.cxx \
-    memory.cxx msghandling.cxx msghandling.h \
-    specbuf.cxx \
-    texture.cxx vertex.cxx \
-    zbuffer.cxx zbuffer.h zdither.cxx zfeatures.h zgl.h zline.cxx \
-    zline.h zmath.cxx zmath.h \
+    msghandling.h \
+    zbuffer.h zfeatures.h zgl.h \
+    zline.h zmath.h \
     ztriangle.cxx ztriangle.h ztriangle_two.h \
     ztriangle_code.h ztriangle_table.h \
-    store_pixel.cxx store_pixel.h store_pixel_code.h store_pixel_table.h
+    store_pixel.h store_pixel_code.h store_pixel_table.h
+
+  #define INCLUDED_SOURCES \
+    clip.cxx \
+    config_tinydisplay.cxx \
+    error.cxx \
+    image_util.cxx \
+    init.cxx \
+    td_light.cxx \
+    memory.cxx \
+    msghandling.cxx \
+    specbuf.cxx \
+    store_pixel.cxx \
+    td_texture.cxx \
+    tinyGeomMunger.cxx \
+    tinyGraphicsBuffer.cxx \
+    tinyGraphicsStateGuardian.cxx \
+    tinyOsxGraphicsPipe.cxx \
+    tinySDLGraphicsPipe.cxx \
+    tinySDLGraphicsWindow.cxx \
+    tinyTextureContext.cxx \
+    tinyWinGraphicsPipe.cxx \
+    tinyWinGraphicsWindow.cxx \
+    tinyXGraphicsPipe.cxx \
+    tinyXGraphicsWindow.cxx \
+    vertex.cxx \
+    zbuffer.cxx \
+    zdither.cxx \
+    zline.cxx \
+    zmath.cxx
 
 #end lib_target
 
diff --git a/panda/src/tinydisplay/light.cxx b/panda/src/tinydisplay/td_light.cxx
similarity index 100%
rename from panda/src/tinydisplay/light.cxx
rename to panda/src/tinydisplay/td_light.cxx
diff --git a/panda/src/tinydisplay/texture.cxx b/panda/src/tinydisplay/td_texture.cxx
similarity index 100%
rename from panda/src/tinydisplay/texture.cxx
rename to panda/src/tinydisplay/td_texture.cxx
diff --git a/panda/src/tinydisplay/tinydisplay_composite1.cxx b/panda/src/tinydisplay/tinydisplay_composite1.cxx
new file mode 100755
index 0000000000..d0262553bc
--- /dev/null
+++ b/panda/src/tinydisplay/tinydisplay_composite1.cxx
@@ -0,0 +1,13 @@
+#include "clip.cxx"
+#include "config_tinydisplay.cxx"
+#include "error.cxx"
+#include "image_util.cxx"
+#include "init.cxx"
+#include "td_light.cxx"
+#include "memory.cxx"
+#include "msghandling.cxx"
+#include "specbuf.cxx"
+#include "store_pixel.cxx"
+#include "td_texture.cxx"
+#include "tinyGeomMunger.cxx"
+#include "tinyGraphicsBuffer.cxx"
diff --git a/panda/src/tinydisplay/tinydisplay_composite2.cxx b/panda/src/tinydisplay/tinydisplay_composite2.cxx
new file mode 100755
index 0000000000..3cf7f756ad
--- /dev/null
+++ b/panda/src/tinydisplay/tinydisplay_composite2.cxx
@@ -0,0 +1,14 @@
+#include "tinyGraphicsStateGuardian.cxx"
+#include "tinyOsxGraphicsPipe.cxx"
+#include "tinySDLGraphicsPipe.cxx"
+#include "tinySDLGraphicsWindow.cxx"
+#include "tinyTextureContext.cxx"
+#include "tinyWinGraphicsPipe.cxx"
+#include "tinyWinGraphicsWindow.cxx"
+#include "tinyXGraphicsPipe.cxx"
+#include "tinyXGraphicsWindow.cxx"
+#include "vertex.cxx"
+#include "zbuffer.cxx"
+#include "zdither.cxx"
+#include "zline.cxx"
+#include "zmath.cxx"