diff --git a/include/osgViewer/api/Win32/GraphicsHandleWin32 b/include/osgViewer/api/Win32/GraphicsHandleWin32
index 7039133b1..daccca6d1 100644
--- a/include/osgViewer/api/Win32/GraphicsHandleWin32
+++ b/include/osgViewer/api/Win32/GraphicsHandleWin32
@@ -14,7 +14,7 @@
 #ifndef OSGVIEWER_GRAPHICSHANDLEWIN32
 #define OSGVIEWER_GRAPHICSHANDLEWIN32 1
 
-#include "Win32GWUtils"
+#include <osgViewer/api/Win32/Win32GWUtils>
 #include <osgViewer/Export>
 
 namespace osgViewer
diff --git a/src/osgViewer/Win32GWUtils b/include/osgViewer/api/Win32/Win32GWUtils
similarity index 100%
rename from src/osgViewer/Win32GWUtils
rename to include/osgViewer/api/Win32/Win32GWUtils
diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt
index c72f801d2..415789fea 100644
--- a/src/osgViewer/CMakeLists.txt
+++ b/src/osgViewer/CMakeLists.txt
@@ -79,20 +79,19 @@ IF(WIN32 AND NOT ANDROID)
         ${HEADER_PATH}/api/Win32/GraphicsHandleWin32
         ${HEADER_PATH}/api/Win32/GraphicsWindowWin32
         ${HEADER_PATH}/api/Win32/PixelBufferWin32
+        ${HEADER_PATH}/api/Win32/Win32GWUtils
     )
     IF(OSG_USE_EGL)
         SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
             GraphicsWindowWin32.cpp
             PixelBufferWin32EGL.cpp
 			Win32GWUtils.cpp
-			Win32GWUtils
         )
     ELSE()
         SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
             GraphicsWindowWin32.cpp
             PixelBufferWin32.cpp
 			Win32GWUtils.cpp
-			Win32GWUtils
         )
     ENDIF()
 ELSE()
diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp
index 89885c3b7..7e32bf335 100644
--- a/src/osgViewer/GraphicsWindowWin32.cpp
+++ b/src/osgViewer/GraphicsWindowWin32.cpp
@@ -28,8 +28,8 @@
 #include <vector>
 #include <map>
 
-#include "Win32GWUtils"
-#include "windowsx.h"
+#include <osgViewer/api/Win32/Win32GWUtils>
+#include <windowsx.h>
 
 #define MOUSEEVENTF_FROMTOUCH           0xFF515700
 
diff --git a/src/osgViewer/PixelBufferWin32.cpp b/src/osgViewer/PixelBufferWin32.cpp
index a31257c5b..06eeba2f9 100644
--- a/src/osgViewer/PixelBufferWin32.cpp
+++ b/src/osgViewer/PixelBufferWin32.cpp
@@ -15,7 +15,7 @@
  */
 
 #if !defined(OSG_USE_EGL)
-#include "Win32GWUtils"
+#include <osgViewer/api/Win32/Win32GWUtils>
 #include <osgViewer/api/Win32/PixelBufferWin32>
 #include <osgViewer/api/Win32/GraphicsWindowWin32>
 #include <osg/TextureRectangle>
diff --git a/src/osgViewer/Win32GWUtils.cpp b/src/osgViewer/Win32GWUtils.cpp
index 8521d075c..6fded692b 100644
--- a/src/osgViewer/Win32GWUtils.cpp
+++ b/src/osgViewer/Win32GWUtils.cpp
@@ -1,6 +1,6 @@
 #include <osg/GLExtensions>
 
-#include "Win32GWUtils"
+#include <osgViewer/api/Win32/Win32GWUtils>
 #include <vector>
 #include <sstream>