diff --git a/api/boinc_gl.h b/api/boinc_gl.h
index 9f342f5980..d8712a38dc 100644
--- a/api/boinc_gl.h
+++ b/api/boinc_gl.h
@@ -29,16 +29,9 @@
 #else
 #  include <GL/glext.h>
 #endif
-#if defined(HAVE_GL_GLUT_H)
-#  include <GL/glut.h>
-#else 
-#  include<glut.h>
-#endif
 
 #elif defined(__APPLE_CC__)
 
-#  include "GLUT/glut.h"
-
 #else // !_WIN32, !__APPLE_CC__
 #include "config.h"
 
@@ -64,16 +57,6 @@
 #    include <OpenGL/glu.h>
 #  endif
 
-#  if defined(HAVE_GLUT_H)
-#    include "glut.h"
-#  elif defined(HAVE_GL_GLUT_H)
-#    include <GL/glut.h>
-#  elif defined(HAVE_OPENGL_GLUT_H)
-#    include <OpenGL/glut.h>
-#  elif defined(HAVE_GLUT_GLUT_H)
-#    include <GLUT/glut.h>
-#  endif
-
 #endif // _WIN32
 
 #endif
diff --git a/api/boinc_glut.h b/api/boinc_glut.h
new file mode 100644
index 0000000000..7c8f5a2c81
--- /dev/null
+++ b/api/boinc_glut.h
@@ -0,0 +1,51 @@
+// Berkeley Open Infrastructure for Network Computing
+// http://boinc.berkeley.edu
+// Copyright (C) 2005 University of California
+//
+// This is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation;
+// either version 2.1 of the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// To view the GNU Lesser General Public License visit
+// http://www.gnu.org/copyleft/lesser.html
+// or write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+#ifndef H_BOINC_GLUT
+#define H_BOINC_GLUT
+
+
+#if defined(_WIN32)
+#if defined(HAVE_GL_GLUT_H)
+#  include <GL/glut.h>
+#else 
+#  include<glut.h>
+#endif
+
+#elif defined(__APPLE_CC__)
+
+#  include "GLUT/glut.h"
+
+#else // !_WIN32, !__APPLE_CC__
+
+#include "config.h"
+
+#  if defined(HAVE_GLUT_H)
+#    include "glut.h"
+#  elif defined(HAVE_GL_GLUT_H)
+#    include <GL/glut.h>
+#  elif defined(HAVE_OPENGL_GLUT_H)
+#    include <OpenGL/glut.h>
+#  elif defined(HAVE_GLUT_GLUT_H)
+#    include <GLUT/glut.h>
+#  endif
+
+#endif // _WIN32
+
+#endif
diff --git a/api/gutil_text.C b/api/gutil_text.C
index c8a97971e4..131fcce53a 100644
--- a/api/gutil_text.C
+++ b/api/gutil_text.C
@@ -52,6 +52,7 @@ extern "C"{
 #endif
 
 #include "boinc_gl.h"
+#include "boinc_glut.h"
 
 #include "filesys.h"
 #include "util.h"
diff --git a/api/x_opengl.C b/api/x_opengl.C
index 0ee1df9b99..659af1341b 100644
--- a/api/x_opengl.C
+++ b/api/x_opengl.C
@@ -31,6 +31,7 @@
 #include "filesys.h"
 
 #include "boinc_gl.h"
+#include "boinc_glut.h"
 #include "graphics_api.h"
 #include "graphics_impl.h"
 
diff --git a/checkin_notes b/checkin_notes
index f2c2a77dcd..87af31a02d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3493,3 +3493,13 @@ Charlie 30 Mar 2006
     mac_build/
         boinc.xcodeproj/
             project.pbxproj
+
+David  30 Mar 2006
+    - API: move GLUT-related includes to a separate file,
+        which is included only from files that need it.
+
+    api/
+        boinc_gl.h
+        boinc_glut.h (new)
+        gutil_text.C
+        x_opengl.C