diff --git a/api/boinc_gl.h b/api/boinc_gl.h
index 52987bc7ba..9f342f5980 100644
--- a/api/boinc_gl.h
+++ b/api/boinc_gl.h
@@ -24,12 +24,16 @@
 #if defined(_WIN32)
 #  include <GL/gl.h>
 #  include <GL/glu.h>
-#ifndef __MINGW32__
+#if !defined(__MINGW32__) && !defined(__CYGWIN32__)
 #  include <GL/glaux.h>
 #else
 #  include <GL/glext.h>
 #endif
-#  include <glut.h>
+#if defined(HAVE_GL_GLUT_H)
+#  include <GL/glut.h>
+#else 
+#  include<glut.h>
+#endif
 
 #elif defined(__APPLE_CC__)
 
diff --git a/api/graphics_impl_lib.C b/api/graphics_impl_lib.C
index b5f047d51e..f48d58eb02 100644
--- a/api/graphics_impl_lib.C
+++ b/api/graphics_impl_lib.C
@@ -20,6 +20,10 @@
 // Code that is included in the shared-library part of a graphics app,
 // but NOT in libboinc_graphics_api.a (used by monolithic apps)
 
+#ifdef _WIN32
+#include "boinc_win.h"
+#endif
+
 #include "config.h"
 #include "app_ipc.h"
 #include "graphics_impl.h"
diff --git a/api/graphics_lib.C b/api/graphics_lib.C
index d02b7cb857..6748bafc8a 100644
--- a/api/graphics_lib.C
+++ b/api/graphics_lib.C
@@ -22,6 +22,10 @@
 // This lets you make applications that work whether or not
 // the host has X11 and OpenGL libraries.
 
+#ifdef _WIN32
+#include "boinc_win.h"
+#endif
+
 #include "config.h"
 #include <dlfcn.h>