diff --git a/dtool/src/parser-inc/Sources.pp b/dtool/src/parser-inc/Sources.pp
index aef8fe952e..4bc28b9936 100644
--- a/dtool/src/parser-inc/Sources.pp
+++ b/dtool/src/parser-inc/Sources.pp
@@ -10,10 +10,10 @@
     hxcomm.h hxcore.h hxengin.h hxerror.h hxfiles.h hxtbuf.h \
     hxtbuff.h hxwin.h Python.h py_panda.h Cg/cg.h Cg/cgGL.h \
     cv.h cvtypes.h cxcore.h cxerror.h cxtypes.h highgui.h \
-    avcodec.h avformat.h avio.h avutil.h common.h integer.h \
+    avcodec.h avformat.h avio.h avutil.h integer.h \
     intfloat_readwrite.h mathematics.h rational.h rtp.h \
     rtsp.h rtspcodes.h setjmp.h winsock2.h \
-    ode/config.h ode/common.h collision_trimesh.h  \
+    ode/ode.h collision_trimesh.h  \
     netinet/tcp.h netinet/ip.h \
     rfftw.h
 
diff --git a/dtool/src/parser-inc/config.h b/dtool/src/parser-inc/config.h
deleted file mode 100755
index d5d22a2941..0000000000
--- a/dtool/src/parser-inc/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @file config.h
- * common internal api header.
- */
-
-#ifndef _ODE_CONFIG_H_
-#define _ODE_CONFIG_H_
-
-#define dSINGLE 1
-#define _MSC_VER 1
-#define ODE_PLATFORM_WINDOWS  
-
-#if !defined(ODE_API)
-  #define ODE_API
-#endif
-
-#endif /* _ODE_CONFIG_H */
diff --git a/dtool/src/parser-inc/common.h b/dtool/src/parser-inc/ode.h
old mode 100644
new mode 100755
similarity index 51%
rename from dtool/src/parser-inc/common.h
rename to dtool/src/parser-inc/ode.h
index 00b0cf0bc4..062cc1d6c9
--- a/dtool/src/parser-inc/common.h
+++ b/dtool/src/parser-inc/ode.h
@@ -1,3 +1,38 @@
+// Filename: ode.h
+// Created by:  drose (27Jun07)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// panda3d-general@lists.sourceforge.net .
+//
+////////////////////////////////////////////////////////////////////
+/**
+ * @file config.h
+ * common internal api header.
+ */
+
+#ifndef _ODE_CONFIG_H_
+#define _ODE_CONFIG_H_
+
+#define dSINGLE 1
+#define _MSC_VER 1
+#define ODE_PLATFORM_WINDOWS  
+
+#if !defined(ODE_API)
+  #define ODE_API
+#endif
+
+#endif /* _ODE_CONFIG_H */
+
 /**
  * @file common.h
  * common internal api header.
@@ -10,7 +45,7 @@
 
 
 
-# ODE header stuff
+/* ODE header stuff */
 
 #ifndef _ODE_COMMON_H_
 #define _ODE_COMMON_H_
@@ -52,4 +87,10 @@ typedef struct dJointFeedback {
   dVector3 t2;		/* torque applied to body 2 */
 } dJointFeedback;
 
+typedef struct dSurfaceParameters dSurfaceParameters;
+typedef struct dMass dMass;
+typedef struct dContact dContact;
+typedef struct dContactGeom dContactGeom;
+typedef struct dTriMeshDataID dTriMeshDataID;
+
 #endif /* _ODE_COMMON_H_ */