diff --git a/SWIG/Runtime/swigpl.dsp b/SWIG/Runtime/swigpl.dsp
index b788442e8..4b8d6e79a 100644
--- a/SWIG/Runtime/swigpl.dsp
+++ b/SWIG/Runtime/swigpl.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PERL5_INCLUDE)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPL_EXPORTS" /D "SWIG_GLOBAL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PERL5_INCLUDE)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPL_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(PERL5_INCLUDE)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPL_EXPORTS" /D "SWIG_GLOBAL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(PERL5_INCLUDE)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPL_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -109,7 +109,7 @@ SOURCE=..\Lib\perl5\perlrun.swg
 
 !IF  "$(CFG)" == "swigpl - Win32 Debug"
 
-USERDEP__PERLR="..\Lib\common.swg"	
+USERDEP__PERLR="..\Lib\common.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\perl5\perlrun.swg
@@ -119,13 +119,13 @@ InputPath=..\Lib\perl5\perlrun.swg
 	echo PERL5_INCLUDE: %PERL5_INCLUDE% 
 	echo PERL5_LIB: %PERL5_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\perl5\perlrun.swg libpl.c 
+	..\swig -perl -runtime -o libpl.c swigrun.i 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "swigpl - Win32 Release"
 
-USERDEP__PERLR="..\Lib\common.swg"	
+USERDEP__PERLR="..\Lib\common.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\perl5\perlrun.swg
@@ -135,12 +135,16 @@ InputPath=..\Lib\perl5\perlrun.swg
 	echo PERL5_INCLUDE: %PERL5_INCLUDE% 
 	echo PERL5_LIB: %PERL5_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\perl5\perlrun.swg libpl.c 
+	..\swig -perl -runtime -o libpl.c swigrun.i 
 	
 # End Custom Build
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=..\Lib\swigrun.i
 # End Source File
 # End Target
 # End Project
diff --git a/SWIG/Runtime/swigpy.dsp b/SWIG/Runtime/swigpy.dsp
index dc2fdae5e..2785ca565 100644
--- a/SWIG/Runtime/swigpy.dsp
+++ b/SWIG/Runtime/swigpy.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPY_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PYTHON_INCLUDE)" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPY_EXPORTS" /D "SWIG_GLOBAL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(PYTHON_INCLUDE)" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPY_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPY_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(PYTHON_INCLUDE)" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPY_EXPORTS" /D "SWIG_GLOBAL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(PYTHON_INCLUDE)" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGPY_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -109,7 +109,7 @@ SOURCE=..\Lib\python\pyrun.swg
 
 !IF  "$(CFG)" == "swigpy - Win32 Debug"
 
-USERDEP__PYRUN="..\Lib\common.swg"	
+USERDEP__PYRUN="..\Lib\common.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\python\pyrun.swg
@@ -119,13 +119,13 @@ InputPath=..\Lib\python\pyrun.swg
 	echo PYTHON_INCLUDE: %PYTHON_INCLUDE% 
 	echo PYTHON_LIB: %PYTHON_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\python\pyrun.swg libpy.c 
+	..\swig -python -runtime -o libpy.c swigrun.i 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "swigpy - Win32 Release"
 
-USERDEP__PYRUN="..\Lib\common.swg"	
+USERDEP__PYRUN="..\Lib\common.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\python\pyrun.swg
@@ -135,12 +135,16 @@ InputPath=..\Lib\python\pyrun.swg
 	echo PYTHON_INCLUDE: %PYTHON_INCLUDE% 
 	echo PYTHON_LIB: %PYTHON_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\python\pyrun.swg libpy.c 
+	..\swig -python -runtime -o libpy.c swigrun.i 
 	
 # End Custom Build
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=..\Lib\swigrun.i
 # End Source File
 # End Target
 # End Project
diff --git a/SWIG/Runtime/swigrb.dsp b/SWIG/Runtime/swigrb.dsp
index 9238a850b..b565febf5 100644
--- a/SWIG/Runtime/swigrb.dsp
+++ b/SWIG/Runtime/swigrb.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGRB_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(RUBY_INCLUDE)" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGRB_EXPORTS" /D NT=1 /D "IMPORT" /D "SWIG_GLOBAL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(RUBY_INCLUDE)" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGRB_EXPORTS" /D NT=1 /D "IMPORT" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGRB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(RUBY_INCLUDE)" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGRB_EXPORTS" /D NT=1 /D "IMPORT" /D "SWIG_GLOBAL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(RUBY_INCLUDE)" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGRB_EXPORTS" /D NT=1 /D "IMPORT" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -111,7 +111,7 @@ SOURCE=..\Lib\ruby\rubydef.swg
 
 !IF  "$(CFG)" == "swigrb - Win32 Debug"
 
