diff --git a/include/osg/Plane b/include/osg/Plane
index 1dc69909f..c2f4f57b7 100644
--- a/include/osg/Plane
+++ b/include/osg/Plane
@@ -5,6 +5,7 @@
 #ifndef OSG_PLANE
 #define OSG_PLANE 1
 
+#include <osg/Export>
 #include <osg/Vec3>
 #include <osg/Vec4>
 #include <osg/Matrix>
diff --git a/include/osg/ShadowVolumeOccluder b/include/osg/ShadowVolumeOccluder
index f85c5fa39..6aa213090 100644
--- a/include/osg/ShadowVolumeOccluder
+++ b/include/osg/ShadowVolumeOccluder
@@ -5,7 +5,6 @@
 #ifndef OSG_SHADOWVOLUMEOCCLUDER
 #define OSG_SHADOWVOLUMEOCCLUDER 1
 
-#include <osg/ref_ptr>
 #include <osg/Polytope>
 #include <osg/ConvexPlanerOccluder>
 #include <osg/Node>
diff --git a/src/osg/ColorMatrix.cpp b/src/osg/ColorMatrix.cpp
index aa45962a6..ab79f8920 100644
--- a/src/osg/ColorMatrix.cpp
+++ b/src/osg/ColorMatrix.cpp
@@ -1,6 +1,6 @@
+#include <osg/ColorMatrix>
 #include <osg/GL>
 #include <osg/GLExtensions>
-#include <osg/ColorMatrix>
 
 using namespace osg;
 
diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp
index c4326b386..3bedad148 100644
--- a/src/osgDB/FileUtils.cpp
+++ b/src/osgDB/FileUtils.cpp
@@ -1,15 +1,9 @@
 #ifdef TARGET_API_MAC_CARBON
-    #include "FileUtils_Mac.cpp"
+    #include <osgDB/FileUtils_Mac.cpp>
 #else
 
 // implementations for Windows and all Unix's except Mac when TARGET_API_MAC_CARBON defined.    
 
-#include <osg/Notify>
-
-#include <osgDB/FileUtils>
-#include <osgDB/FileNameUtils>
-#include <osgDB/Registry>
-
 #if defined(WIN32) && !defined(__CYGWIN__)
     #include <Io.h>
     #include <Windows.h>
@@ -22,6 +16,13 @@
     #include <dlfcn.h>
 #endif
 
+#include <osg/Notify>
+
+#include <osgDB/FileUtils>
+#include <osgDB/FileNameUtils>
+#include <osgDB/Registry>
+
+
 bool osgDB::fileExists(const std::string& filename)
 {
     return access( filename.c_str(), F_OK ) == 0;
diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp
index 59bf4bfd9..ec484584a 100644
--- a/src/osgDB/Registry.cpp
+++ b/src/osgDB/Registry.cpp
@@ -18,7 +18,7 @@
 using namespace osg;
 using namespace osgDB;
 
-void PrintFilePathList(ostream& stream,const FilePathList& filepath)
+void PrintFilePathList(std::ostream& stream,const FilePathList& filepath)
 {
     for(FilePathList::const_iterator itr=filepath.begin();
         itr!=filepath.end();
diff --git a/src/osgPlugins/flt/Input.cpp b/src/osgPlugins/flt/Input.cpp
index 56ea9f975..754f9bccb 100644
--- a/src/osgPlugins/flt/Input.cpp
+++ b/src/osgPlugins/flt/Input.cpp
@@ -1,8 +1,3 @@
-// Input.cpp
-
-#include <string>
-// #include <malloc.h>
-
 #include <osg/Notify>
 #include <osgDB/FileUtils>