diff --git a/Examples/perl5/java/example.i b/Examples/perl5/java/example.i
index b67201ee5..a82abb267 100644
--- a/Examples/perl5/java/example.i
+++ b/Examples/perl5/java/example.i
@@ -1,14 +1,6 @@
 %module example
 
-%{
-#undef STATIC
-%}
-%include <gcj/cni.i>
-%include <jstring.i>
-%{
-#undef TRUE
-#define TRUE 1
-%}
+%include <cni.i>
 
 %{
 #include "Example.h"
diff --git a/Examples/python/java/example.i b/Examples/python/java/example.i
index b5f642e30..13d5b5e70 100644
--- a/Examples/python/java/example.i
+++ b/Examples/python/java/example.i
@@ -1,7 +1,5 @@
 %module example
-
-%include <gcj/cni.i>
-%include <jstring.i>
+%include <cni.i>
 
 %{
 #include "Example.h"
diff --git a/Examples/ruby/java/example.i b/Examples/ruby/java/example.i
index 897aacd2c..13d5b5e70 100644
--- a/Examples/ruby/java/example.i
+++ b/Examples/ruby/java/example.i
@@ -1,6 +1,5 @@
 %module example
-%include <gcj/cni.i>
-%include <jstring.i>
+%include <cni.i>
 
 %{
 #include "Example.h"
diff --git a/Examples/tcl/java/example.i b/Examples/tcl/java/example.i
index 897aacd2c..b69d83f8d 100644
--- a/Examples/tcl/java/example.i
+++ b/Examples/tcl/java/example.i
@@ -1,10 +1,8 @@
 %module example
-%include <gcj/cni.i>
-%include <jstring.i>
+%include <cni.i>
 
 %{
 #include "Example.h"
 %}
 
-
 %include Example.h
diff --git a/Lib/perl5/cni.i b/Lib/perl5/cni.i
new file mode 100644
index 000000000..817f70565
--- /dev/null
+++ b/Lib/perl5/cni.i
@@ -0,0 +1,12 @@
+%warnfilter(314) java::lang::ref;
+
+%{
+#undef STATIC
+%}
+%include <gcj/cni.i>
+%{
+#undef TRUE
+#define TRUE 1
+%}
+
+%include <jstring.i>
diff --git a/Lib/python/cni.i b/Lib/python/cni.i
index 0dbef9a98..10a1403a2 100644
--- a/Lib/python/cni.i
+++ b/Lib/python/cni.i
@@ -1 +1,2 @@
-%include <typemaps/cni.swg>
+%include <gcj/cni.i>
+%include <jstring.i>
diff --git a/Lib/ruby/cni.i b/Lib/ruby/cni.i
new file mode 100644
index 000000000..10a1403a2
--- /dev/null
+++ b/Lib/ruby/cni.i
@@ -0,0 +1,2 @@
+%include <gcj/cni.i>
+%include <jstring.i>
diff --git a/Lib/tcl/cni.i b/Lib/tcl/cni.i
new file mode 100644
index 000000000..10a1403a2
--- /dev/null
+++ b/Lib/tcl/cni.i
@@ -0,0 +1,2 @@
+%include <gcj/cni.i>
+%include <jstring.i>