diff --git a/include/osg/EnvVar b/include/osg/os_utils
similarity index 98%
rename from include/osg/EnvVar
rename to include/osg/os_utils
index 6ef49266a..95ad47c3e 100644
--- a/include/osg/EnvVar
+++ b/include/osg/os_utils
@@ -11,8 +11,8 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#ifndef OSG_EnvVar
-#define OSG_EnvVar 1
+#ifndef OSG_osg_utils
+#define OSG_osg_utils 1
 
 #include <osg/Config>
 
diff --git a/src/osg/ApplicationUsage.cpp b/src/osg/ApplicationUsage.cpp
index 26e4510ec..325662cfe 100644
--- a/src/osg/ApplicationUsage.cpp
+++ b/src/osg/ApplicationUsage.cpp
@@ -17,7 +17,7 @@
 #include <osg/ApplicationUsage>
 #include <osg/Object>
 #include <osg/Math>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 #include <osg/ref_ptr>
 
 #include <sstream>
diff --git a/src/osg/CullSettings.cpp b/src/osg/CullSettings.cpp
index 78122bbb5..800ada83c 100644
--- a/src/osg/CullSettings.cpp
+++ b/src/osg/CullSettings.cpp
@@ -16,7 +16,7 @@
 #include <osg/CullSettings>
 #include <osg/ArgumentParser>
 #include <osg/ApplicationUsage>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 
 #include <osg/Notify>
 
diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp
index 52d0efd80..ae1d5b55f 100644
--- a/src/osg/DisplaySettings.cpp
+++ b/src/osg/DisplaySettings.cpp
@@ -16,7 +16,7 @@
 #include <osg/Math>
 #include <osg/Notify>
 #include <osg/GL>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 #include <osg/ref_ptr>
 
 #include <algorithm>
diff --git a/src/osg/GLExtensions.cpp b/src/osg/GLExtensions.cpp
index 0e5d99274..e23fb44f6 100644
--- a/src/osg/GLExtensions.cpp
+++ b/src/osg/GLExtensions.cpp
@@ -15,7 +15,7 @@
 #include <osg/Notify>
 #include <osg/Math>
 #include <osg/buffered_value>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 #include <osg/ApplicationUsage>
 
 #include <stdlib.h>
diff --git a/src/osg/GraphicsContext.cpp b/src/osg/GraphicsContext.cpp
index d02b30ce5..e73ec3e6a 100644
--- a/src/osg/GraphicsContext.cpp
+++ b/src/osg/GraphicsContext.cpp
@@ -18,7 +18,7 @@
 #include <osg/View>
 #include <osg/GLObjects>
 #include <osg/ContextData>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 
 #include <osg/FrameBufferObject>
 #include <osg/Program>
diff --git a/src/osg/Notify.cpp b/src/osg/Notify.cpp
index 6ca85b37e..7f2e69c61 100644
--- a/src/osg/Notify.cpp
+++ b/src/osg/Notify.cpp
@@ -12,7 +12,7 @@
 */
 #include <osg/Notify>
 #include <osg/ApplicationUsage>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 #include <osg/ref_ptr>
 #include <string>
 #include <stdlib.h>
diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index 794166482..b4f74b2da 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -18,7 +18,7 @@
 #include <osg/Drawable>
 #include <osg/ApplicationUsage>
 #include <osg/ContextData>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 
 #include <sstream>
 #include <algorithm>
diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp
index c96189518..8fdccf53e 100644
--- a/src/osgViewer/GraphicsWindowWin32.cpp
+++ b/src/osgViewer/GraphicsWindowWin32.cpp
@@ -23,7 +23,7 @@
 #include <osg/GL>
 #include <osg/DeleteHandler>
 #include <osg/ApplicationUsage>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 
 #include <vector>
 #include <map>
diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp
index 0eb63c586..d3f66cf2f 100644
--- a/src/osgViewer/Viewer.cpp
+++ b/src/osgViewer/Viewer.cpp
@@ -16,6 +16,7 @@
 
 #include <osg/DeleteHandler>
 #include <osg/io_utils>
+#include <osg/os_utils>
 #include <osg/TextureRectangle>
 #include <osg/TextureCubeMap>
 
@@ -35,7 +36,6 @@
 #include <osgViewer/config/WoWVxDisplay>
 #include <osgViewer/config/SingleWindow>
 
-#include <osg/EnvVar>
 
 #include <sstream>
 #include <string.h>
diff --git a/src/osgViewer/ViewerBase.cpp b/src/osgViewer/ViewerBase.cpp
index c03f1f0b8..4b72f5c20 100644
--- a/src/osgViewer/ViewerBase.cpp
+++ b/src/osgViewer/ViewerBase.cpp
@@ -18,7 +18,7 @@
 #include <osgViewer/View>
 #include <osgViewer/Renderer>
 
-#include <osg/EnvVar>
+#include <osg/os_utils>
 #include <osg/io_utils>
 
 #include <osg/TextureCubeMap>
diff --git a/src/osgViewer/ViewerEventHandlers.cpp b/src/osgViewer/ViewerEventHandlers.cpp
index 43d7d8b39..7bd3c695e 100644
--- a/src/osgViewer/ViewerEventHandlers.cpp
+++ b/src/osgViewer/ViewerEventHandlers.cpp
@@ -25,7 +25,7 @@
 #include <osg/TexMat>
 #include <osg/Texture2D>
 #include <osg/TextureRectangle>
-#include <osg/EnvVar>
+#include <osg/os_utils>
 #include <osg/io_utils>
 
 #include <osgViewer/Viewer>