diff --git a/panda/src/ode/Sources.pp b/panda/src/ode/Sources.pp
index 34d31d8da0..7ac36b0123 100755
--- a/panda/src/ode/Sources.pp
+++ b/panda/src/ode/Sources.pp
@@ -15,7 +15,7 @@
     $[TARGET]_composite2.cxx $[TARGET]_composite3.cxx
 
   #define SOURCES \
-    config_ode.h \
+    ode_includes.h config_ode.h \
     odeWorld.I odeWorld.h \
     odeMass.I odeMass.h \
     odeBody.I odeBody.h \
@@ -74,7 +74,7 @@
 
 
   #define INSTALL_HEADERS \
-    config_ode.h \
+    ode_includes.h config_ode.h \
     odeWorld.I odeWorld.h \
     odeMass.I odeMass.h \
     odeBody.I odeBody.h \
diff --git a/panda/src/ode/odeAMotorJoint.h b/panda/src/ode/odeAMotorJoint.h
index 296b7762c5..8bbf393a85 100644
--- a/panda/src/ode/odeAMotorJoint.h
+++ b/panda/src/ode/odeAMotorJoint.h
@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeBallJoint.h b/panda/src/ode/odeBallJoint.h
index 59e61b6111..b0329c8271 100644
--- a/panda/src/ode/odeBallJoint.h
+++ b/panda/src/ode/odeBallJoint.h
@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeBody.h b/panda/src/ode/odeBody.h
index 683e42b62c..63f14c019a 100755
--- a/panda/src/ode/odeBody.h
+++ b/panda/src/ode/odeBody.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeWorld.h"
 #include "odeMass.h"
 
diff --git a/panda/src/ode/odeBoxGeom.h b/panda/src/ode/odeBoxGeom.h
index 9f7c9bdc01..fd13237861 100644
--- a/panda/src/ode/odeBoxGeom.h
+++ b/panda/src/ode/odeBoxGeom.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeCappedCylinderGeom.h b/panda/src/ode/odeCappedCylinderGeom.h
index ca9aab4c92..070d02c6d9 100755
--- a/panda/src/ode/odeCappedCylinderGeom.h
+++ b/panda/src/ode/odeCappedCylinderGeom.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeContact.h b/panda/src/ode/odeContact.h
index b7d29ef8b6..fa8034cbe0 100755
--- a/panda/src/ode/odeContact.h
+++ b/panda/src/ode/odeContact.h
@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSurfaceParameters.h"
 #include "odeContactGeom.h"
 
diff --git a/panda/src/ode/odeContactGeom.h b/panda/src/ode/odeContactGeom.h
index e0ab002ed1..52752885c6 100755
--- a/panda/src/ode/odeContactGeom.h
+++ b/panda/src/ode/odeContactGeom.h
@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "OdeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeContactJoint.h b/panda/src/ode/odeContactJoint.h
index b071b357dc..a626a09c42 100644
--- a/panda/src/ode/odeContactJoint.h
+++ b/panda/src/ode/odeContactJoint.h
@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 #include "odeContact.h"
diff --git a/panda/src/ode/odeConvexGeom.h b/panda/src/ode/odeConvexGeom.h
index 9ccea2c776..51c5f788d5 100755
--- a/panda/src/ode/odeConvexGeom.h
+++ b/panda/src/ode/odeConvexGeom.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeCylinderGeom.h b/panda/src/ode/odeCylinderGeom.h
index 4a6925c005..872ce017b9 100755
--- a/panda/src/ode/odeCylinderGeom.h
+++ b/panda/src/ode/odeCylinderGeom.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeFixedJoint.h b/panda/src/ode/odeFixedJoint.h
index 861692823f..f02708436a 100644
--- a/panda/src/ode/odeFixedJoint.h
+++ b/panda/src/ode/odeFixedJoint.h
@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeGeom.h b/panda/src/ode/odeGeom.h
index 3f4ca31160..d0c0e66e2b 100755
--- a/panda/src/ode/odeGeom.h
+++ b/panda/src/ode/odeGeom.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h" // Needed for derived classes
 #include "odeBody.h"
 
