diff --git a/core/org.eclipse.cdt.core.win32/library/spawner.dep b/core/org.eclipse.cdt.core.win32/library/spawner.dep
index 52d55921b4a..c6ec05e32ac 100644
--- a/core/org.eclipse.cdt.core.win32/library/spawner.dep
+++ b/core/org.eclipse.cdt.core.win32/library/spawner.dep
@@ -1,19 +1,18 @@
 # Microsoft Developer Studio Generated Dependency File, included by spawner.mak
 
 .\iostream.c : \
-	"..\..\java\jdk1.3.1\include\jni.h"\
-	"..\..\java\jdk1.3.1\include\win32\jni_md.h"\
+	"$(JAVA_HOME)\include\jni.h"\
+	"$(JAVA_HOME)\include\win32\jni_md.h"\
 	".\SpawnerInputStream.h"\
 	".\SpawnerOutputStream.h"\
 	
 
 .\StdAfx.c : \
-	"..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\StdAfx.h"\
 	
 
 .\Win32ProcessEx.c : \
-	"..\..\java\jdk1.3.1\include\jni.h"\
-	"..\..\java\jdk1.3.1\include\win32\jni_md.h"\
+	"$(JAVA_HOME)\include\jni.h"\
+	"$(JAVA_HOME)\include\win32\jni_md.h"\
 	".\Spawner.h"\
 	
diff --git a/core/org.eclipse.cdt.core.win32/library/spawner.mak b/core/org.eclipse.cdt.core.win32/library/spawner.mak
index 1006bb01d11..26a7063ac52 100644
--- a/core/org.eclipse.cdt.core.win32/library/spawner.mak
+++ b/core/org.eclipse.cdt.core.win32/library/spawner.mak
@@ -34,6 +34,7 @@ RSC=rc.exe
 OUTDIR=..\os\win32\x86
 INTDIR=.\
 # Begin Custom Macros
+
 OutDir=..\os\win32\x86
 # End Custom Macros
 
@@ -56,9 +57,6 @@ CLEAN :
 
 CPP_PROJ=/nologo /Gz /MT /W3 /GX /O2 /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\Win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SPAWNER_EXPORTS" /Fp"$(INTDIR)\spawner.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\spawner.bsc" 
-BSC32_SBRS= \
 	
 LINK32=link.exe
 LINK32_FLAGS=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 /incremental:no /pdb:"$(OUTDIR)\spawner.pdb" /machine:I386 /out:"$(OUTDIR)\spawner.dll" /implib:"$(OUTDIR)\spawner.lib" 
@@ -81,7 +79,7 @@ INTDIR=.\
 OutDir=..\os\win32\x86
 # End Custom Macros
 
-ALL : "$(OUTDIR)\spawner.dll" "$(OUTDIR)\spawner.bsc"
+ALL : "$(OUTDIR)\spawner.dll" 
 
 
 CLEAN :
@@ -96,7 +94,6 @@ CLEAN :
 	-@erase "$(INTDIR)\vc60.pdb"
 	-@erase "$(INTDIR)\Win32ProcessEx.obj"
 	-@erase "$(INTDIR)\Win32ProcessEx.sbr"
-	-@erase "$(OUTDIR)\spawner.bsc"
 	-@erase "$(OUTDIR)\spawner.dll"
 	-@erase "$(OUTDIR)\spawner.exp"
 	-@erase "$(OUTDIR)\spawner.ilk"
@@ -109,18 +106,6 @@ CLEAN :
 
 CPP_PROJ=/nologo /Gz /MD /W3 /Gm /GX /ZI /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\Win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SPAWNER_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\spawner.pch" /Yu"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\spawner.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\iostream.sbr" \
-	"$(INTDIR)\spawner.sbr" \
-	"$(INTDIR)\StdAfx.sbr" \
-	"$(INTDIR)\Win32ProcessEx.sbr"
-
-"$(OUTDIR)\spawner.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
 
 LINK32=link.exe
 LINK32_FLAGS=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 /incremental:yes /pdb:"$(OUTDIR)\spawner.pdb" /map:"$(INTDIR)\spawner.map" /debug /machine:I386 /out:"$(OUTDIR)\spawner.dll" /implib:"$(OUTDIR)\spawner.lib" /pdbtype:sept 
diff --git a/core/org.eclipse.cdt.core.win32/library/starter/starter.mak b/core/org.eclipse.cdt.core.win32/library/starter/starter.mak
index da4557508fe..1dc8277dcab 100644
--- a/core/org.eclipse.cdt.core.win32/library/starter/starter.mak
+++ b/core/org.eclipse.cdt.core.win32/library/starter/starter.mak
@@ -33,32 +33,25 @@ RSC=rc.exe
 OUTDIR=..\..\os\win32\x86
 INTDIR=.\
 # Begin Custom Macros
+
 OutDir=..\..\os\win32\x86
 # End Custom Macros
 
-ALL : "$(OUTDIR)\starter.exe" "$(OUTDIR)\starter.bsc"
+ALL : "$(OUTDIR)\starter.exe" 
 
 
 CLEAN :
 	-@erase "$(INTDIR)\starter.obj"
 	-@erase "$(INTDIR)\starter.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\starter.bsc"
+	
 	-@erase "$(OUTDIR)\starter.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\starter.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\starter.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\starter.sbr"
 
-"$(OUTDIR)\starter.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
 
 LINK32=link.exe
 LINK32_FLAGS=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 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\starter.pdb" /machine:I386 /out:"$(OUTDIR)\starter.exe" 
@@ -75,6 +68,7 @@ LINK32_OBJS= \
 OUTDIR=..\..\os\win32\x86
 INTDIR=.\
 # Begin Custom Macros
+
 OutDir=..\..\os\win32\x86
 # End Custom Macros
 
@@ -93,9 +87,6 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP_PROJ=/nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\starter.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\starter.bsc" 
-BSC32_SBRS= \
 	
 LINK32=link.exe
 LINK32_FLAGS=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 /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\starter.pdb" /debug /machine:I386 /out:"$(OUTDIR)\starter.exe" /pdbtype:sept 
@@ -140,13 +131,7 @@ LINK32_OBJS= \
 <<
 
 
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("starter.dep")
-!INCLUDE "starter.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "starter.dep"
-!ENDIF 
-!ENDIF 
+
 
 
 !IF "$(CFG)" == "starter - Win32 Release" || "$(CFG)" == "starter - Win32 Debug"
diff --git a/core/org.eclipse.cdt.core.win32/os/win32/x86/spawner.dll b/core/org.eclipse.cdt.core.win32/os/win32/x86/spawner.dll
index e69de29bb2d..ed072379d01 100644
Binary files a/core/org.eclipse.cdt.core.win32/os/win32/x86/spawner.dll and b/core/org.eclipse.cdt.core.win32/os/win32/x86/spawner.dll differ
diff --git a/core/org.eclipse.cdt.core.win32/os/win32/x86/starter.exe b/core/org.eclipse.cdt.core.win32/os/win32/x86/starter.exe
index e69de29bb2d..69b6c0b37b8 100644
Binary files a/core/org.eclipse.cdt.core.win32/os/win32/x86/starter.exe and b/core/org.eclipse.cdt.core.win32/os/win32/x86/starter.exe differ