diff -ru vmnet-only.org/compat_wait.h vmnet-only/compat_wait.h
--- vmnet-only.org/compat_wait.h	2008-03-03 21:16:14.000000000 -0500
+++ vmnet-only/compat_wait.h	2008-03-23 02:26:10.000000000 -0400
@@ -34,13 +34,13 @@
  * 2.4.20-wolk4.0s.
  */
 
-#if VMW_HAVE_EPOLL // {
+#ifdef VMW_HAVE_EPOLL // {
 #define compat_poll_wqueues struct poll_wqueues
 #else // } {
 #define compat_poll_wqueues poll_table
 #endif // }
 
-#if VMW_HAVE_EPOLL // {
+#ifdef VMW_HAVE_EPOLL // {
 
 /* If prototype does not match, build will abort here */
 extern void poll_initwait(compat_poll_wqueues *);
diff -ru vmnet-only.org/sk_alloc.c vmnet-only/sk_alloc.c
--- vmnet-only.org/sk_alloc.c	2008-03-03 21:16:14.000000000 -0500
+++ vmnet-only/sk_alloc.c	2008-03-23 02:26:10.000000000 -0400
@@ -8,6 +8,7 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
 #include <net/sock.h>
+#include <linux/version.h>
 
 static struct proto test_proto = {
    .name     = "TEST",
@@ -16,6 +17,10 @@
 struct sock * 
 vmware_sk_alloc(void)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
    return sk_alloc(PF_NETLINK, 0, &test_proto, 1);
+#else
+   return sk_alloc(&init_net, PF_NETLINK, 0, &test_proto);
+#endif
 }
 #endif
diff -ru vmnet-only.org/vm_basic_types.h vmnet-only/vm_basic_types.h
--- vmnet-only.org/vm_basic_types.h	2008-03-03 21:16:14.000000000 -0500
+++ vmnet-only/vm_basic_types.h	2008-03-23 02:26:10.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;