diff -Naur vmhgfs_orig/vmhgfs-only/cpName.c vmhgfs_fixes/vmhgfs-only/cpName.c
--- vmhgfs_orig/vmhgfs-only/cpName.c	2008-05-16 05:28:32.000000000 +0000
+++ vmhgfs_fixes/vmhgfs-only/cpName.c	2008-07-01 21:39:24.000000000 +0000
@@ -14,8 +14,8 @@
 #include <string.h>
 #endif
 
-#include "vm_assert.h"
 #include "cpName.h"
+#include "vm_assert.h"
 #include "cpNameInt.h"
 
 /*
diff -Naur vmhgfs_orig/vmhgfs-only/cpNameLinux.c vmhgfs_fixes/vmhgfs-only/cpNameLinux.c
--- vmhgfs_orig/vmhgfs-only/cpNameLinux.c	2008-05-16 05:28:32.000000000 +0000
+++ vmhgfs_fixes/vmhgfs-only/cpNameLinux.c	2008-07-01 21:41:17.000000000 +0000
@@ -14,8 +14,8 @@
 #include <memory.h>
 #endif
 
-#include "vm_assert.h"
 #include "cpName.h"
+#include "vm_assert.h"
 #include "cpNameInt.h"
 
 
diff -Naur vmhgfs_orig/vmhgfs-only/cpNameLite.c vmhgfs_fixes/vmhgfs-only/cpNameLite.c
--- vmhgfs_orig/vmhgfs-only/cpNameLite.c	2008-05-16 05:28:32.000000000 +0000
+++ vmhgfs_fixes/vmhgfs-only/cpNameLite.c	2008-07-01 21:41:39.000000000 +0000
@@ -11,8 +11,8 @@
  *
  */
 
-#include "vm_assert.h"
 #include "cpNameLite.h"
+#include "vm_assert.h"
 
 /*
  *----------------------------------------------------------------------
diff -Naur vmhgfs_orig/vmhgfs-only/kernelStubs.h vmhgfs_fixes/vmhgfs-only/kernelStubs.h
--- vmhgfs_orig/vmhgfs-only/kernelStubs.h	2008-05-16 05:28:32.000000000 +0000
+++ vmhgfs_fixes/vmhgfs-only/kernelStubs.h	2008-07-01 21:44:36.000000000 +0000
@@ -14,10 +14,10 @@
 #define __KERNELSTUBS_H__
 
 #ifdef linux
-#include "vm_basic_types.h"
 #include "driver-config.h"
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include "vm_basic_types.h"
 #elif defined(_WIN32)
 #include "vm_basic_types.h"
 #include <ntddk.h>   /* kernel memory APIs */
diff -Naur vmhgfs_orig/vmhgfs-only/staticEscape.c vmhgfs_fixes/vmhgfs-only/staticEscape.c
--- vmhgfs_orig/vmhgfs-only/staticEscape.c	2008-05-16 05:28:32.000000000 +0000
+++ vmhgfs_fixes/vmhgfs-only/staticEscape.c	2008-07-01 21:45:13.000000000 +0000
@@ -15,8 +15,8 @@
 # include <string.h>
 #endif
 
-#include "vm_assert.h"
 #include "staticEscape.h"
+#include "vm_assert.h"
 
 
 /*
diff -Naur vmhgfs_orig/vmhgfs-only/vm_basic_types.h vmhgfs_fixes/vmhgfs-only/vm_basic_types.h
--- vmhgfs_orig/vmhgfs-only/vm_basic_types.h	2008-05-16 05:28:32.000000000 +0000
+++ vmhgfs_fixes/vmhgfs-only/vm_basic_types.h	2008-07-01 21:34:59.000000000 +0000
@@ -162,7 +162,7 @@
 #      endif
 #   endif
 
-#   ifndef _STDINT_H
+#   if ! defined(_STDINT_H) || ! defined(__KERNEL__)
 #      ifdef VM_I386
 #         ifdef VM_X86_64
              typedef uint64    uintptr_t;