diff --git a/contrib/src/contribbase/contribsymbols.h b/contrib/src/contribbase/contribsymbols.h
index 3384d0a3e5..974ed3f5b8 100644
--- a/contrib/src/contribbase/contribsymbols.h
+++ b/contrib/src/contribbase/contribsymbols.h
@@ -29,4 +29,11 @@
   #define EXPTP_PANDAAI IMPORT_TEMPL
 #endif
 
+#ifdef BUILDING_PANDASPEEDTREE
+  #define EXPCL_PANDASPEEDTREE EXPORT_CLASS
+  #define EXPTP_PANDASPEEDTREE EXPORT_TEMPL
+#else
+  #define EXPCL_PANDASPEEDTREE IMPORT_CLASS
+  #define EXPTP_PANDASPEEDTREE IMPORT_TEMPL
+#endif
 #endif
diff --git a/panda/src/speedtree/config_speedtree.cxx b/contrib/src/speedtree/config_speedtree.cxx
similarity index 100%
rename from panda/src/speedtree/config_speedtree.cxx
rename to contrib/src/speedtree/config_speedtree.cxx
diff --git a/panda/src/speedtree/config_speedtree.h b/contrib/src/speedtree/config_speedtree.h
similarity index 100%
rename from panda/src/speedtree/config_speedtree.h
rename to contrib/src/speedtree/config_speedtree.h
diff --git a/panda/src/speedtree/loaderFileTypeSrt.cxx b/contrib/src/speedtree/loaderFileTypeSrt.cxx
similarity index 100%
rename from panda/src/speedtree/loaderFileTypeSrt.cxx
rename to contrib/src/speedtree/loaderFileTypeSrt.cxx
diff --git a/panda/src/speedtree/loaderFileTypeSrt.h b/contrib/src/speedtree/loaderFileTypeSrt.h
similarity index 100%
rename from panda/src/speedtree/loaderFileTypeSrt.h
rename to contrib/src/speedtree/loaderFileTypeSrt.h
diff --git a/panda/src/speedtree/loaderFileTypeStf.cxx b/contrib/src/speedtree/loaderFileTypeStf.cxx
similarity index 100%
rename from panda/src/speedtree/loaderFileTypeStf.cxx
rename to contrib/src/speedtree/loaderFileTypeStf.cxx
diff --git a/panda/src/speedtree/loaderFileTypeStf.h b/contrib/src/speedtree/loaderFileTypeStf.h
similarity index 100%
rename from panda/src/speedtree/loaderFileTypeStf.h
rename to contrib/src/speedtree/loaderFileTypeStf.h
diff --git a/panda/src/speedtree/pandaspeedtree_composite1.cxx b/contrib/src/speedtree/pandaspeedtree_composite1.cxx
similarity index 100%
rename from panda/src/speedtree/pandaspeedtree_composite1.cxx
rename to contrib/src/speedtree/pandaspeedtree_composite1.cxx
diff --git a/panda/src/speedtree/speedTreeNode.I b/contrib/src/speedtree/speedTreeNode.I
similarity index 100%
rename from panda/src/speedtree/speedTreeNode.I
rename to contrib/src/speedtree/speedTreeNode.I
diff --git a/panda/src/speedtree/speedTreeNode.cxx b/contrib/src/speedtree/speedTreeNode.cxx
similarity index 100%
rename from panda/src/speedtree/speedTreeNode.cxx
rename to contrib/src/speedtree/speedTreeNode.cxx
diff --git a/panda/src/speedtree/speedTreeNode.h b/contrib/src/speedtree/speedTreeNode.h
similarity index 100%
rename from panda/src/speedtree/speedTreeNode.h
rename to contrib/src/speedtree/speedTreeNode.h
diff --git a/panda/src/speedtree/speedtree_api.cxx b/contrib/src/speedtree/speedtree_api.cxx
similarity index 100%
rename from panda/src/speedtree/speedtree_api.cxx
rename to contrib/src/speedtree/speedtree_api.cxx
diff --git a/panda/src/speedtree/speedtree_api.h b/contrib/src/speedtree/speedtree_api.h
similarity index 100%
rename from panda/src/speedtree/speedtree_api.h
rename to contrib/src/speedtree/speedtree_api.h
diff --git a/panda/src/speedtree/stBasicTerrain.I b/contrib/src/speedtree/stBasicTerrain.I
similarity index 100%
rename from panda/src/speedtree/stBasicTerrain.I
rename to contrib/src/speedtree/stBasicTerrain.I
diff --git a/panda/src/speedtree/stBasicTerrain.cxx b/contrib/src/speedtree/stBasicTerrain.cxx
similarity index 100%
rename from panda/src/speedtree/stBasicTerrain.cxx
rename to contrib/src/speedtree/stBasicTerrain.cxx
diff --git a/panda/src/speedtree/stBasicTerrain.h b/contrib/src/speedtree/stBasicTerrain.h
similarity index 100%
rename from panda/src/speedtree/stBasicTerrain.h
rename to contrib/src/speedtree/stBasicTerrain.h
diff --git a/panda/src/speedtree/stTerrain.I b/contrib/src/speedtree/stTerrain.I
similarity index 100%
rename from panda/src/speedtree/stTerrain.I
rename to contrib/src/speedtree/stTerrain.I
diff --git a/panda/src/speedtree/stTerrain.cxx b/contrib/src/speedtree/stTerrain.cxx
similarity index 100%
rename from panda/src/speedtree/stTerrain.cxx
rename to contrib/src/speedtree/stTerrain.cxx
diff --git a/panda/src/speedtree/stTerrain.h b/contrib/src/speedtree/stTerrain.h
similarity index 100%
rename from panda/src/speedtree/stTerrain.h
rename to contrib/src/speedtree/stTerrain.h
diff --git a/panda/src/speedtree/stTransform.I b/contrib/src/speedtree/stTransform.I
similarity index 100%
rename from panda/src/speedtree/stTransform.I
rename to contrib/src/speedtree/stTransform.I
diff --git a/panda/src/speedtree/stTransform.cxx b/contrib/src/speedtree/stTransform.cxx
similarity index 100%
rename from panda/src/speedtree/stTransform.cxx
rename to contrib/src/speedtree/stTransform.cxx
diff --git a/panda/src/speedtree/stTransform.h b/contrib/src/speedtree/stTransform.h
similarity index 100%
rename from panda/src/speedtree/stTransform.h
rename to contrib/src/speedtree/stTransform.h
diff --git a/panda/src/speedtree/stTree.I b/contrib/src/speedtree/stTree.I
similarity index 100%
rename from panda/src/speedtree/stTree.I
rename to contrib/src/speedtree/stTree.I
diff --git a/panda/src/speedtree/stTree.cxx b/contrib/src/speedtree/stTree.cxx
similarity index 100%
rename from panda/src/speedtree/stTree.cxx
rename to contrib/src/speedtree/stTree.cxx
diff --git a/panda/src/speedtree/stTree.h b/contrib/src/speedtree/stTree.h
similarity index 100%
rename from panda/src/speedtree/stTree.h
rename to contrib/src/speedtree/stTree.h
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 769184f5c1..588085cdda 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -3101,7 +3101,7 @@ if (PkgSkip("BULLET")==0):
     CopyAllHeaders('panda/metalibs/pandabullet')
 
 if (PkgSkip("SPEEDTREE")==0):
