diff --git a/api/boinc_gl.h b/api/boinc_gl.h
index d91b9c32cd..a425146139 100644
--- a/api/boinc_gl.h
+++ b/api/boinc_gl.h
@@ -20,7 +20,6 @@
 #ifndef H_BOINC_GL
 #define H_BOINC_GL
 
-#include "config.h"
 
 #if defined(_WIN32)
 #  include <GL/gl.h>
@@ -33,6 +32,7 @@
 #  include "GLUT/glut.h"
 
 #else // !_WIN32, !__APPLE_CC__
+#include "config.h"
 
 #  if defined(HAVE_GL_H)
 #    include <gl.h>
diff --git a/api/gutil.C b/api/gutil.C
index 5b39a6620b..a69b9d7cd4 100755
--- a/api/gutil.C
+++ b/api/gutil.C
@@ -17,11 +17,11 @@
 // Contributor(s):
 //
 
-#include "config.h"
-
 #ifdef _WIN32
 #include "boinc_win.h"
+extern "C"{
 #include "jpeglib.h"
+}
 #include "bmplib.h"
 #include "tgalib.h"
 #endif
@@ -39,8 +39,6 @@ extern "C"{
 
 #include "boinc_gl.h"
 
-//#include <GLUT/glut.h>
-
 #include "gutil.h"
 #include "filesys.h"
 #include "util.h"