diff --git a/SWIG/Runtime/Makefile.in b/SWIG/Runtime/Makefile.in
index 342a9926c..6b6031c62 100644
--- a/SWIG/Runtime/Makefile.in
+++ b/SWIG/Runtime/Makefile.in
@@ -32,6 +32,8 @@ install:
 clean::
 	rm -rf *.o *.lo *.la *.a *.c *.swg *~ core .libs
 
+SWIG_TYPECHECK = $(SWIGLIB)/common.swg
+
 # ----------------------------------------------------------------------
 # Tcl runtime library
 # ----------------------------------------------------------------------
@@ -43,7 +45,9 @@ TCL_RUNTIME = $(SWIGLIB)/tcl/swigtcl8.swg
 tcl: libswigtcl8.la
 
 libswigtcl8.la:
-	-cp $(srcdir)/$(TCL_RUNTIME) swigtcl8.c
+	rm -f swigtcl8.c
+	cat $(srcdir)/$(SWIG_TYPECHECK) $(srcdir)/$(TCL_RUNTIME) >> swigtcl8.c
+#	-cp $(srcdir)/$(TCL_RUNTIME) swigtcl8.c
 	$(LIBTOOL) $(CC) -c $(TCL_INCLUDE) -DSWIG_GLOBAL swigtcl8.c
 	$(LIBTOOL) $(CC) -o libswigtcl8.la swigtcl8.lo -rpath $(LIB_DIR) -avoid-version
 
@@ -59,7 +63,9 @@ PYTHON_RUNTIME = $(SWIGLIB)/python/python.swg
 python: libswigpy.la
 
 libswigpy.la:
-	-cp $(srcdir)/$(PYTHON_RUNTIME) libpy.c
+	rm -f libpy.c
+	cat $(srcdir)/$(SWIG_TYPECHECK) $(srcdir)/$(PYTHON_RUNTIME) >> libpy.c	
+#	-cp $(srcdir)/$(PYTHON_RUNTIME) libpy.c
 	$(LIBTOOL) $(CC) -c $(PYTHON_INCLUDE) -DSWIG_GLOBAL libpy.c
 	$(LIBTOOL) $(CC) -o libswigpy.la libpy.lo -rpath $(LIB_DIR) -avoid-version
 
@@ -76,8 +82,8 @@ perl5: libswigpl.la
 
 libswigpl.la:
 	@rm -f libperl.c
-	cat $(srcdir)/perlrun.h >> libperl.c
-	cat $(srcdir)/$(PERL5_RUNTIME) >> libperl.c
+#	cat $(srcdir)/perlrun.h >> libperl.c
+	cat $(srcdir)/$(SWIG_TYPECHECK) $(srcdir)/$(PERL5_RUNTIME) >> libperl.c
 	$(LIBTOOL) $(CC) -c $(PERL5_INCLUDE) -DSWIG_GLOBAL -Dbool=char -Dexplicit= libperl.c
 	$(LIBTOOL) $(CC) -o libswigpl.la libperl.lo -rpath $(LIB_DIR) -avoid-version
 
@@ -93,7 +99,8 @@ RUBY_RUNTIME = $(SWIGLIB)/ruby/ruby.swg
 ruby: libswigrb.la
 
 libswigrb.la:
-	cp $(srcdir)/$(RUBY_RUNTIME) librb.c
-	cat $(SWIGLIB)/ruby/rubydef.swg >> librb.c
+	rm -f librb.c
+#	cp $(srcdir)/$(RUBY_RUNTIME) librb.c
+	cat $(srcdir)/$(SWIG_TYPECHECK) $(srcdir)/$(RUBY_RUNTIME) $(SWIGLIB)/ruby/rubydef.swg >> librb.c
 	$(LIBTOOL) $(CC) -c $(RUBY_INCLUDE) -DSWIG_GLOBAL librb.c
 	$(LIBTOOL) $(CC) -o libswigrb.la librb.lo -rpath $(LIB_DIR) -avoid-version
diff --git a/SWIG/Runtime/perlrun.h b/SWIG/Runtime/perlrun.h
deleted file mode 100644
index b1c12a38d..000000000
--- a/SWIG/Runtime/perlrun.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"