diff --git a/Lib/std/std_basic_string.i b/Lib/std/std_basic_string.i
index 2cea540a7..e0875c12b 100644
--- a/Lib/std/std_basic_string.i
+++ b/Lib/std/std_basic_string.i
@@ -9,7 +9,7 @@
 
 namespace std {
 
-  template <class _CharT, class _Traits =  std::char_traits<_CharT>, typename _Alloc = std::allocator<_CharT> > 
+  template <class _CharT, class _Traits = char_traits<_CharT>, typename _Alloc = allocator<_CharT> > 
   class basic_string
   {
 #if !defined(SWIG_STD_MODERN_STL) || defined(SWIG_STD_NOMODERN_STL)
diff --git a/Lib/std/std_deque.i b/Lib/std/std_deque.i
index 8ace9d252..67ca613bc 100644
--- a/Lib/std/std_deque.i
+++ b/Lib/std/std_deque.i
@@ -49,7 +49,7 @@
 
 namespace std {
 
-  template<class _Tp, class _Alloc = std::allocator<_Tp> > 
+  template<class _Tp, class _Alloc = allocator<_Tp> > 
   class deque {
   public:
     typedef size_t size_type;
diff --git a/Lib/std/std_ios.i b/Lib/std/std_ios.i
index d9965ee7a..4fb5e4cbe 100644
--- a/Lib/std/std_ios.i
+++ b/Lib/std/std_ios.i
@@ -247,8 +247,8 @@ namespace std {
 }
 
 namespace std {
-  %template(ios) basic_ios<char, std::char_traits<char> >;
-  %template(wios) basic_ios<wchar_t, std::char_traits<wchar_t> >;
+  %template(ios) basic_ios<char>;
+  %template(wios) basic_ios<wchar_t>;
 }
 
   
diff --git a/Lib/std/std_iostream.i b/Lib/std/std_iostream.i
index e07387b5a..65be41eb7 100644
--- a/Lib/std/std_iostream.i
+++ b/Lib/std/std_iostream.i
@@ -77,8 +77,6 @@ namespace std
     basic_ostream<_CharT, _Traits>& 
     operator<<(unsigned long long __n);
 
-
-
     basic_ostream<_CharT, _Traits>& 
     operator<<(double __f);
 
@@ -88,7 +86,6 @@ namespace std
     basic_ostream<_CharT, _Traits>& 
     operator<<(long double __f);
 
-
     basic_ostream<_CharT, _Traits>& 
     operator<<(const void* __p);
 
@@ -279,23 +276,23 @@ namespace std
     ~basic_iostream();    
   };
 
-  typedef basic_ostream<char, std::char_traits<char> > ostream ;
-  typedef basic_istream<char, std::char_traits<char> > istream;
-  typedef basic_iostream<char, std::char_traits<char> > iostream;
+  typedef basic_ostream<char> ostream ;
+  typedef basic_istream<char> istream;
+  typedef basic_iostream<char> iostream;
 
-  typedef basic_ostream<wchar_t, std::char_traits<wchar_t> >  wostream;
-  typedef basic_istream<wchar_t, std::char_traits<wchar_t> >  wistream;
-  typedef basic_iostream<wchar_t, std::char_traits<wchar_t> > wiostream;
+  typedef basic_ostream<wchar_t>  wostream;
+  typedef basic_istream<wchar_t>  wistream;
+  typedef basic_iostream<wchar_t> wiostream;
 
-  extern std::istream cin;
-  extern std::ostream cout;
-  extern std::ostream cerr;
-  extern std::ostream clog;
+  extern istream cin;
+  extern ostream cout;
+  extern ostream cerr;
+  extern ostream clog;
 
-  extern std::wistream wcin;
-  extern std::wostream wcout;
-  extern std::wostream wcerr;
-  extern std::wostream wclog;
+  extern wistream wcin;
+  extern wostream wcout;
+  extern wostream wcerr;
+  extern wostream wclog;
 
   template<typename _CharT, typename _Traits = char_traits<_CharT> >
   std::basic_ostream<_CharT, _Traits>& 
@@ -311,13 +308,13 @@ namespace std
 }
 
 namespace std {
-  %template(ostream) basic_ostream<char, std::char_traits<char> >;
-  %template(istream) basic_istream<char, std::char_traits<char> >;
-  %template(iostream) basic_iostream<char, std::char_traits<char> >;
+  %template(ostream) basic_ostream<char>;
+  %template(istream) basic_istream<char>;
+  %template(iostream) basic_iostream<char>;
 
-  %template(wostream) basic_ostream<wchar_t, std::char_traits<wchar_t> >;
-  %template(wistream) basic_istream<wchar_t, std::char_traits<wchar_t> >;
-  %template(wiostream) basic_iostream<wchar_t, std::char_traits<wchar_t> >;  
+  %template(wostream) basic_ostream<wchar_t>;
+  %template(wistream) basic_istream<wchar_t>;
+  %template(wiostream) basic_iostream<wchar_t>;  
 
   %template(endl) endl<char, std::char_traits<char> >;
   %template(ends) ends<char, std::char_traits<char> >;
diff --git a/Lib/std/std_list.i b/Lib/std/std_list.i
index 659bb1a76..d9b0af4be 100644
--- a/Lib/std/std_list.i
+++ b/Lib/std/std_list.i
@@ -61,7 +61,7 @@
 
 namespace std {
 
-  template<class _Tp, class _Alloc = std::allocator<_Tp>  > 
+  template<class _Tp, class _Alloc = allocator<_Tp>  > 
   class list {
   public:
     typedef size_t size_type;
diff --git a/Lib/std/std_map.i b/Lib/std/std_map.i
index df0bb8198..6789dca24 100644
--- a/Lib/std/std_map.i
+++ b/Lib/std/std_map.i
@@ -81,7 +81,7 @@
 namespace std {
 
   template<class _Key, class _Tp, class _Compare = std::less<_Key >,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp > > >
+	   class _Alloc = allocator<std::pair<const _Key, _Tp > > >
   class map {
   public:
     typedef size_t size_type;
diff --git a/Lib/std/std_multimap.i b/Lib/std/std_multimap.i
index 6b4fbcf1d..df78dd083 100644
--- a/Lib/std/std_multimap.i
+++ b/Lib/std/std_multimap.i
@@ -43,7 +43,7 @@
 
 namespace std {
   template<class _Key, class _Tp, class _Compare = std::less<_Key >,
-	   class _Alloc = std::allocator<std::pair<const _Key, _Tp > > >
+	   class _Alloc = allocator<std::pair<const _Key, _Tp > > >
   class multimap {
   public:
     typedef size_t size_type;
diff --git a/Lib/std/std_multiset.i b/Lib/std/std_multiset.i
index 778d7d928..14594bf9b 100644
--- a/Lib/std/std_multiset.i
+++ b/Lib/std/std_multiset.i
@@ -43,7 +43,7 @@ namespace std {
 
   //multiset
 
-  template <class _Key, class _Compare = less<_Key>,
+  template <class _Key, class _Compare = std::less<_Key>,
 	    class _Alloc = allocator<_Key> >
   class multiset {
   public:
diff --git a/Lib/std/std_set.i b/Lib/std/std_set.i
index 2e4e8d0ca..cfb726edd 100644
--- a/Lib/std/std_set.i
+++ b/Lib/std/std_set.i
@@ -64,7 +64,7 @@
 
 namespace std {
 
-  template <class _Key, class _Compare = less<_Key>,
+  template <class _Key, class _Compare = std::less<_Key>,
 	    class _Alloc = allocator<_Key> >
   class set {
   public:
diff --git a/Lib/std/std_sstream.i b/Lib/std/std_sstream.i
index c79087eb0..8308db135 100644
--- a/Lib/std/std_sstream.i
+++ b/Lib/std/std_sstream.i
@@ -33,15 +33,15 @@ namespace std
       basic_stringbuf(ios_base::openmode __mode = ios_base::in | ios_base::out);
 
       explicit
-      basic_stringbuf(const basic_string<char_type, _Traits, _Alloc>& __str,
+      basic_stringbuf(const basic_string<_CharT, _Traits, _Alloc>& __str,
 		      ios_base::openmode __mode = ios_base::in | ios_base::out);
 
       // Get and set:
-      basic_string<char_type, _Traits, _Alloc>
+      basic_string<_CharT, _Traits, _Alloc>
       str() const;
 
       void
-      str(const basic_string<char_type, _Traits, _Alloc>& __s);
+      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
 
     };
 
@@ -68,7 +68,7 @@ namespace std
       basic_istringstream(ios_base::openmode __mode = ios_base::in);
 
       explicit
-      basic_istringstream(const basic_string<char_type, _Traits, _Alloc>& __str,
+      basic_istringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
 			  ios_base::openmode __mode = ios_base::in);
 
       ~basic_istringstream();
@@ -77,11 +77,11 @@ namespace std
       basic_stringbuf<_CharT, _Traits, _Alloc>*
       rdbuf() const;
 
-      basic_string<char_type, _Traits, _Alloc>
+      basic_string<_CharT, _Traits, _Alloc>
       str() const;
 
       void
-      str(const basic_string<char_type, _Traits, _Alloc>& __s);
+      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
     };
 
 
@@ -107,7 +107,7 @@ namespace std
       basic_ostringstream(ios_base::openmode __mode = ios_base::out);
 
       explicit
-      basic_ostringstream(const basic_string<char_type, _Traits, _Alloc>& __str,
+      basic_ostringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
 			  ios_base::openmode __mode = ios_base::out);
 
       ~basic_ostringstream();
@@ -116,12 +116,12 @@ namespace std
       basic_stringbuf<_CharT, _Traits, _Alloc>*
       rdbuf() const;
 
-      basic_string<char_type, _Traits, _Alloc>
+      basic_string<_CharT, _Traits, _Alloc>
       str() const;
 
 #if 0
       void
-      str(const basic_string<char_type, _Traits, _Alloc>& __s);
+      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
 #endif
     };
 
@@ -147,7 +147,7 @@ namespace std
       basic_stringstream(ios_base::openmode __m = ios_base::out | ios_base::in);
 
       explicit
-      basic_stringstream(const basic_string<char_type, _Traits, _Alloc>& __str,
+      basic_stringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
 			 ios_base::openmode __m = ios_base::out | ios_base::in);
 
       ~basic_stringstream();
@@ -156,11 +156,11 @@ namespace std
       basic_stringbuf<_CharT, _Traits, _Alloc>*
       rdbuf() const;
 
-      basic_string<char_type, _Traits, _Alloc>
+      basic_string<_CharT, _Traits, _Alloc>
       str() const;
 
       void
-      str(const basic_string<char_type, _Traits, _Alloc>& __s);
+      str(const basic_string<_CharT, _Traits, _Alloc>& __s);
     };
 
 
@@ -168,12 +168,12 @@ namespace std
 
 
 namespace std {
-  %template(istringstream) basic_istringstream<char, char_traits<char>, allocator<char> >;
-  %template(ostringstream) basic_ostringstream<char, char_traits<char>, allocator<char> >;
-  %template(stringstream)  basic_stringstream<char, char_traits<char>, allocator<char> >;
+  %template(istringstream) basic_istringstream<char>;
+  %template(ostringstream) basic_ostringstream<char>;
+  %template(stringstream)  basic_stringstream<char>;
 
 
-  %template(wistringstream) basic_istringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
-  %template(wostringstream) basic_ostringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
-  %template(wstringstream)  basic_stringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
+  %template(wistringstream) basic_istringstream<wchar_t>;
+  %template(wostringstream) basic_ostringstream<wchar_t>;
+  %template(wstringstream)  basic_stringstream<wchar_t>;
 }
diff --git a/Lib/std/std_streambuf.i b/Lib/std/std_streambuf.i
index f48860c62..85a8132f3 100644
--- a/Lib/std/std_streambuf.i
+++ b/Lib/std/std_streambuf.i
@@ -5,7 +5,7 @@
 
 namespace std {
 
-  template<typename _CharT, typename _Traits>
+  template<typename _CharT, typename _Traits = char_traits<_CharT> >
   class basic_streambuf 
   {
   public:
@@ -16,8 +16,6 @@ namespace std {
     typedef typename traits_type::pos_type 		pos_type;
     typedef typename traits_type::off_type 		off_type;
 
-    typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      
   public:
     virtual 
     ~basic_streambuf();
@@ -30,7 +28,7 @@ namespace std {
     getloc() const; 
 
     // Buffer and positioning:
-    __streambuf_type* 
+    basic_streambuf<_CharT, _Traits>* 
     pubsetbuf(char_type* __s, streamsize __n);
 
     pos_type 
@@ -82,6 +80,6 @@ namespace std {
 }
 
 namespace std {
-  %template(streambuf) basic_streambuf<char, char_traits<char> >;
-  %template(wstreambuf) basic_streambuf<wchar_t, char_traits<wchar_t> >;
+  %template(streambuf) basic_streambuf<char>;
+  %template(wstreambuf) basic_streambuf<wchar_t>;
 }
diff --git a/Lib/std/std_string.i b/Lib/std/std_string.i
index 7ffe0c61f..a3a3ae4f4 100644
--- a/Lib/std/std_string.i
+++ b/Lib/std/std_string.i
@@ -4,9 +4,9 @@
 
 namespace std
 {
-  %std_comp_methods(basic_string<char, std::char_traits<char>, std::allocator<char> >);
-  typedef basic_string<char, std::char_traits<char>, std::allocator<char> > string;
+  %std_comp_methods(basic_string<char>);
+  typedef basic_string<char> string;
 }
 
 
-%template(string) std::basic_string<char, std::char_traits<char>, std::allocator<char> >;
+%template(string) std::basic_string<char>;
diff --git a/Lib/std/std_vector.i b/Lib/std/std_vector.i
index 1adf3a3a1..f61937758 100644
--- a/Lib/std/std_vector.i
+++ b/Lib/std/std_vector.i
@@ -56,7 +56,7 @@
 
 namespace std {
 
-  template<class _Tp, class _Alloc = std::allocator< _Tp > >
+  template<class _Tp, class _Alloc = allocator< _Tp > >
   class vector {
   public:
     typedef size_t size_type;
diff --git a/Lib/std/std_wstring.i b/Lib/std/std_wstring.i
index 58fa05889..f0284eb67 100644
--- a/Lib/std/std_wstring.i
+++ b/Lib/std/std_wstring.i
@@ -9,8 +9,8 @@
 
 namespace std
 {
-  %std_comp_methods(basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >);
-  typedef basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > wstring;
+  %std_comp_methods(basic_string<wchar_t>);
+  typedef basic_string<wchar_t> wstring;
 }
 
-%template(wstring) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >;
+%template(wstring) std::basic_string<wchar_t>;