diff --git a/panda/src/ode/odeHashSpace.h b/panda/src/ode/odeHashSpace.h
index 056fd0ba64..0bb7563d73 100755
--- a/panda/src/ode/odeHashSpace.h
+++ b/panda/src/ode/odeHashSpace.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h"
 
 
diff --git a/panda/src/ode/odeHeightFieldGeom.h b/panda/src/ode/odeHeightFieldGeom.h
index 2016f2ef9c..78acca414e 100644
--- a/panda/src/ode/odeHeightFieldGeom.h
+++ b/panda/src/ode/odeHeightFieldGeom.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeHinge2Joint.h b/panda/src/ode/odeHinge2Joint.h
index cbfa6899e0..5560fe0ece 100644
--- a/panda/src/ode/odeHinge2Joint.h
+++ b/panda/src/ode/odeHinge2Joint.h
@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeHingeJoint.h b/panda/src/ode/odeHingeJoint.h
index 81e22401db..8447bf1640 100755
--- a/panda/src/ode/odeHingeJoint.h
+++ b/panda/src/ode/odeHingeJoint.h
@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeJoint.h b/panda/src/ode/odeJoint.h
index 446a4b3959..cbd61e70f4 100755
--- a/panda/src/ode/odeJoint.h
+++ b/panda/src/ode/odeJoint.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeWorld.h" // Needed for derived classes
 #include "odeJointGroup.h"
 
diff --git a/panda/src/ode/odeJointGroup.h b/panda/src/ode/odeJointGroup.h
index 676e3a821d..ec5ecdc018 100755
--- a/panda/src/ode/odeJointGroup.h
+++ b/panda/src/ode/odeJointGroup.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : OdeJointGroup
diff --git a/panda/src/ode/odeLMotorJoint.h b/panda/src/ode/odeLMotorJoint.h
index 78cda52996..7dc20fdec5 100755
--- a/panda/src/ode/odeLMotorJoint.h
+++ b/panda/src/ode/odeLMotorJoint.h
@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeMass.h b/panda/src/ode/odeMass.h
index 1eafd3636e..060beee2a5 100755
--- a/panda/src/ode/odeMass.h
+++ b/panda/src/ode/odeMass.h
@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : OdeMass
diff --git a/panda/src/ode/odeNullJoint.h b/panda/src/ode/odeNullJoint.h
index 8383e70800..3e130b728d 100755
--- a/panda/src/ode/odeNullJoint.h
+++ b/panda/src/ode/odeNullJoint.h
@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odePlane2dJoint.h b/panda/src/ode/odePlane2dJoint.h
index bc2b82ac06..0ef65ce833 100755
--- a/panda/src/ode/odePlane2dJoint.h
+++ b/panda/src/ode/odePlane2dJoint.h
@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odePlaneGeom.h b/panda/src/ode/odePlaneGeom.h
index 2b3b92c708..04d0bbc254 100755
--- a/panda/src/ode/odePlaneGeom.h
+++ b/panda/src/ode/odePlaneGeom.h
@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeQuadTreeSpace.h b/panda/src/ode/odeQuadTreeSpace.h
index 0882760a02..a7cb971a3a 100755
--- a/panda/src/ode/odeQuadTreeSpace.h
+++ b/panda/src/ode/odeQuadTreeSpace.h
@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h"
 
 
diff --git a/panda/src/ode/odeRayGeom.h b/panda/src/ode/odeRayGeom.h
index e69a63891b..bf89a1ec5d 100755
--- a/panda/src/ode/odeRayGeom.h
+++ b/panda/src/ode/odeRayGeom.h
@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeSimpleSpace.h b/panda/src/ode/odeSimpleSpace.h
index 33104944f1..8d1c4b1058 100755
--- a/panda/src/ode/odeSimpleSpace.h
+++ b/panda/src/ode/odeSimpleSpace.h
@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeSpace.h"
 
 
diff --git a/panda/src/ode/odeSliderJoint.h b/panda/src/ode/odeSliderJoint.h
index 4783ea4727..edb239d5ad 100755
--- a/panda/src/ode/odeSliderJoint.h
+++ b/panda/src/ode/odeSliderJoint.h
@@ -4,7 +4,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeSpace.h b/panda/src/ode/odeSpace.h
index e7e9bd610b..17e1e11e66 100755
--- a/panda/src/ode/odeSpace.h
+++ b/panda/src/ode/odeSpace.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 class OdeGeom;
 class OdeTriMeshGeom;
