diff --git a/Make/makedefs b/Make/makedefs
index 54c8628a7..79a6963b9 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -353,8 +353,8 @@ ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
     LDFLAGS         += -Wl,-soname -Wl,$@.0
 endif
 
-    LDFLAGS         += `getconf LFS_LDFLAGS`
-    DEF             += `getconf LFS_CFLAGS`
+#    LDFLAGS         += `getconf LFS_LDFLAGS`
+#    DEF             += `getconf LFS_CFLAGS`
 
     LIBS            = -lstdc++
     DEF             += -W -Wall -fPIC -pipe
diff --git a/Make/makedirdefs b/Make/makedirdefs
index 78c1d00ce..6cb0c2582 100644
--- a/Make/makedirdefs
+++ b/Make/makedirdefs
@@ -24,16 +24,16 @@ SRC_DIRS = \
 	osgFX\
 	osgProducer\
 
+ifeq ($(GDAL_INSTALLED),yes)
+SRC_DIRS += osgTerrain
+endif
+
 ifeq ($(COMPILE_INTROSPECTION),yes)
 SRC_DIRS += \
         osgIntrospection\
 	osgWrappers
 endif
 
-ifeq ($(GDAL_INSTALLED),yes)
-SRC_DIRS += osgTerrain
-endif
-
 SRC_DIRS += \
 	osgPlugins\
         
diff --git a/include/osg/BufferObject b/include/osg/BufferObject
index 4dddfdb4a..79ba92f00 100644
--- a/include/osg/BufferObject
+++ b/include/osg/BufferObject
@@ -14,7 +14,8 @@
 #ifndef OSG_BUFFEROBJECT
 #define OSG_BUFFEROBJECT 1
 
-#include <osg/State>
+#include <osg/GL>
+#include <osg/Object>
 #include <osg/buffered_value>
 
 #ifndef GL_ARB_vertex_buffer_object
@@ -77,6 +78,8 @@
 namespace osg 
 {
 
+class State;
+
 class SG_EXPORT BufferObject : public Object
 {
     public:
diff --git a/include/osg/Drawable b/include/osg/Drawable
index f8ba52ca6..e4e2cde70 100644
--- a/include/osg/Drawable
+++ b/include/osg/Drawable
@@ -15,10 +15,10 @@
 #define OSG_DRAWABLE 1
 
 #include <osg/BoundingBox>
-#include <osg/NodeVisitor>
 #include <osg/Shape>
 #include <osg/BufferObject>
 #include <osg/PrimitiveSet>
+#include <osg/State>
 
 
 #ifndef GL_NV_occlusion_query
@@ -51,6 +51,7 @@ class Vec3f;
 class Vec4f;
 class UByte4;
 class Geometry;
+class NodeVisitor;
 
 // this is defined to alter the way display lists are compiled inside the
 // the draw method, it has been found that the NVidia drivers fail completely
diff --git a/include/osg/StateAttribute b/include/osg/StateAttribute
index f0c197399..99d0d0b52 100644
--- a/include/osg/StateAttribute
+++ b/include/osg/StateAttribute
@@ -192,24 +192,6 @@ class SG_EXPORT StateAttribute : public Object
         /** Simple pairing between an attribute type and the member within that attribute type group.*/
         typedef std::pair<Type,unsigned int> TypeMemberPair;
 
-/*        
-        struct TypeMember
-        {
-            inline TypeMember(Type type, unsigned int member=0):
-                _type(type),
-                _member(member) {}
-                
-            inline bool operator < (const TypeMember& tm) const
-            {
-                return (_type<tm._type) ? true : ( (tm._type<_type) ? false : (_member<tm._member) );
-            }
-        
-            Type            _type;
-            unsigned int    _member;
-        };
-*/        
-
-
         StateAttribute() { setDataVariance(STATIC); }
         
         StateAttribute(const StateAttribute& sa,const CopyOp& copyop=CopyOp::SHALLOW_COPY): 
diff --git a/src/osg/BufferObject.cpp b/src/osg/BufferObject.cpp
index a97daae40..3f5400490 100644
--- a/src/osg/BufferObject.cpp
+++ b/src/osg/BufferObject.cpp
@@ -19,6 +19,7 @@
 #include <osg/GLExtensions>
 #include <osg/Timer>
 #include <osg/Image>
+#include <osg/State>
 
 #include <OpenThreads/ScopedLock>
 #include <OpenThreads/Mutex>
diff --git a/src/osg/PrimitiveSet.cpp b/src/osg/PrimitiveSet.cpp
index 4e77df078..a8916eaff 100644
--- a/src/osg/PrimitiveSet.cpp
+++ b/src/osg/PrimitiveSet.cpp
@@ -12,6 +12,7 @@
 */
 #include <osg/PrimitiveSet>
 #include <osg/BufferObject>
+#include <osg/State>
 
 using namespace osg;