diff --git a/include/osg/State b/include/osg/State
index 43fd80cf6..0b9cd9a8e 100644
--- a/include/osg/State
+++ b/include/osg/State
@@ -13,8 +13,6 @@
 #include <osg/DisplaySettings>
 #include <osg/Polytope>
 
-#include <osg/GLExtensions>
-
 #include <vector>
 #include <map>
 
diff --git a/src/Demos/osgprerender/osgprerender.cpp b/src/Demos/osgprerender/osgprerender.cpp
index 23951d6ea..6d1867c92 100644
--- a/src/Demos/osgprerender/osgprerender.cpp
+++ b/src/Demos/osgprerender/osgprerender.cpp
@@ -8,6 +8,7 @@
 #include <osg/Depth>
 #include <osg/Billboard>
 #include <osg/Material>
+#include <osg/GLExtensions>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FlightManipulator>
diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp
index 3f1762001..421ef30f4 100644
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -1,5 +1,6 @@
 #include <osg/Geometry>
 #include <osg/Notify>
+#include <osg/GLExtensions>
 
 using namespace osg;
 
diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index ea3f4f0b7..255ec81ca 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -1,6 +1,6 @@
 #include <osg/State>
 #include <osg/Notify>
-
+#include <osg/GLExtensions>
 #include <osg/GLU>
 
 #include <algorithm>