diff --git a/Lib/java/std_string.i b/Lib/java/std_string.i
index 334e0ca40..de70a1efd 100644
--- a/Lib/java/std_string.i
+++ b/Lib/java/std_string.i
@@ -14,8 +14,6 @@
   %apply const std::string & {std::string &};
   ------------------------------------------------------------------------ */
 
-%include exception.i
-
 %{
 #include <string>
 %}
@@ -121,166 +119,3 @@ class string;
 
 }
 
-/* ------------------------------------------------------------------------
-  Typemaps for std::wstring and const std::wstring&
-
-  These are mapped to a Java String and are passed around by value.
-  Warning: Unicode / multibyte characters are handled differently on different 
-  OSs so the std::wstring typemaps may not always work as intended. Therefore 
-  a #define is required to use them.
-
-  To use non-const std::wstring references use the following %apply.  Note 
-  that they are passed by value.
-  %apply const std::wstring & {std::wstring &};
-  ------------------------------------------------------------------------ */
-
-#ifdef SWIGJAVA_WSTRING
-
-namespace std {
-
-class wstring;
-
-// wstring
-%typemap(jni) wstring "jstring"
-%typemap(jtype) wstring "String"
-%typemap(jstype) wstring "String"
-%typemap(javadirectorin) wstring "$jniinput"
-%typemap(javadirectorout) wstring "$javacall"
-
-%typemap(in) wstring
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  if ($1_len) {
-    wchar_t *conv_buf = new wchar_t[$1_len];
-    for (jsize i = 0; i < $1_len; ++i) {
-       conv_buf[i] = $1_pstr[i];
-    }
-    $1 =  std::wstring(conv_buf, $1_len);
-    delete [] conv_buf;
-  }
-  jenv->ReleaseStringChars($input, $1_pstr);
- %}
-
-%typemap(directorout) wstring
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  if ($1_len) {
-    wchar_t *conv_buf = new wchar_t[$1_len];
-    for (jsize i = 0; i < $1_len; ++i) {
-       conv_buf[i] = $1_pstr[i];
-    }
-    $1 =  std::wstring(conv_buf, $1_len);
-    delete [] conv_buf;
-  }
-  jenv->ReleaseStringChars($input, $1_pstr);
- %}
-
-%typemap(directorin,descriptor="Ljava/lang/String;") wstring 
-%{jsize $1_len = $1.length();
-  jchar *conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    conv_buf[i] = (jchar)$1[i];
-  }
-  $input = jenv->NewString(conv_buf, $1_len);
-  delete [] conv_buf; %}
-
-%typemap(out) wstring
-%{jsize $1_len = $1.length();
-  jchar *conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    conv_buf[i] = (jchar)$1[i];
-  }
-  $result = jenv->NewString(conv_buf, $1_len);
-  delete [] conv_buf; %}
-
-%typemap(javain) wstring "$javainput"
-
-%typemap(javaout) wstring {
-    return $jnicall;
-  }
-
-// const wstring &
-%typemap(jni) const wstring & "jstring"
-%typemap(jtype) const wstring & "String"
-%typemap(jstype) const wstring & "String"
-%typemap(javadirectorin) const wstring & "$jniinput"
-%typemap(javadirectorout) const wstring & "$javacall"
-
-%typemap(directorout,warning=SWIG_WARN_TYPEMAP_THREAD_UNSAFE) const wstring &
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  static std::wstring $1_str;
-  if ($1_len) {
-    wchar_t *conv_buf = new wchar_t[$1_len];
-    for (jsize i = 0; i < $1_len; ++i) {
-       conv_buf[i] = $1_pstr[i];
-    }
-    $1_str = std::wstring(conv_buf, $1_len);
-    delete [] conv_buf;
-  }
-  $1 = &$1_str;
-  jenv->ReleaseStringChars($input, $1_pstr); %}
-
-%typemap(directorout) const wstring & 
-%{if(!$input) {
-    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
-    return $null;
-  }
-  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
-  if (!$1_pstr) return $null;
-  jsize $1_len = jenv->GetStringLength($input);
-  std::wstring $1_str;
-  if ($1_len) {
-    wchar_t *conv_buf = new wchar_t[$1_len];
-    for (jsize i = 0; i < $1_len; ++i) {
-       conv_buf[i] = $1_pstr[i];
-    }
-    $1_str = std::wstring(conv_buf, $1_len);
-    delete [] conv_buf;
-  }
-  $1 = &$1_str;
-  jenv->ReleaseStringChars($input, $1_pstr); %}
-
-%typemap(directorin,descriptor="Ljava/lang/String;") const wstring &
-%{jsize $1_len = $1.length();
-  jchar *conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    conv_buf[i] = (jchar)($1)[i];
-  }
-  $input = jenv->NewString(conv_buf, $1_len);
-  delete [] conv_buf; %}
-
-%typemap(out) const wstring & 
-%{jsize $1_len = $1->length();
-  jchar *conv_buf = new jchar[$1_len];
-  for (jsize i = 0; i < $1_len; ++i) {
-    conv_buf[i] = (jchar)(*$1)[i];
-  }
-  $result = jenv->NewString(conv_buf, $1_len);
-  delete [] conv_buf; %}
-
-%typemap(javain) const wstring & "$javainput"
-
-%typemap(javaout) const wstring & {
-    return $jnicall;
-  }
-
-}
-
-#endif
-
diff --git a/Lib/java/std_wstring.i b/Lib/java/std_wstring.i
new file mode 100644
index 000000000..5cc03fc5e
--- /dev/null
+++ b/Lib/java/std_wstring.i
@@ -0,0 +1,158 @@
+/* ------------------------------------------------------------------------
+  Typemaps for std::wstring and const std::wstring&
+
+  These are mapped to a Java String and are passed around by value.
+  Warning: Unicode / multibyte characters are handled differently on different 
+  OSs so the std::wstring typemaps may not always work as intended.
+
+  To use non-const std::wstring references use the following %apply.  Note 
+  that they are passed by value.
+  %apply const std::wstring & {std::wstring &};
+  ------------------------------------------------------------------------ */
+
+namespace std {
+
+class wstring;
+
+// wstring
+%typemap(jni) wstring "jstring"
+%typemap(jtype) wstring "String"
+%typemap(jstype) wstring "String"
+%typemap(javadirectorin) wstring "$jniinput"
+%typemap(javadirectorout) wstring "$javacall"
+
+%typemap(in) wstring
+%{if(!$input) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
+    return $null;
+  }
+  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
+  if (!$1_pstr) return $null;
+  jsize $1_len = jenv->GetStringLength($input);
+  if ($1_len) {
+    wchar_t *conv_buf = new wchar_t[$1_len];
+    for (jsize i = 0; i < $1_len; ++i) {
+       conv_buf[i] = $1_pstr[i];
+    }
+    $1 =  std::wstring(conv_buf, $1_len);
+    delete [] conv_buf;
+  }
+  jenv->ReleaseStringChars($input, $1_pstr);
+ %}
+
+%typemap(directorout) wstring
+%{if(!$input) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
+    return $null;
+  }
+  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
+  if (!$1_pstr) return $null;
+  jsize $1_len = jenv->GetStringLength($input);
+  if ($1_len) {
+    wchar_t *conv_buf = new wchar_t[$1_len];
+    for (jsize i = 0; i < $1_len; ++i) {
+       conv_buf[i] = $1_pstr[i];
+    }
+    $1 =  std::wstring(conv_buf, $1_len);
+    delete [] conv_buf;
+  }
+  jenv->ReleaseStringChars($input, $1_pstr);
+ %}
+
+%typemap(directorin,descriptor="Ljava/lang/String;") wstring 
+%{jsize $1_len = $1.length();
+  jchar *conv_buf = new jchar[$1_len];
+  for (jsize i = 0; i < $1_len; ++i) {
+    conv_buf[i] = (jchar)$1[i];
+  }
+  $input = jenv->NewString(conv_buf, $1_len);
+  delete [] conv_buf; %}
+
+%typemap(out) wstring
+%{jsize $1_len = $1.length();
+  jchar *conv_buf = new jchar[$1_len];
+  for (jsize i = 0; i < $1_len; ++i) {
+    conv_buf[i] = (jchar)$1[i];
+  }
+  $result = jenv->NewString(conv_buf, $1_len);
+  delete [] conv_buf; %}
+
+%typemap(javain) wstring "$javainput"
+
+%typemap(javaout) wstring {
+    return $jnicall;
+  }
+
+// const wstring &
+%typemap(jni) const wstring & "jstring"
+%typemap(jtype) const wstring & "String"
+%typemap(jstype) const wstring & "String"
+%typemap(javadirectorin) const wstring & "$jniinput"
+%typemap(javadirectorout) const wstring & "$javacall"
+
+%typemap(directorout,warning=SWIG_WARN_TYPEMAP_THREAD_UNSAFE) const wstring &
+%{if(!$input) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
+    return $null;
+  }
+  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
+  if (!$1_pstr) return $null;
+  jsize $1_len = jenv->GetStringLength($input);
+  static std::wstring $1_str;
+  if ($1_len) {
+    wchar_t *conv_buf = new wchar_t[$1_len];
+    for (jsize i = 0; i < $1_len; ++i) {
+       conv_buf[i] = $1_pstr[i];
+    }
+    $1_str = std::wstring(conv_buf, $1_len);
+    delete [] conv_buf;
+  }
+  $1 = &$1_str;
+  jenv->ReleaseStringChars($input, $1_pstr); %}
+
+%typemap(directorout) const wstring & 
+%{if(!$input) {
+    SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::wstring");
+    return $null;
+  }
+  const jchar *$1_pstr = jenv->GetStringChars($input, 0);
+  if (!$1_pstr) return $null;
+  jsize $1_len = jenv->GetStringLength($input);
+  std::wstring $1_str;
+  if ($1_len) {
+    wchar_t *conv_buf = new wchar_t[$1_len];
+    for (jsize i = 0; i < $1_len; ++i) {
+       conv_buf[i] = $1_pstr[i];
+    }
+    $1_str = std::wstring(conv_buf, $1_len);
+    delete [] conv_buf;
+  }
+  $1 = &$1_str;
+  jenv->ReleaseStringChars($input, $1_pstr); %}
+
+%typemap(directorin,descriptor="Ljava/lang/String;") const wstring &
+%{jsize $1_len = $1.length();
+  jchar *conv_buf = new jchar[$1_len];
+  for (jsize i = 0; i < $1_len; ++i) {
+    conv_buf[i] = (jchar)($1)[i];
+  }
+  $input = jenv->NewString(conv_buf, $1_len);
+  delete [] conv_buf; %}
+
+%typemap(out) const wstring & 
+%{jsize $1_len = $1->length();
+  jchar *conv_buf = new jchar[$1_len];
+  for (jsize i = 0; i < $1_len; ++i) {
+    conv_buf[i] = (jchar)(*$1)[i];
+  }
+  $result = jenv->NewString(conv_buf, $1_len);
+  delete [] conv_buf; %}
+
+%typemap(javain) const wstring & "$javainput"
+
+%typemap(javaout) const wstring & {
+    return $jnicall;
+  }
+
+}
+