diff --git a/VisualStudio/VisualStudio.dsw b/VisualStudio/VisualStudio.dsw
index 36ce0a53d..b5210525d 100644
--- a/VisualStudio/VisualStudio.dsw
+++ b/VisualStudio/VisualStudio.dsw
@@ -251,6 +251,39 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name osg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name osgDB
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "osgTextDemo"=.\Demos\osgTextDemo\osgTextDemo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name osg
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name osgDB
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name osgGLUT
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name osgText
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name osgUtil
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -363,18 +396,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "osgtexture"=.\Demos\osgTextDemo\osgTextDemo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "osgtgz"=.\osgPlugins\osgtgz\osgtgz.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/VisualStudio/osgText/osgText.dsp b/VisualStudio/osgText/osgText.dsp
index 57683e253..ec05845ca 100644
--- a/VisualStudio/osgText/osgText.dsp
+++ b/VisualStudio/osgText/osgText.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 freetype204MT.lib  /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgText.dll" /libpath:"../../lib"
+# ADD LINK32 freetype204MT.lib glu32.lib opengl32.lib /nologo /dll /pdb:none /machine:I386 /out:"../../bin/osgText.dll" /libpath:"../../lib"
 
 !ELSEIF  "$(CFG)" == "osgText - Win32 Debug"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 freetype204MT.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgTextd.dll" /pdbtype:sept /libpath:"../../lib"
+# ADD LINK32 freetype204MT.lib glu32.lib opengl32.lib /nologo /dll /debug /machine:I386 /out:"../../bin/osgTextd.dll" /pdbtype:sept /libpath:"../../lib"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
@@ -169,11 +169,11 @@ SOURCE=..\..\src\osgText\FTVectoriser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\osgText\Version.cpp
+SOURCE=..\..\src\osgText\Text.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\osgText\Text.cpp
+SOURCE=..\..\src\osgText\Version.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -185,14 +185,6 @@ SOURCE=..\..\include\osgText\Export
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\osgText\Text
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\osgText\Version
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\osgText\FTBitmapGlyph.h
 # End Source File
 # Begin Source File
@@ -271,6 +263,14 @@ SOURCE=..\..\src\osgText\FTVectorGlyph.h
 
 SOURCE=..\..\src\osgText\FTVectoriser.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\include\osgText\Text
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\osgText\Version
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
diff --git a/src/osgText/FTGL.h b/src/osgText/FTGL.h
index 5d554d8de..b3d64e19f 100644
--- a/src/osgText/FTGL.h
+++ b/src/osgText/FTGL.h
@@ -68,17 +68,18 @@
 
 #endif
 
-#if defined(_MSC_VER)
-	#  ifdef FTGL_LIBRARY_STATIC		// staticLib
-	#    define FTGL_EXPORT
-	#  elif FTGL_LIBRARY				// dynamicLib
-	#    define FTGL_EXPORT   __declspec(dllexport)
-	#  else
-	#    define FTGL_EXPORT   __declspec(dllimport)
-	#  endif /* FTGL_LIBRARY */
-#else
+
+// #if defined(_MSC_VER)
+// 	#  ifdef FTGL_LIBRARY_STATIC		// staticLib
+// 	#    define FTGL_EXPORT
+// 	#  elif FTGL_LIBRARY				// dynamicLib
+// 	#    define FTGL_EXPORT   __declspec(dllexport)
+// 	#  else
+// 	#    define FTGL_EXPORT   __declspec(dllimport)
+// 	#  endif /* FTGL_LIBRARY */
+// #else
 	#  define FTGL_EXPORT
-#endif  
+// #endif  
 
 
 #endif	//	__FTGL__
diff --git a/src/osgText/FTVectorGlyph.cpp b/src/osgText/FTVectorGlyph.cpp
index 975be93fc..401cf6497 100644
--- a/src/osgText/FTVectorGlyph.cpp
+++ b/src/osgText/FTVectorGlyph.cpp
@@ -1,5 +1,3 @@
-#include	"GL/gl.h"
-
 #include	"FTVectorGlyph.h"
 #include	"FTVectoriser.h"
 #include	"FTGL.h"
@@ -26,7 +24,8 @@ FTVectorGlyph::FTVectorGlyph( FT_Glyph glyph)
 	numContours = vectoriser->contours();
 	contourLength = new int[ numContours];
 	
-	for( int c = 0; c < numContours; ++c)
+	int c;
+	for( c = 0; c < numContours; ++c)
 	{
 		contourLength[c] = vectoriser->contourSize( c);
 	}
@@ -46,7 +45,7 @@ FTVectorGlyph::FTVectorGlyph( FT_Glyph glyph)
 	int d = 0;
 
 	glNewList( glList, GL_COMPILE);
-		for( int c = 0; c < numContours; ++c)
+		for( c = 0; c < numContours; ++c)
 		{
 			glBegin( GL_LINE_LOOP);
 			for( int p = 0; p < ( contourLength[c]); ++p)