diff --git a/include/osgGA/GUIEventAdapter b/include/osgGA/GUIEventAdapter
index 604f01b8e..f3caf6cce 100644
--- a/include/osgGA/GUIEventAdapter
+++ b/include/osgGA/GUIEventAdapter
@@ -43,20 +43,20 @@ public:
         };
 
 	enum ModKeyMask {
-	    MOD_LEFT_SHIFT  = 0x0001,
-	    MOD_RIGHT_SHIFT = 0x0002,
-	    MOD_LEFT_CTRL   = 0x0040,
-	    MOD_RIGHT_CTRL  = 0x0080,
-	    MOD_LEFT_ALT    = 0x0100,
-	    MOD_RIGHT_ALT   = 0x0200,
-	    MOD_LEFT_META   = 0x0400,
-	    MOD_RIGHT_META  = 0x0800,
-	    MOD_NUM_LOCK    = 0x1000,
-	    MOD_CAPS_LOCK   = 0x2000,
-            MOD_CTRL        = (MOD_LEFT_CTRL|MOD_RIGHT_CTRL),
-            MOD_SHIFT       = (MOD_LEFT_SHIFT|MOD_RIGHT_SHIFT),
-            MOD_ALT         = (MOD_LEFT_ALT|MOD_RIGHT_ALT),
-            MOD_META        = (MOD_LEFT_META|MOD_RIGHT_META)
+	    MODKEY_LEFT_SHIFT  = 0x0001,
+	    MODKEY_RIGHT_SHIFT = 0x0002,
+	    MODKEY_LEFT_CTRL   = 0x0040,
+	    MODKEY_RIGHT_CTRL  = 0x0080,
+	    MODKEY_LEFT_ALT    = 0x0100,
+	    MODKEY_RIGHT_ALT   = 0x0200,
+	    MODKEY_LEFT_META   = 0x0400,
+	    MODKEY_RIGHT_META  = 0x0800,
+	    MODKEY_NUM_LOCK    = 0x1000,
+	    MODKEY_CAPS_LOCK   = 0x2000,
+            MODKEY_CTRL        = (MODKEY_LEFT_CTRL|MODKEY_RIGHT_CTRL),
+            MODKEY_SHIFT       = (MODKEY_LEFT_SHIFT|MODKEY_RIGHT_SHIFT),
+            MODKEY_ALT         = (MODKEY_LEFT_ALT|MODKEY_RIGHT_ALT),
+            MODKEY_META        = (MODKEY_LEFT_META|MODKEY_RIGHT_META)
 	};
 
 
diff --git a/src/osgGLUT/GLUTEventAdapter.cpp b/src/osgGLUT/GLUTEventAdapter.cpp
index 843be0674..f17a96da5 100644
--- a/src/osgGLUT/GLUTEventAdapter.cpp
+++ b/src/osgGLUT/GLUTEventAdapter.cpp
@@ -47,13 +47,13 @@ GLUTEventAdapter::getModKeyMask() const
     int modifiers = glutGetModifiers();
     unsigned int modmask = 0;
     if ( modifiers & GLUT_ACTIVE_SHIFT ) {
-        modmask |= MOD_LEFT_SHIFT | MOD_RIGHT_SHIFT;
+        modmask |= MODKEY_LEFT_SHIFT | MODKEY_RIGHT_SHIFT;
     }
     if ( modifiers & GLUT_ACTIVE_ALT ) {
-        modmask |= MOD_LEFT_ALT | MOD_RIGHT_ALT;
+        modmask |= MODKEY_LEFT_ALT | MODKEY_RIGHT_ALT;
     }
     if ( modifiers & GLUT_ACTIVE_CTRL ) {
-        modmask |= MOD_LEFT_CTRL | MOD_RIGHT_CTRL;
+        modmask |= MODKEY_LEFT_CTRL | MODKEY_RIGHT_CTRL;
     }
     return modmask;
 }
diff --git a/src/osgPlugins/directx/ReaderWriterDirectX.cpp b/src/osgPlugins/directx/ReaderWriterDirectX.cpp
index 9f1ed1678..d526c7a24 100644
--- a/src/osgPlugins/directx/ReaderWriterDirectX.cpp
+++ b/src/osgPlugins/directx/ReaderWriterDirectX.cpp
@@ -23,8 +23,6 @@
 
 #include "directx.h"
 
-#include <string>
-
 #include <osg/TexEnv>
 #include <osg/CullFace>
 
@@ -39,6 +37,7 @@
 #include <osgDB/ReadFile>
 #include <osgDB/FileNameUtils>
 
+#include <assert.h>
 
 /**
  * OpenSceneGraph plugin wrapper/converter.
@@ -145,7 +144,7 @@ osg::Geode* ReaderWriterDirectX::convertFromDX(DX::Object& obj,
      *
      * - Polys are CW oriented
      */
-    vector<osg::Geometry*> geomList;
+    std::vector<osg::Geometry*> geomList;
 
     unsigned int i;
     for (i = 0; i < meshMaterial->material.size(); i++) {