diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 5f6ff3ca8..4dd53bbf9 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,19 @@
+
+2001-03-30  Earnie Boyd  <earnie@users.sourceforge.net>
+	* include/winuser.h (VK_KANA): New definition.
+	Thanks to: "Harold Hunt" <huntharo@msu.edu>
+
+2001-03-29  Earnie Boyd  <earnie@users.sourceforge.net
+
+	* include/winuser.h (RT_CURSOR): Add protection for XFree86Server.
+	(RT_FONT): Ditto.
+	* include/basetsd.h (INT32): Ditto.
+	* include/windef.h (ATOM): Ditto.
+	(BOOL): Ditto.
+	(BYTE): Ditto.
+	* include/winbase.h (FreeResource): Ditto.
+	Thanks to: "Harold Hunt" <huntharo@msu.edu>
+
 2001-03-20  Danny Smith <dannysmith@users.sourceforge.net>
 
 	* include/winsock.h (_SYS_TYPES_H macro guard for int types): Remove;
diff --git a/winsup/w32api/include/basetsd.h b/winsup/w32api/include/basetsd.h
index 7aaecb5b4..732e513c3 100644
--- a/winsup/w32api/include/basetsd.h
+++ b/winsup/w32api/include/basetsd.h
@@ -4,7 +4,9 @@
 extern "C" {
 #endif
 typedef int LONG32, *PLONG32;
+#ifndef XFree86Server
 typedef int INT32, *PINT32;
+#endif /* ndef XFree86Server */
 typedef unsigned int ULONG32, *PULONG32;
 typedef unsigned int DWORD32, *PDWORD32;
 typedef unsigned int UINT32, *PUINT32;
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 8e28cbf02..771dee87e 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1114,7 +1114,9 @@ BOOL WINAPI FreeLibrary(HMODULE);
 DECLSPEC_NORETURN void WINAPI FreeLibraryAndExitThread(HMODULE,DWORD);
 #define FreeModule(m) FreeLibrary(m)
 #define FreeProcInstance(p) (void)(p)
+#ifndef XFree86Server
 BOOL WINAPI FreeResource(HGLOBAL);
+#endif /* ndef XFree86Server */
 PVOID WINAPI FreeSid(PSID);
 BOOL WINAPI GetAce(PACL,DWORD,PVOID);
 BOOL WINAPI GetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS);
diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h
index 129a9a7d7..7a80a5a99 100644
--- a/winsup/w32api/include/windef.h
+++ b/winsup/w32api/include/windef.h
@@ -120,6 +120,7 @@ extern "C" {
 typedef unsigned long DWORD;
 typedef int WINBOOL,*PWINBOOL,*LPWINBOOL;
 /* FIXME: Is there a good solution to this? */
+#ifndef XFree86Server
 #ifndef __OBJC__
 typedef WINBOOL BOOL;
 #else
@@ -127,6 +128,7 @@ typedef WINBOOL BOOL;
 #endif
 typedef BOOL *PBOOL,*LPBOOL;
 typedef unsigned char BYTE;
+#endif /* ndef XFree86Server */
 typedef unsigned short WORD;
 typedef float FLOAT;
 typedef FLOAT *PFLOAT;
@@ -149,7 +151,9 @@ typedef LONG LRESULT;
 typedef LONG HRESULT;
 #define _HRESULT_DEFINED
 #endif
+#ifndef XFree86Server
 typedef WORD ATOM;
+#endif /* XFree86Server */
 typedef HANDLE HGLOBAL;
 typedef HANDLE HLOCAL;
 typedef HANDLE GLOBALHANDLE;
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index d5763fde2..2628d6ba7 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -491,14 +491,16 @@ extern "C" {
 #define SB_TOP	6
 #define MAKEINTRESOURCEA(i) (LPSTR)((DWORD)((WORD)(i)))
 #define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i)))
-#define RT_CURSOR MAKEINTRESOURCE(1)
+#ifndef XFree86Server
+# define RT_CURSOR MAKEINTRESOURCE(1)
+# define RT_FONT MAKEINTRESOURCE(8)
+#endif /* ndef XFree86Server */
 #define RT_BITMAP MAKEINTRESOURCE(2)
 #define RT_ICON MAKEINTRESOURCE(3)
 #define RT_MENU MAKEINTRESOURCE(4)
 #define RT_DIALOG MAKEINTRESOURCE(5)
 #define RT_STRING MAKEINTRESOURCE(6)
 #define RT_FONTDIR MAKEINTRESOURCE(7)
-#define RT_FONT MAKEINTRESOURCE(8)
 #define RT_ACCELERATOR MAKEINTRESOURCE(9)
 #define RT_RCDATA MAKEINTRESOURCE(10)
 #define RT_MESSAGETABLE MAKEINTRESOURCE(11)
@@ -1519,6 +1521,7 @@ extern "C" {
 #define VK_TAB	9
 #define VK_CLEAR	12
 #define VK_RETURN	13
+#define VK_KANA		15
 #define VK_SHIFT	16
 #define VK_CONTROL	17
 #define VK_MENU	18