diff --git a/include/pvfs2-types.h b/include/pvfs2-types.h
index a149d9c..949e833 100644
--- a/include/pvfs2-types.h
+++ b/include/pvfs2-types.h
@@ -66,22 +66,8 @@
 #ifdef __KERNEL__
 #define strdup(s) kstrdup(s, GFP_KERNEL)
 #define assert(x) BUG_ON(!(x))
-#if PVFS2_SIZEOF_VOIDP == 32
-#ifndef uintptr_t
-#define uintptr_t uint32_t
-#endif
 #ifndef intptr_t
-#define intptr_t int32_t
-#endif
-#elif PVFS2_SIZEOF_VOIDP == 64
-#ifndef uintptr_t
-#define uintptr_t uint64_t
-#endif
-#ifndef intptr_t
-#define intptr_t int64_t
-#endif
-#else
-#error "Unhandled uintptr size"
+#define intptr_t long
 #endif
 #endif