diff --git a/include/osgViewer/GraphicsWindowX11 b/include/osgViewer/GraphicsWindowX11
index 66c4adc25..d2602ef74 100644
--- a/include/osgViewer/GraphicsWindowX11
+++ b/include/osgViewer/GraphicsWindowX11
@@ -19,18 +19,11 @@
 #ifndef OSGVIEWER_GRAPHICSWINDOWX11
 #define OSGVIEWER_GRAPHICSWINDOWX11 1
 
-#include <osgViewer/Viewer>
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#include <X11/Xmd.h>
-#include <X11/keysym.h>
-#include <X11/Xmu/WinUtil.h>
-#include <X11/cursorfont.h>
+#include <osgViewer/GraphicsWindow>
 
 #define GLX_GLXEXT_PROTOTYPES  1
+
+#include <X11/X.h>
 #include <GL/glx.h>
 
 namespace osgViewer
diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp
index c65abeda0..c0125b4eb 100644
--- a/src/osgViewer/GraphicsWindowX11.cpp
+++ b/src/osgViewer/GraphicsWindowX11.cpp
@@ -18,6 +18,15 @@
 
 #include <osgViewer/GraphicsWindowX11>
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#include <X11/Xmd.h>
+#include <X11/keysym.h>
+#include <X11/Xmu/WinUtil.h>
+#include <X11/cursorfont.h>
+
+
 using namespace osgViewer;
 
 class GraphicsContextX11 : public osg::GraphicsContext