-USERDEP__RUBYD="..\Lib\common.swg"	"..\Lib\ruby\rubyhead.swg"	
+USERDEP__RUBYD="..\Lib\common.swg"	"..\Lib\ruby\rubyhead.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\ruby\rubydef.swg
@@ -121,13 +121,13 @@ InputPath=..\Lib\ruby\rubydef.swg
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\ruby\rubyhead.swg+..\Lib\ruby\rubydef.swg librb.c 
+	..\swig -ruby -runtime -o librb.c swigrun.i 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "swigrb - Win32 Release"
 
-USERDEP__RUBYD="..\Lib\common.swg"	"..\Lib\ruby\rubyhead.swg"	
+USERDEP__RUBYD="..\Lib\common.swg"	"..\Lib\ruby\rubyhead.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\ruby\rubydef.swg
@@ -137,7 +137,7 @@ InputPath=..\Lib\ruby\rubydef.swg
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\ruby\rubyhead.swg+..\Lib\ruby\rubydef.swg librb.c 
+	..\swig -ruby -runtime -o librb.c swigrun.i 
 	
 # End Custom Build
 
@@ -148,5 +148,9 @@ InputPath=..\Lib\ruby\rubydef.swg
 
 SOURCE=..\Lib\ruby\rubyhead.swg
 # End Source File
+# Begin Source File
+
+SOURCE=..\Lib\swigrun.i
+# End Source File
 # End Target
 # End Project
diff --git a/SWIG/Runtime/swigtcl8.dsp b/SWIG/Runtime/swigtcl8.dsp
index c7fa67474..5a32cd1bc 100644
--- a/SWIG/Runtime/swigtcl8.dsp
+++ b/SWIG/Runtime/swigtcl8.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGTCL8_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(TCL_INCLUDE)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGTCL8_EXPORTS" /D "SWIG_GLOBAL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "$(TCL_INCLUDE)" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGTCL8_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGTCL8_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(TCL_INCLUDE)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGTCL8_EXPORTS" /D "SWIG_GLOBAL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "$(TCL_INCLUDE)" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SWIGTCL8_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -105,11 +105,15 @@ SOURCE=..\Lib\common.swg
 # End Source File
 # Begin Source File
 
+SOURCE=..\Lib\swigrun.i
+# End Source File
+# Begin Source File
+
 SOURCE=..\Lib\tcl\swigtcl8.swg
 
 !IF  "$(CFG)" == "swigtcl8 - Win32 Debug"
 
-USERDEP__SWIGT="..\Lib\common.swg"	
+USERDEP__SWIGT="..\Lib\common.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\tcl\swigtcl8.swg
@@ -119,13 +123,13 @@ InputPath=..\Lib\tcl\swigtcl8.swg
 	echo TCL_INCLUDE: %TCL_INCLUDE% 
 	echo TCL_LIB: %TCL_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\tcl\swigtcl8.swg libtcl8.c 
+	..\swig -tcl -runtime -o libtcl8.c swigrun.i 
 	
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "swigtcl8 - Win32 Release"
 
-USERDEP__SWIGT="..\Lib\common.swg"	
+USERDEP__SWIGT="..\Lib\common.swg"	"..\Lib\swigrun.i"	
 # Begin Custom Build
 ProjDir=.
 InputPath=..\Lib\tcl\swigtcl8.swg
@@ -135,7 +139,7 @@ InputPath=..\Lib\tcl\swigtcl8.swg
 	echo TCL_INCLUDE: %TCL_INCLUDE% 
 	echo TCL_LIB: %TCL_LIB% 
 	echo on 
-	copy ..\Lib\common.swg+..\Lib\tcl\swigtcl8.swg libtcl8.c 
+	..\swig -tcl -runtime -o libtcl8.c swigrun.i 
 	
 # End Custom Build