diff -Naurp src/xkbcomp-1.2.4/listing.c tmp/xkbcomp-1.2.4/listing.c
--- src/xkbcomp-1.2.4/listing.c	2012-03-23 01:03:05 -0400
+++ tmp/xkbcomp-1.2.4/listing.c	
@@ -108,6 +108,7 @@ SOFTWARE.
 #endif
 
 #ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 # define FileName(file) file.cFileName
 # undef TEXT
diff -Naurp src/xkbcomp-1.2.4/xkbscan.c tmp/xkbcomp-1.2.4/xkbscan.c
--- src/xkbcomp-1.2.4/xkbscan.c	2012-03-23 01:03:05 -0400
+++ tmp/xkbcomp-1.2.4/xkbscan.c	
@@ -24,6 +24,7 @@
 
  ********************************************************/
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <X11/Xos.h>