diff --git a/XGL/xgl.h b/XGL/xgl.h
index 17edd57e..6cd81b6f 100644
--- a/XGL/xgl.h
+++ b/XGL/xgl.h
@@ -2,15 +2,20 @@
 #define _XGL_H
 
 
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <stdio.h>
+
+
 #ifdef __cplusplus                                                          
 extern "C" {                            
 #endif                                   
 
 
-#include <GL/gl.h>
-#include <GL/glu.h>
-#include <stdio.h>
-
 /* xgl Utilities */
 
 extern FILE *xglTraceFd ;
diff --git a/XGL/xglUtils.c b/XGL/xglUtils.c
index fe14d636..f9fc24fc 100644
--- a/XGL/xglUtils.c
+++ b/XGL/xglUtils.c
@@ -1,4 +1,8 @@
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>