diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
index 431b427c12..6e71c3814d 100755
--- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx
+++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
@@ -3261,7 +3261,7 @@ bool InterfaceMakerPythonNative::isCppTypeLegal(CPPType *in_ctype)
     {
         return true;
     }
-    else  if(builder.in_forcetype(in_ctype->get_local_name(&parser)))
+    else  if(builder.in_forcetype(type->get_local_name(&parser)))
     {
         return true;
     }
diff --git a/dtool/src/parser-inc/ode.h b/dtool/src/parser-inc/ode.h
index b4c019e81a..867ce8eb2f 100755
--- a/dtool/src/parser-inc/ode.h
+++ b/dtool/src/parser-inc/ode.h
@@ -87,6 +87,8 @@ typedef struct dSurfaceParameters dSurfaceParameters;
 typedef struct dMass dMass;
 typedef struct dContact dContact;
 typedef struct dContactGeom dContactGeom;
-typedef struct dTriMeshDataID dTriMeshDataID;
+
+struct dxTriMeshData;
+typedef struct dxTriMeshData* dTriMeshDataID;
 
 #endif /* _ODE_COMMON_H_ */
diff --git a/panda/src/ode/config_ode.N b/panda/src/ode/config_ode.N
index c5944c6f73..9d30a348cb 100755
--- a/panda/src/ode/config_ode.N
+++ b/panda/src/ode/config_ode.N
@@ -1 +1,9 @@
 noinclude ode/ode.h
+
+forcetype dxGeom
+forcetype dxBody
+forcetype dxWorld
+forcetype dxJointGroup
+forcetype dxJoint
+forcetype dxSpace
+forcetype dxTriMeshData
diff --git a/panda/src/ode/ode_includes.h b/panda/src/ode/ode_includes.h
index cc6dfecfd1..53616729c9 100755
--- a/panda/src/ode/ode_includes.h
+++ b/panda/src/ode/ode_includes.h
@@ -14,6 +14,8 @@
 
 #ifndef _ODE_INCLUDES_H_
 #define _ODE_INCLUDES_H_
+
+#include "pandabase.h"
  
 #ifdef int8
   #define temp_ode_int8 int8