--- lib/parse.h.orig	2008-09-15 16:37:16.000000000 -0700
+++ lib/parse.h	2008-09-15 16:44:37.000000000 -0700
@@ -23,9 +23,10 @@
 #ifdef _WIN32
 #include "boinc_win.h"
 #else
-#include "config.h"
+//#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstring>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
--- api/boinc_gl.h.orig	2008-09-15 16:42:22.000000000 -0700
+++ api/boinc_gl.h	2008-09-15 16:42:42.000000000 -0700
@@ -37,7 +37,7 @@
 
 
 #else // !_WIN32, !__APPLE_CC__
-#include "config.h"
+//#include "config.h"
 
 #  if defined(HAVE_GL_H)
 #    include <gl.h>
--- ./api/texfont.C.orig	2008-09-15 18:28:54.000000000 -0700
+++ ./api/texfont.C	2008-09-15 18:31:56.000000000 -0700
@@ -7,6 +7,8 @@
 #pragma warning (disable:4244)          // disable bogus conversion warnings
 #endif
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
--- api/txf_util.C.orig	2008-09-15 18:32:24.000000000 -0700
+++ api/txf_util.C	2008-09-15 18:32:40.000000000 -0700
@@ -24,6 +24,8 @@
 #include "boinc_win.h"
 #endif
 
+#include "config.h"
+
 #include <cstring>
 #include "filesys.h"
 #include "boinc_api.h"