diff --git a/Makefile b/Makefile
index 40d42c135..8c5b1ddb6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 TOPDIR = .
-include $(TOPDIR)/Make/makedefs
 include $(TOPDIR)/Make/makedirdefs
+include $(TOPDIR)/Make/makedefs
 
 DIRS = $(TOP_LEVEL_DIRS)
 
diff --git a/include/osg/Version b/include/osg/Version
index 6f4b347c9..5121d1a34 100644
--- a/include/osg/Version
+++ b/include/osg/Version
@@ -10,8 +10,8 @@
 extern "C" {
 
 /**
- * getVersion_osg() returns the library version number.
- * Numbering convention : osg_src-0.8-31 will return 0.8.31 from getVersion_osg.
+ * osgGetVersion() returns the library version number.
+ * Numbering convention : OpenSceneGraph-0.8-31 will return 0.8.31 from osgGetVersion.
  *
  * This C function can be also used to check for the existence of the OpenSceneGraph
  * library using autoconf and its m4 macro AC_CHECK_LIB.
@@ -28,7 +28,7 @@ extern "C" {
 extern SG_EXPORT const char* osgGetVersion();
 
 /**
- * getLibraryName_osg() returns the library name in human friendly form.
+ * osgGetLibraryName() returns the library name in human friendly form.
 */
 extern SG_EXPORT const char* osgGetLibraryName();
 
diff --git a/src/Demos/Makefile b/src/Demos/Makefile
index 828bc326c..3d9aef914 100644
--- a/src/Demos/Makefile
+++ b/src/Demos/Makefile
@@ -1,6 +1,6 @@
 TOPDIR = ../..
-include $(TOPDIR)/Make/makedefs
 include $(TOPDIR)/Make/makedirdefs
+include $(TOPDIR)/Make/makedefs
 
 DIRS = $(DEMOS_DIRS)
 
diff --git a/src/Makefile b/src/Makefile
index 8d65fea1e..139d1a359 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
 TOPDIR = ..
-include $(TOPDIR)/Make/makedefs
 include $(TOPDIR)/Make/makedirdefs
+include $(TOPDIR)/Make/makedefs
 
 DIRS = $(SRC_DIRS)
 
diff --git a/src/osgDB/FileUtils_Unix.cpp b/src/osgDB/FileUtils_Unix.cpp
index 4e8c39df9..406cb22a2 100644
--- a/src/osgDB/FileUtils_Unix.cpp
+++ b/src/osgDB/FileUtils_Unix.cpp
@@ -219,14 +219,23 @@ char *osgDB::findDSO( const char *name )
     }
     #endif
     
-#else
+#elif defined(__CYGWIN__)
+
+    if ((ptr = getenv( "PATH" )))
+    {
+        notify(DEBUG_INFO) << "PATH = "<<ptr<<std::endl;
+        strcat( path, PathDelimitor );
+        strcat( path, ptr );
+    }
+
+#else   
 
     if( (ptr = getenv( "LD_LIBRARY_PATH" )))
     {
         strcat( path, PathDelimitor );
         strcat( path, ptr );
     }
-    
+
 #endif
 
     // check existance of dso assembled direct paths.
diff --git a/src/osgPlugins/Makefile b/src/osgPlugins/Makefile
index 586c2d21a..84773a21d 100644
--- a/src/osgPlugins/Makefile
+++ b/src/osgPlugins/Makefile
@@ -1,6 +1,6 @@
 TOPDIR = ../..
-include $(TOPDIR)/Make/makedefs
 include $(TOPDIR)/Make/makedirdefs
+include $(TOPDIR)/Make/makedefs
 
 DIRS = $(PLUGIN_DIRS)