diff -ru vmmon-only.org/include/vcpuset.h vmmon-only/include/vcpuset.h
--- vmmon-only.org/include/vcpuset.h	2008-03-03 21:16:13.000000000 -0500
+++ vmmon-only/include/vcpuset.h	2008-03-23 02:30:45.000000000 -0400
@@ -71,7 +71,7 @@
 #define ffs(x) ffs_x86_64(x)
 
 #elif defined MODULE
-   #include "asm/bitops.h"
+   #include "linux/bitops.h"
 #elif defined __APPLE__ && defined KERNEL
    /* 
     * XXXMACOS An ugly hack to resolve redefinition of PAGE_ defines 
diff -ru vmmon-only.org/include/vm_basic_types.h vmmon-only/include/vm_basic_types.h
--- vmmon-only.org/include/vm_basic_types.h	2008-03-03 21:16:13.000000000 -0500
+++ vmmon-only/include/vm_basic_types.h	2008-03-23 02:25:39.000000000 -0400
@@ -163,6 +163,8 @@
 #   endif
 
 #   ifndef _STDINT_H
+#      include <linux/version.h>
+#      if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
 #      ifdef VM_I386
 #         ifdef VM_X86_64
              typedef uint64    uintptr_t;
@@ -175,6 +177,7 @@
           typedef uint64    uintptr_t;
 #      endif
 #   endif
+#   endif
 #endif
 
 
@@ -270,6 +273,7 @@
 #define CHOOSE_PERCENT  asPercent(-1)
 
 
+#include <linux/types.h>
 typedef uintptr_t VA;
 typedef uintptr_t VPN;