diff --git a/Make/makedefs b/Make/makedefs
index 75240ca46..2d73529c8 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -295,11 +295,6 @@ ifeq ($(OS),Darwin)
   LIB_EXT            = dylib
   QUICKTIME	    = -framework QuickTime $(CARBON_LIB)
   TIFF_LIB	    = -ltiff
-  # src libs which require external libs: osgText
-  SRC_DIRS          = osg osgUtil osgDB osgParticle osgSim\
-                        osgGA   osgGLUT \
-                        osgPlugins \
-                        Demos
   LIBVERSION	    =  -dylib_current_version 0.9.1
 
   # Plugins which require external libs: gif jpeg png tiff osgText
@@ -308,13 +303,6 @@ ifeq ($(OS),Darwin)
                       osg osgParticle osgtgz pic \
                       quicktime rgb tga tgz \
                       txp zip
-  # Demos which require external libs: osghud osgtext
-  DEMOS_DIRS        = osgbillboard osgcallback osgclip \
-                      osgcluster osgconv osgcopy osgcube osggeometry \
-                      osghangglide osgimpostor osgmultitexture osgoccluder \
-                      osgparticle osglightpoint osgprerender osgshadowtexture osgreflect osgscribe osgstereoimage \
-                      osgtexture1D osgtexture2D osgtexture3D osgversion osgviews sgv \
-                      osgshape osganimate osgteapot
 endif
 
 #### Cygwin/Mingw specific definitions
@@ -338,22 +326,6 @@ ifeq ($(OS),CYGWIN)
   GL_LIBS           = -lglu32 -lopengl32
   GLUT_LIB          = -lglut32 $(GL_LIBS)
   X_LIBS            = -lgdi32 -luser32
-  OSGDB_LIBS        = -losgdb_3ds \
-  		      -losgdb_bmp \
-		      -losgdb_dw \
-		      -losgdb_flt \
-		      -losgdb_jpg \
-		      -losgdb_lwo \
-		      -losgdb_obj \
-		      -losgdb_osg \
-		      -losgdb_osgtgz \
-		      -losgdb_pic \
-		      -losgdb_png \
-		      -losgdb_rgb \
-		      -losgdb_tga \
-		      -losgdb_tgz \
-		      -losgdb_tiff \
-		      -losgdb_zip
   SOCKET_LIBS       = 
   OTHER_LIBS        = $(GL_LIBS)
   PNG_LIBS          = -lpng -lz
@@ -380,14 +352,6 @@ ifeq ($(OS),CYGWIN)
   INST_DOC          = $(INST_SHARE_PREFIX)/doc
   INST_DATA         = $(INST_SHARE_PREFIX)/data
 
-  # Demos which require external libs: osghud osgtext
-  DEMOS_DIRS        = osgbillboard osgcallback osgclip \
-                      osgconv osgcopy osgcube osggeometry \
-                      osghangglide osgimpostor osgmultitexture osgoccluder \
-                      osgparticle osgprerender osgreflect osgscribe osgstereoimage \
-                      osgtexture1D osgtexture2D osgtexture3D osgversion osgviews sgv \
-                      osgshape osganimate osgteapot
-#osgcluster 
 
 endif
 
@@ -413,22 +377,6 @@ ifeq ($(OS),MINGW)
   GL_LIBS           = -lglu32 -lopengl32
   GLUT_LIB          = -lglut32 $(GL_LIBS)
   X_LIBS            = -lgdi32 -luser32
-  OSGDB_LIBS        = -losgdb_3ds \
-  		      -losgdb_bmp \
-		      -losgdb_dw \
-		      -losgdb_flt \
-		      -losgdb_jpg \
-		      -losgdb_lwo \
-		      -losgdb_obj \
-		      -losgdb_osg \
-		      -losgdb_osgtgz \
-		      -losgdb_pic \
-		      -losgdb_png \
-		      -losgdb_rgb \
-		      -losgdb_tga \
-		      -losgdb_tgz \
-		      -losgdb_tiff \
-		      -losgdb_zip
   SOCKET_LIBS       = 
   OTHER_LIBS        = $(GL_LIBS)
   PNG_LIBS          = -lpng -lz
@@ -456,12 +404,6 @@ ifeq ($(OS),MINGW)
   INST_DOC          = $(INST_SHARE_PREFIX)/doc
   INST_DATA         = $(INST_SHARE_PREFIX)/data
 
-  PLUGIN_DIRS       = osg rgb lib3ds flt obj lwo bmp pic tga osgtgz tgz zip
-# txp
-  DEMOS_DIRS        = osghangglide osgbillboard osgconv osgcopy osgcube osgimpostor\
-                       osgreflect osgscribe osgstereoimage osgtexture1D osgtexture2D osgtexture3D\
-                       osgviews osgversion sgv osghud osgtext 
-# osgcluster
 endif
 
 #### HP-UX Specific definitions
diff --git a/Make/makedirdefs b/Make/makedirdefs
index 35d19f444..9b16c0875 100644
--- a/Make/makedirdefs
+++ b/Make/makedirdefs
@@ -30,7 +30,6 @@ PLUGIN_DIRS = \
 	directx\
 	dw\
 	flt\
-	freetype\
 	geo\
 	iv\
 	lib3ds\
@@ -56,22 +55,31 @@ PLUGIN_DIRS = \
 # since we havn't yet checked compilation on all platforms yet.
 PLUGIN_DIRS += dx
 
-# comment in if you have Quicktime installed, i.e under Mac OS.
-# if in this case then its likely you'll want to comment out the below
-# png, jpeg, gif and tiff plugins.
-# PLUGIN_DIRS += quicktime
+# comment in if have freetype2.x installed, provides type type font support to osgText.
+PLUGIN_DIRS += freetype
 
-# comment in if you have libpng installed.
-PLUGIN_DIRS += png
 
-# comment in if you have libjpeg installed.
-PLUGIN_DIRS += jpeg
+#### MacOS X specific definitions
+ifeq ($(OS),Darwin)
 
-# comment in if you have libungif installed.
-PLUGIN_DIRS += gif
+  PLUGIN_DIRS += quicktime
+  
+else  
+
+  # comment in if you have libtiff installed.
+  PLUGIN_DIRS += tiff
+
+  # comment in if you have libjpeg installed.
+  PLUGIN_DIRS += jpeg
+
+  # comment in if you have libpng installed.
+  PLUGIN_DIRS += png
+
+  # comment in if you have libungif installed.
+  PLUGIN_DIRS += gif
+
+endif
 
-# comment in if you have libtiff installed.
-PLUGIN_DIRS += tiff
 
 
 ################################################################
@@ -95,7 +103,6 @@ DEMOS_DIRS = \
 	osgbillboard\
 	osgcallback\
 	osgclip\
-	osgcluster\
 	osgconv\
 	osgcopy\
 	osgcube\
@@ -128,3 +135,6 @@ DEMOS_DIRS = \
 	osgvertexprogram\
 	osgviews\
 	sgv
+        
+# comment in you want to compile the cluster demo.
+# DEMOS_DIRS += osgcluster