--- ./glkloader-0.3.2/xpconfig/xpconfig.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/xpconfig.c	2007-07-11 15:39:17.000000000 +0100
@@ -33,6 +33,8 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "xpconfig.h"
 
--- ./glkloader-0.3.2/glkloader.c~	2001-06-23 21:54:17.000000000 +0100
+++ ./glkloader-0.3.2/glkloader.c	2007-07-11 15:34:16.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <glk.h>
 
 #include "defines.h"
--- ./glkloader-0.3.2/generate_glkfuncs.pl~	2001-03-14 03:07:59.000000000 +0000
+++ ./glkloader-0.3.2/generate_glkfuncs.pl	2007-07-11 15:35:41.000000000 +0100
@@ -282,6 +282,7 @@
 
 # Global definitions 
 print OUT_FILE "#include <stdio.h>\n";
+print OUT_FILE "#include <stdlib.h>\n";
 print OUT_FILE "#include <glk.h>\n";
 print OUT_FILE "\n";
 print OUT_FILE "#include \"defines.h\"\n";
--- ./glkloader-0.3.2/xpconfig/applist.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/applist.c	2007-07-11 15:44:42.000000000 +0100
@@ -32,6 +32,7 @@
 #endif
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "applist.h"
 #include "sectionlist.h"
--- ./glkloader-0.3.2/xpconfig/sectionlist.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/sectionlist.c	2007-07-11 15:44:56.000000000 +0100
@@ -32,6 +32,7 @@
 #endif
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "sectionlist.h"
 #include "keylist.h"
--- ./glkloader-0.3.2/xpconfig/keylist.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/keylist.c	2007-07-11 15:45:14.000000000 +0100
@@ -32,6 +32,8 @@
 #endif
 
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "keylist.h"
 
--- ./glkloader-0.3.2/xpconfig/platform_rcfile.c~	2001-06-23 21:54:23.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/platform_rcfile.c	2007-07-11 15:57:54.000000000 +0100
@@ -405,7 +405,6 @@
 			sprintf( filename, "%s/.%src", dirname, application );
 			parseConfigFile( filename, application );
 			free( filename );
-			free( dirname );
 		}
 	}
 
--- ./glkloader-0.3.2/glk.h~	2001-03-14 03:07:59.000000000 +0000
+++ ./glkloader-0.3.2/glk.h	2007-07-11 16:00:42.000000000 +0100
@@ -17,8 +17,9 @@
 /* You may have to edit the definition of glui32 to make sure it's really a
     32-bit unsigned integer type, and glsi32 to make sure it's really a
     32-bit signed integer type. If they're not, horrible things will happen. */
-typedef unsigned long glui32; 
-typedef signed long glsi32; 
+#include <stdint.h>
+typedef uint32_t glui32; 
+typedef int32_t glsi32; 
 
 /* These are the compile-time conditionals that reveal various Glk optional
     modules. */