diff --git a/panda/src/ode/odeWorld.cxx b/panda/src/ode/odeWorld.cxx
index 60ba7c78f4..97b614107a 100755
--- a/panda/src/ode/odeWorld.cxx
+++ b/panda/src/ode/odeWorld.cxx
@@ -49,7 +49,7 @@ destroy() {
 }
 
 void OdeWorld::
-init_surface_table(uint8 num_surfaces)
+init_surface_table(PN_uint8 num_surfaces)
 {
     _surface_table = new dSurfaceParameters[num_surfaces * num_surfaces];
     _num_surfaces = num_surfaces;
@@ -72,7 +72,7 @@ set_surface(int pos1, int pos2, dSurfaceParameters& entry)
 }
 
 dSurfaceParameters& OdeWorld::
-get_surface(uint8 surface1, uint8 surface2)
+get_surface(PN_uint8 surface1, PN_uint8 surface2)
 {
     int true_pos = 0;
     if(surface1 >= surface2)
@@ -87,7 +87,7 @@ get_surface(uint8 surface1, uint8 surface2)
 }
 
 void OdeWorld:: 
-set_surface_entry(  uint8 pos1, uint8 pos2, 
+set_surface_entry(  PN_uint8 pos1, PN_uint8 pos2, 
                     dReal mu,
                     dReal bounce, 
                     dReal bounce_vel, 
diff --git a/panda/src/ode/odeWorld.h b/panda/src/ode/odeWorld.h
index 398adb3f1f..aa32374b35 100755
--- a/panda/src/ode/odeWorld.h
+++ b/panda/src/ode/odeWorld.h
@@ -22,8 +22,10 @@
 #include "pandabase.h"
 #include "typedObject.h"
 #include "luse.h"
-
 #include "ode_includes.h"
+#include "pmap.h"
+#include "numeric_types.h"
+
 class OdeBody;
 class OdeJoint;
 
@@ -78,9 +80,9 @@ PUBLISHED:
   INLINE void step_fast1(dReal stepsize, int maxiterations);
 
   INLINE int compare_to(const OdeWorld &other) const;
-  INLINE void init_surface_table(uint8 num_surfaces);
+  INLINE void init_surface_table(PN_uint8 num_surfaces);
   INLINE void assign_surface_body(OdeBody& body, int surface);
-  INLINE void set_surface_entry(uint8 pos1, uint8 pos2, 
+  INLINE void set_surface_entry(PN_uint8 pos1, PN_uint8 pos2, 
                                 dReal mu, 
                                 dReal bounce, 
                                 dReal bounce_vel, 
@@ -91,14 +93,14 @@ PUBLISHED:
     
 public: 
   INLINE dWorldID get_id() const;
-  INLINE dSurfaceParameters& get_surface(uint8 surface1, uint8 surface2);
+  INLINE dSurfaceParameters& get_surface(PN_uint8 surface1, PN_uint8 surface2);
   INLINE void set_surface(int pos1, int pos2, dSurfaceParameters& entry);
   INLINE int get_surface_body(dBodyID id);
   
 private:
   dWorldID _id;
   dSurfaceParameters *_surface_table;
-  uint8 _num_surfaces;
+  PN_uint8 _num_surfaces;
   typedef pmap<dBodyID, int> BodySurfaceMap;
   BodySurfaceMap _body_surface_map;