diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg
index 215ea921e..ac68a4a0e 100644
--- a/Lib/csharp/csharp.swg
+++ b/Lib/csharp/csharp.swg
@@ -15,7 +15,7 @@
 %typemap(ctype) bool,               const bool &               "unsigned int"
 %typemap(ctype) char,               const char &               "char"
 %typemap(ctype) signed char,        const signed char &        "signed char"
-%typemap(ctype) unsigned char,      const unsigned char &      "unsigned short"
+%typemap(ctype) unsigned char,      const unsigned char &      "unsigned char"
 %typemap(ctype) short,              const short &              "short"
 %typemap(ctype) unsigned short,     const unsigned short &     "unsigned short"
 %typemap(ctype) int,                const int &                "int"
@@ -420,7 +420,8 @@ $1 = &temp; %}
 %typemap(cscode)                      SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
 %typemap(csimports)                   SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) "\nusing System;\n"
 %typemap(csinterfaces)                SWIGTYPE "IDisposable"
-%typemap(csinterfaces_derived)                  SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
+%typemap(csinterfaces)                          SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
+%typemap(csinterfaces_derived)        SWIGTYPE, SWIGTYPE *, SWIGTYPE &, SWIGTYPE [], SWIGTYPE (CLASS::*) ""
 
 // Proxy classes (base classes, ie, not derived classes)
 %typemap(csbody) SWIGTYPE %{
diff --git a/Lib/csharp/enums.swg b/Lib/csharp/enums.swg
index 3acb2d0a0..8cbcd920d 100644
--- a/Lib/csharp/enums.swg
+++ b/Lib/csharp/enums.swg
@@ -27,7 +27,11 @@
       return ($csclassname)$imcall;
     } %}
 
+%typemap(csbase)           enum SWIGTYPE ""
 %typemap(csclassmodifiers) enum SWIGTYPE "public enum"
+%typemap(cscode)           enum SWIGTYPE ""
+%typemap(csimports)        enum SWIGTYPE ""
+%typemap(csinterfaces)     enum SWIGTYPE ""
 
 %typemap(csbody) enum SWIGTYPE ""
 
diff --git a/Lib/csharp/enumsimple.swg b/Lib/csharp/enumsimple.swg
index 36e6c4d94..d64de7de2 100644
--- a/Lib/csharp/enumsimple.swg
+++ b/Lib/csharp/enumsimple.swg
@@ -29,7 +29,11 @@
       return $imcall;
     } %}
 
+%typemap(csbase)           enum SWIGTYPE ""
 %typemap(csclassmodifiers) enum SWIGTYPE ""
+%typemap(cscode)           enum SWIGTYPE ""
+%typemap(csimports)        enum SWIGTYPE ""
+%typemap(csinterfaces)     enum SWIGTYPE ""
 
 %typemap(csbody) enum SWIGTYPE ""
 
diff --git a/Lib/csharp/enumtypesafe.swg b/Lib/csharp/enumtypesafe.swg
index 6752cc023..0f57aad9e 100644
--- a/Lib/csharp/enumtypesafe.swg
+++ b/Lib/csharp/enumtypesafe.swg
@@ -28,7 +28,11 @@
       return $csclassname.swigToEnum($imcall);
     } %}
 
+%typemap(csbase)           enum SWIGTYPE ""
 %typemap(csclassmodifiers) enum SWIGTYPE "public sealed class"
+%typemap(cscode)           enum SWIGTYPE ""
+%typemap(csimports)        enum SWIGTYPE ""
+%typemap(csinterfaces)     enum SWIGTYPE ""
 
 /*
  * The swigToEnum method is used to find the C# enum from a C++ enum integer value. The default one here takes 
diff --git a/Lib/java/enums.swg b/Lib/java/enums.swg
index 7f264baa1..665e1aa14 100644
--- a/Lib/java/enums.swg
+++ b/Lib/java/enums.swg
@@ -29,6 +29,11 @@
   }
 
 %typemap(javaclassmodifiers) enum SWIGTYPE "public enum"
+%typemap(javabase)           enum SWIGTYPE ""
+%typemap(javacode)           enum SWIGTYPE ""
+%typemap(javaimports)        enum SWIGTYPE ""
+%typemap(javainterfaces)     enum SWIGTYPE ""
+%typemap(javabody)           enum SWIGTYPE ""
 
 /*
  * SwigNext static inner class used instead of a static int as static fields cannot be accessed from enum initialisers.
diff --git a/Lib/java/enumsimple.swg b/Lib/java/enumsimple.swg
index c500ec8e0..ff88af3f1 100644
--- a/Lib/java/enumsimple.swg
+++ b/Lib/java/enumsimple.swg
@@ -29,7 +29,11 @@
   }
 
 %typemap(javaclassmodifiers) enum SWIGTYPE ""
-%typemap(javabody) enum SWIGTYPE ""
+%typemap(javabase)           enum SWIGTYPE ""
+%typemap(javacode)           enum SWIGTYPE ""
+%typemap(javaimports)        enum SWIGTYPE ""
+%typemap(javainterfaces)     enum SWIGTYPE ""
+%typemap(javabody)           enum SWIGTYPE ""
 
 %javaenum(simple);
 
diff --git a/Lib/java/enumtypesafe.swg b/Lib/java/enumtypesafe.swg
index 3c501f020..5f0821f87 100644
--- a/Lib/java/enumtypesafe.swg
+++ b/Lib/java/enumtypesafe.swg
@@ -29,6 +29,11 @@
 
 // '$static' will be replaced with either 'static' or nothing depending on whether the enum is an inner Java class or not
 %typemap(javaclassmodifiers) enum SWIGTYPE "public final $static class"
+%typemap(javabase)           enum SWIGTYPE ""
+%typemap(javacode)           enum SWIGTYPE ""
+%typemap(javaimports)        enum SWIGTYPE ""
+%typemap(javainterfaces)     enum SWIGTYPE ""
+%typemap(javabody)           enum SWIGTYPE ""
 
 /*
  * The swigToEnum method is used to find the Java enum from a C++ enum integer value. The default one here takes 
diff --git a/Lib/java/enumtypeunsafe.swg b/Lib/java/enumtypeunsafe.swg
index b3a16d3c9..b224faa2e 100644
--- a/Lib/java/enumtypeunsafe.swg
+++ b/Lib/java/enumtypeunsafe.swg
@@ -30,7 +30,11 @@
 
 // '$static' will be replaced with either 'static' or nothing depending on whether the enum is an inner Java class or not
 %typemap(javaclassmodifiers) enum SWIGTYPE "public final $static class"
-%typemap(javabody) enum SWIGTYPE ""
+%typemap(javabase)           enum SWIGTYPE ""
+%typemap(javacode)           enum SWIGTYPE ""
+%typemap(javaimports)        enum SWIGTYPE ""
+%typemap(javainterfaces)     enum SWIGTYPE ""
+%typemap(javabody)           enum SWIGTYPE ""
 
 %javaenum(typeunsafe);
 
diff --git a/Lib/swig.swg b/Lib/swig.swg
index 57a7e4929..1d5747fca 100644
--- a/Lib/swig.swg
+++ b/Lib/swig.swg
@@ -352,7 +352,7 @@ public:
     T *operator&() { return tt; }
 private:
     SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
-};   
+};
 #endif
 %}
 #endif