diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index eb23c275f3..e21dfb4cb8 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -1865,7 +1865,6 @@ CopyAllHeaders('panda/src/ode')
 CopyAllHeaders('panda/metalibs/pandaode')
 CopyAllHeaders('panda/src/physics')
 CopyAllHeaders('panda/src/particlesystem')
-CopyAllHeaders('panda/src/tinyxml')
 CopyAllHeaders('panda/src/dxml')
 CopyAllHeaders('panda/metalibs/panda')
 CopyAllHeaders('panda/src/audiotraits')
@@ -2622,23 +2621,21 @@ if (PkgSkip("VRPN")==0 and not RUNTIME):
   TargetAdd('libvrpn.in', opts=['IMOD:panda', 'ILIB:libvrpn', 'SRCDIR:panda/src/vrpn'])
   TargetAdd('libvrpn_igate.obj', input='libvrpn.in', opts=["DEPENDENCYONLY"])
 
-#
-# DIRECTORY: panda/src/tinyxml/
-#
-
-OPTS=['DIR:panda/src/tinyxml', 'TINYXML']
-DefSymbol("TINYXML", "TIXML_USE_STL", "")
-TargetAdd('tinyxml_composite1.obj', opts=OPTS, input='tinyxml_composite1.cxx')
-TargetAdd('libp3tinyxml.ilb', input='tinyxml_composite1.obj')
-
 #
 # DIRECTORY: panda/src/dxml/
 #
 
+DefSymbol("TINYXML", "TIXML_USE_STL", "")
+
+if (RUNTIME or RTDIST):
+  OPTS=['DIR:panda/src/dxml', 'TINYXML']
+  TargetAdd('tinyxml_composite1.obj', opts=OPTS, input='tinyxml_composite1.cxx')
+  TargetAdd('libp3tinyxml.ilb', input='tinyxml_composite1.obj')
+
 if (not RUNTIME):
-  OPTS=['DIR:panda/src/dxml', 'BUILDING:PANDA']
-  TargetAdd('dxml_config_dxml.obj', opts=OPTS, input='config_dxml.cxx')
-  IGATEFILES=GetDirectoryContents('panda/src/dxml', ["*.h", "config_dxml.cxx"])
+  OPTS=['DIR:panda/src/dxml', 'BUILDING:PANDA', 'TINYXML']
+  TargetAdd('dxml_composite1.obj', opts=OPTS, input='dxml_composite1.cxx')
+  IGATEFILES=GetDirectoryContents('panda/src/dxml', ["*.h", "dxml_composite1.cxx"])
   TargetAdd('libdxml.in', opts=OPTS, input=IGATEFILES)
   TargetAdd('libdxml.in', opts=['IMOD:panda', 'ILIB:libdxml', 'SRCDIR:panda/src/dxml'])
   TargetAdd('libdxml_igate.obj', input='libdxml.in', opts=["DEPENDENCYONLY"])
@@ -2757,9 +2754,8 @@ if (not RUNTIME):
   TargetAdd('libpanda.dll', input='libnativenet_igate.obj')
   TargetAdd('libpanda.dll', input='pandabase_pandabase.obj')
   TargetAdd('libpanda.dll', input='libpandaexpress.dll')
-  TargetAdd('libpanda.dll', input='dxml_config_dxml.obj')
+  TargetAdd('libpanda.dll', input='dxml_composite1.obj')
   TargetAdd('libpanda.dll', input='libdxml_igate.obj')
-  TargetAdd('libpanda.dll', input='libp3tinyxml.ilb')
   TargetAdd('libpanda.dll', input='libp3dtoolconfig.dll')
   TargetAdd('libpanda.dll', input='libp3dtool.dll')
 
diff --git a/panda/src/dxml/Sources.pp b/panda/src/dxml/Sources.pp
index 5941ccb871..35addca273 100644
--- a/panda/src/dxml/Sources.pp
+++ b/panda/src/dxml/Sources.pp
@@ -1,14 +1,35 @@
-#define LOCAL_LIBS p3tinyxml pandabase
+#begin static_lib_target
+  #define TARGET p3tinyxml
+
+  #define COMBINED_SOURCES tinyxml_composite1.cxx
+
+  #define SOURCES \
+     tinyxml.h
+
+  #define INCLUDED_SOURCES  \
+     tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp
+
+  #define EXTRA_CDEFS TIXML_USE_STL
+  #define C++FLAGS $[CFLAGS_SHARED]
+
+#end static_lib_target
 
 #begin lib_target
   #define TARGET dxml
 
+  #define LOCAL_LIBS pandabase
   #define OTHER_LIBS \
     interrogatedb:c dconfig:c dtoolconfig:m \
     dtoolutil:c dtoolbase:c prc:c dtool:m
 
+  #define COMBINED_SOURCES dxml_composite1.cxx
+
   #define SOURCES \
-    config_dxml.h config_dxml.cxx
+    config_dxml.h tinyxml.h
+
+  #define INCLUDED_SOURCES \
+    config_dxml.cxx \
+    tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp
 
   #define IGATESCAN all
 #end lib_target
diff --git a/panda/src/dxml/dxml_composite1.cxx b/panda/src/dxml/dxml_composite1.cxx
new file mode 100644
index 0000000000..e665311923
--- /dev/null
+++ b/panda/src/dxml/dxml_composite1.cxx
@@ -0,0 +1,2 @@
+#include "config_dxml.cxx"
+#include "tinyxml_composite1.cxx"
diff --git a/panda/src/tinyxml/tinyxml.cpp b/panda/src/dxml/tinyxml.cpp
similarity index 100%
rename from panda/src/tinyxml/tinyxml.cpp
rename to panda/src/dxml/tinyxml.cpp
diff --git a/panda/src/tinyxml/tinyxml.h b/panda/src/dxml/tinyxml.h
similarity index 100%
rename from panda/src/tinyxml/tinyxml.h
rename to panda/src/dxml/tinyxml.h
diff --git a/panda/src/tinyxml/tinyxml_composite1.cxx b/panda/src/dxml/tinyxml_composite1.cxx
similarity index 100%
rename from panda/src/tinyxml/tinyxml_composite1.cxx
rename to panda/src/dxml/tinyxml_composite1.cxx
diff --git a/panda/src/tinyxml/tinyxmlerror.cpp b/panda/src/dxml/tinyxmlerror.cpp
similarity index 100%
rename from panda/src/tinyxml/tinyxmlerror.cpp
rename to panda/src/dxml/tinyxmlerror.cpp
diff --git a/panda/src/tinyxml/tinyxmlparser.cpp b/panda/src/dxml/tinyxmlparser.cpp
similarity index 100%
rename from panda/src/tinyxml/tinyxmlparser.cpp
rename to panda/src/dxml/tinyxmlparser.cpp
diff --git a/panda/src/tinyxml/Sources.pp b/panda/src/tinyxml/Sources.pp
deleted file mode 100644
index eaaabda4ca..0000000000
--- a/panda/src/tinyxml/Sources.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-#begin static_lib_target
-  #define TARGET p3tinyxml
-
-  #define COMBINED_SOURCES tinyxml_composite1.cxx
-
-  #define SOURCES \
-     tinyxml.h
-
-  #define INCLUDED_SOURCES  \
-     tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp
-
-  #define EXTRA_CDEFS TIXML_USE_STL
-  #define C++FLAGS $[CFLAGS_SHARED]
-
-#end static_lib_target