-    CopyAllHeaders('panda/src/speedtree')
+    CopyAllHeaders('contrib/src/speedtree')
 
 if (PkgSkip("DIRECT")==0):
     CopyAllHeaders('direct/src/directbase')
@@ -4696,15 +4696,15 @@ if (PkgSkip("PANDAPHYSICS")==0):
   PyTargetAdd('physics.pyd', input=COMMON_PANDA_LIBS)
 
 #
-# DIRECTORY: panda/src/speedtree/
+# DIRECTORY: contrib/src/speedtree/
 #
 
 if (PkgSkip("SPEEDTREE")==0):
-  OPTS=['DIR:panda/src/speedtree', 'BUILDING:PANDASPEEDTREE', 'SPEEDTREE']
+  OPTS=['DIR:contrib/src/speedtree', 'BUILDING:PANDASPEEDTREE', 'SPEEDTREE']
   TargetAdd('pandaspeedtree_composite1.obj', opts=OPTS, input='pandaspeedtree_composite1.cxx')
-  IGATEFILES=GetDirectoryContents('panda/src/speedtree', ["*.h", "*_composite*.cxx"])
+  IGATEFILES=GetDirectoryContents('contrib/src/speedtree', ["*.h", "*_composite*.cxx"])
   TargetAdd('libpandaspeedtree.in', opts=OPTS, input=IGATEFILES)
-  TargetAdd('libpandaspeedtree.in', opts=['IMOD:libpandaspeedtree', 'ILIB:libpandaspeedtree', 'SRCDIR:panda/src/speedtree'])
+  TargetAdd('libpandaspeedtree.in', opts=['IMOD:libpandaspeedtree', 'ILIB:libpandaspeedtree', 'SRCDIR:contrib/src/speedtree'])
 
   PyTargetAdd('libpandaspeedtree_module.obj', input='libpandaspeedtree.in')
   PyTargetAdd('libpandaspeedtree_module.obj', opts=OPTS)
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index ae0ee8d360..25fab1437c 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -135,7 +135,7 @@ CONFLICTING_FILES=["dtool/src/dtoolutil/pandaVersion.h",
                    "dtool/src/dtoolutil/checkPandaVersion.h",
                    "dtool/src/dtoolutil/checkPandaVersion.cxx",
                    "dtool/src/prc/prc_parameters.h",
-                   "panda/src/speedtree/speedtree_parameters.h",
+                   "contrib/src/speedtree/speedtree_parameters.h",
                    "direct/src/plugin/p3d_plugin_config.h",
                    "direct/src/plugin_activex/P3DActiveX.rc",
                    "direct/src/plugin_npapi/nppanda3d.rc",
diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h
index 3cabc46e8b..548cd1aee8 100644
--- a/panda/src/pandabase/pandasymbols.h
+++ b/panda/src/pandabase/pandasymbols.h
@@ -539,14 +539,6 @@
   #define EXPTP_PANDASKEL IMPORT_TEMPL
 #endif
 
-#ifdef BUILDING_PANDASPEEDTREE
-  #define EXPCL_PANDASPEEDTREE EXPORT_CLASS
-  #define EXPTP_PANDASPEEDTREE EXPORT_TEMPL
-#else
-  #define EXPCL_PANDASPEEDTREE IMPORT_CLASS
-  #define EXPTP_PANDASPEEDTREE IMPORT_TEMPL
-#endif
-
 #ifdef BUILDING_PANDAWIN
   #define EXPCL_PANDAWIN EXPORT_CLASS
   #define EXPTP_PANDAWIN EXPORT_TEMPL