diff --git a/panda/src/ode/odeSphereGeom.h b/panda/src/ode/odeSphereGeom.h
index 016054dcd6..68dca3fc98 100755
--- a/panda/src/ode/odeSphereGeom.h
+++ b/panda/src/ode/odeSphereGeom.h
@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/ode/odeSurfaceParameters.h b/panda/src/ode/odeSurfaceParameters.h
index f50b1b6c8d..f1e92173c1 100755
--- a/panda/src/ode/odeSurfaceParameters.h
+++ b/panda/src/ode/odeSurfaceParameters.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 class OdeContact;
 
diff --git a/panda/src/ode/odeTriMeshData.h b/panda/src/ode/odeTriMeshData.h
index 93d6024484..09b78e33b6 100755
--- a/panda/src/ode/odeTriMeshData.h
+++ b/panda/src/ode/odeTriMeshData.h
@@ -23,7 +23,7 @@
 #include "typedReferenceCount.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "nodePathCollection.h"
 #include "geomNode.h"
diff --git a/panda/src/ode/odeTriMeshGeom.I b/panda/src/ode/odeTriMeshGeom.I
index 3d29ba5861..5a575763e2 100755
--- a/panda/src/ode/odeTriMeshGeom.I
+++ b/panda/src/ode/odeTriMeshGeom.I
@@ -18,7 +18,7 @@
 
 INLINE void OdeTriMeshGeom::
 set_data(OdeTriMeshData &data) {
-  unlink_data(_id);
+  // unlink_data(_id); // not necessary?
   dGeomTriMeshSetData(_id, data.get_id());
   link_data(_id, data);
 }
@@ -68,4 +68,5 @@ get_num_triangles() const {
 INLINE dTriMeshDataID OdeTriMeshGeom::
 get_data_id() const {
   return dGeomTriMeshGetTriMeshDataID(_id);
-}
\ No newline at end of file
+}
+
diff --git a/panda/src/ode/odeTriMeshGeom.h b/panda/src/ode/odeTriMeshGeom.h
index aa6d92e416..fe1c1c5d15 100755
--- a/panda/src/ode/odeTriMeshGeom.h
+++ b/panda/src/ode/odeTriMeshGeom.h
@@ -22,7 +22,7 @@
 #include "pandabase.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 #include "odeGeom.h"
 #include "odeTriMeshData.h"
 
diff --git a/panda/src/ode/odeUniversalJoint.h b/panda/src/ode/odeUniversalJoint.h
index adcf6e05cb..64bb2c5315 100644
--- a/panda/src/ode/odeUniversalJoint.h
+++ b/panda/src/ode/odeUniversalJoint.h
@@ -5,7 +5,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 
 #include "odeJoint.h"
 
diff --git a/panda/src/ode/odeUtil.h b/panda/src/ode/odeUtil.h
index b4ae4d1707..15947e48aa 100755
--- a/panda/src/ode/odeUtil.h
+++ b/panda/src/ode/odeUtil.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 class OdeBody;
 class OdeJoint;
 
diff --git a/panda/src/ode/odeWorld.h b/panda/src/ode/odeWorld.h
index 36908f68c5..19e7bce84d 100755
--- a/panda/src/ode/odeWorld.h
+++ b/panda/src/ode/odeWorld.h
@@ -23,7 +23,7 @@
 #include "typedObject.h"
 #include "luse.h"
 
-#include "ode/ode.h"
+#include "ode_includes.h"
 class OdeBody;
 class OdeJoint;