diff --git a/Lib/csharp/std_map.i b/Lib/csharp/std_map.i
index 9d07bc830..9884e29a5 100644
--- a/Lib/csharp/std_map.i
+++ b/Lib/csharp/std_map.i
@@ -214,6 +214,11 @@
     typedef ptrdiff_t difference_type;
     typedef K key_type;
     typedef T mapped_type;
+    typedef std::pair< const K, T > value_type;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
 
     map();
     map(const map< K, T, C > &other);
diff --git a/Lib/d/std_map.i b/Lib/d/std_map.i
index b7da364cc..b869ac599 100644
--- a/Lib/d/std_map.i
+++ b/Lib/d/std_map.i
@@ -23,6 +23,12 @@ namespace std {
       typedef ptrdiff_t difference_type;
       typedef K key_type;
       typedef T mapped_type;
+      typedef std::pair< const K, T > value_type;
+      typedef value_type* pointer;
+      typedef const value_type* const_pointer;
+      typedef value_type& reference;
+      typedef const value_type& const_reference;
+
       map();
       map(const map< K, T, C >& other);
 
diff --git a/Lib/go/std_map.i b/Lib/go/std_map.i
index 3077d157f..5e21591e9 100644
--- a/Lib/go/std_map.i
+++ b/Lib/go/std_map.i
@@ -27,6 +27,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/guile/std_map.i b/Lib/guile/std_map.i
index 4b8dd67c2..4ac22c23d 100644
--- a/Lib/guile/std_map.i
+++ b/Lib/guile/std_map.i
@@ -218,6 +218,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
@@ -434,6 +440,16 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
@@ -640,6 +656,16 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
@@ -848,6 +874,16 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/java/std_map.i b/Lib/java/std_map.i
index 0b0041fb8..7ba0b2fe5 100644
--- a/Lib/java/std_map.i
+++ b/Lib/java/std_map.i
@@ -147,7 +147,6 @@ template<class KeyType, class MappedType, class Comparator = std::less<KeyType>
     typedef KeyType key_type;
     typedef MappedType mapped_type;
     typedef std::pair< const KeyType, MappedType > value_type;
-    typedef Compare key_compare;
     typedef value_type* pointer;
     typedef const value_type* const_pointer;
     typedef value_type& reference;
diff --git a/Lib/javascript/jsc/std_map.i b/Lib/javascript/jsc/std_map.i
index cc9474abc..17b56bd48 100644
--- a/Lib/javascript/jsc/std_map.i
+++ b/Lib/javascript/jsc/std_map.i
@@ -27,6 +27,13 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/javascript/v8/std_map.i b/Lib/javascript/v8/std_map.i
index cc9474abc..41ee1760e 100644
--- a/Lib/javascript/v8/std_map.i
+++ b/Lib/javascript/v8/std_map.i
@@ -27,6 +27,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/lua/std_map.i b/Lib/lua/std_map.i
index 3077d157f..5e21591e9 100644
--- a/Lib/lua/std_map.i
+++ b/Lib/lua/std_map.i
@@ -27,6 +27,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/mzscheme/std_map.i b/Lib/mzscheme/std_map.i
index 68c7f7fb1..80a16ced0 100644
--- a/Lib/mzscheme/std_map.i
+++ b/Lib/mzscheme/std_map.i
@@ -221,6 +221,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
@@ -441,6 +447,16 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
@@ -653,6 +669,16 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
@@ -865,6 +891,16 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/ocaml/std_map.i b/Lib/ocaml/std_map.i
index b50bc7fc0..9ce881699 100644
--- a/Lib/ocaml/std_map.i
+++ b/Lib/ocaml/std_map.i
@@ -26,6 +26,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/perl5/std_map.i b/Lib/perl5/std_map.i
index fe9b6f3f1..91a2acd06 100644
--- a/Lib/perl5/std_map.i
+++ b/Lib/perl5/std_map.i
@@ -27,6 +27,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/php/std_map.i b/Lib/php/std_map.i
index 4d93fa144..64c4ff18d 100644
--- a/Lib/php/std_map.i
+++ b/Lib/php/std_map.i
@@ -27,6 +27,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/scilab/std_map.i b/Lib/scilab/std_map.i
index aea1c7141..de00534b0 100644
--- a/Lib/scilab/std_map.i
+++ b/Lib/scilab/std_map.i
@@ -22,6 +22,16 @@ namespace std {
     template<class K, class T, class C = std::less<K> > class map {
         // add typemaps here
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);
         
diff --git a/Lib/std/std_map.i b/Lib/std/std_map.i
index 36c037860..62f5cb37c 100644
--- a/Lib/std/std_map.i
+++ b/Lib/std/std_map.i
@@ -74,7 +74,6 @@ namespace std {
     typedef _Key key_type;
     typedef _Tp mapped_type;
     typedef std::pair< const _Key, _Tp > value_type;
-
     typedef value_type* pointer;
     typedef const value_type* const_pointer;
     typedef value_type& reference;
diff --git a/Lib/tcl/std_map.i b/Lib/tcl/std_map.i
index d59537922..ce1381f03 100644
--- a/Lib/tcl/std_map.i
+++ b/Lib/tcl/std_map.i
@@ -26,6 +26,12 @@ namespace std {
         typedef ptrdiff_t difference_type;
         typedef K key_type;
         typedef T mapped_type;
+        typedef std::pair< const K, T > value_type;
+        typedef value_type* pointer;
+        typedef const value_type* const_pointer;
+        typedef value_type& reference;
+        typedef const value_type& const_reference;
+
         map();
         map(const map< K, T, C >& other);