From df6567e6345c763182fa237a4497ab94ee6ffc20 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 30 Mar 2014 13:54:02 +0100
Subject: [PATCH] Merge map.h into obj.h.

Pretty much everyone needs to include map.h, since it's such an integral
part of the Micro Python object implementation.  Thus, the definitions
are now in obj.h instead.  map.h is removed.
---
 py/builtin.c        |  1 -
 py/builtinevex.c    |  1 -
 py/builtinimport.c  |  1 -
 py/map.c            |  3 +--
 py/map.h            | 48 ----------------------------------
 py/modarray.c       |  1 -
 py/modcollections.c |  1 -
 py/modmath.c        |  1 -
 py/modmicropython.c |  1 -
 py/obj.c            |  1 -
 py/obj.h            | 63 +++++++++++++++++++++++++++++++++++++++------
 py/objarray.c       |  1 -
 py/objcomplex.c     |  1 -
 py/objdict.c        |  1 -
 py/objfun.c         |  1 -
 py/objgenerator.c   |  1 -
 py/objlist.c        |  1 -
 py/objmodule.c      |  1 -
 py/objset.c         |  1 -
 py/objstr.c         |  1 -
 py/objtuple.c       |  1 -
 py/objtype.c        |  1 -
 py/runtime.c        |  1 -
 py/runtime.h        | 10 +++----
 py/sequence.c       |  1 -
 stm/adc.c           |  1 -
 stm/audio.c         |  1 -
 stm/exti.c          |  1 -
 stm/file.c          |  1 -
 stm/i2c.c           |  1 -
 stm/led.c           |  1 -
 stm/pin.c           |  1 -
 stm/pin_map.c       |  1 -
 stm/pybmodule.c     |  1 -
 stm/pybwlan.c       |  1 -
 stm/sdcard.c        |  1 -
 stm/servo.c         |  1 -
 stm/usart.c         |  1 -
 stmhal/accel.c      |  1 -
 stmhal/adc.c        |  1 -
 stmhal/dac.c        |  1 -
 stmhal/exti.c       |  1 -
 stmhal/file.c       |  1 -
 stmhal/help.c       |  1 -
 stmhal/i2c.c        |  1 -
 stmhal/led.c        |  1 -
 stmhal/modos.c      |  1 -
 stmhal/modpyb.c     |  1 -
 stmhal/modtime.c    |  1 -
 stmhal/pin_map.c    |  1 -
 stmhal/sdcard.c     |  1 -
 stmhal/servo.c      |  1 -
 stmhal/usart.c      |  1 -
 unix/ffi.c          |  1 -
 unix/file.c         |  1 -
 unix/main.c         |  1 -
 unix/socket.c       |  1 -
 57 files changed, 61 insertions(+), 116 deletions(-)
 delete mode 100644 py/map.h

diff --git a/py/builtin.c b/py/builtin.c
index a8a700970..d606db17f 100644
--- a/py/builtin.c
+++ b/py/builtin.c
@@ -8,7 +8,6 @@
 #include "obj.h"
 #include "runtime0.h"
 #include "runtime.h"
-#include "map.h"
 #include "builtin.h"
 
 #if MICROPY_ENABLE_FLOAT
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 92550a796..264aa77f3 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -12,7 +12,6 @@
 #include "compile.h"
 #include "runtime0.h"
 #include "runtime.h"
-#include "map.h"
 #include "builtin.h"
 
 STATIC mp_obj_t parse_compile_execute(mp_obj_t o_in, mp_parse_input_kind_t parse_input_kind) {
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 4ba1d146a..8feb2a01b 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -17,7 +17,6 @@
 #include "compile.h"
 #include "runtime0.h"
 #include "runtime.h"
-#include "map.h"
 #include "builtin.h"
 
 #define PATH_SEP_CHAR '/'
diff --git a/py/map.c b/py/map.c
index d1c368c6a..d424c277c 100644
--- a/py/map.c
+++ b/py/map.c
@@ -5,13 +5,12 @@
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"
-#include "map.h"
 
 // approximatelly doubling primes; made with Mathematica command: Table[Prime[Floor[(1.7)^n]], {n, 3, 24}]
 // prefixed with zero for the empty case.
 STATIC int doubling_primes[] = {0, 7, 19, 43, 89, 179, 347, 647, 1229, 2297, 4243, 7829, 14347, 26017, 47149, 84947, 152443, 273253, 488399, 869927, 1547173, 2745121, 4861607};
 
-int get_doubling_prime_greater_or_equal_to(int x) {
+STATIC int get_doubling_prime_greater_or_equal_to(int x) {
     for (int i = 0; i < sizeof(doubling_primes) / sizeof(int); i++) {
         if (doubling_primes[i] >= x) {
             return doubling_primes[i];
diff --git a/py/map.h b/py/map.h
deleted file mode 100644
index 0614af3c4..000000000
--- a/py/map.h
+++ /dev/null
@@ -1,48 +0,0 @@
-typedef struct _mp_map_elem_t {
-    mp_obj_t key;
-    mp_obj_t value;
-} mp_map_elem_t;
-
-// TODO maybe have a truncated mp_map_t for fixed tables, since alloc=used
-// put alloc last in the structure, so the truncated version does not need it
-// this would save 1 ROM word for all ROM objects that have a locals_dict
-// would also need a trucated dict structure
-
-typedef struct _mp_map_t {
-    machine_uint_t all_keys_are_qstrs : 1;
-    machine_uint_t table_is_fixed_array : 1;
-    machine_uint_t used : (8 * sizeof(machine_uint_t) - 2);
-    machine_uint_t alloc;
-    mp_map_elem_t *table;
-} mp_map_t;
-
-typedef struct _mp_set_t {
-    machine_uint_t alloc;
-    machine_uint_t used;
-    mp_obj_t *table;
-} mp_set_t;
-
-typedef enum _mp_map_lookup_kind_t {
-    MP_MAP_LOOKUP,                    // 0
-    MP_MAP_LOOKUP_ADD_IF_NOT_FOUND,   // 1
-    MP_MAP_LOOKUP_REMOVE_IF_FOUND,    // 2
-    MP_MAP_LOOKUP_FIRST = 4,
-} mp_map_lookup_kind_t;
-
-typedef struct _mp_obj_dict_t {
-    mp_obj_base_t base;
-    mp_map_t map;
-} mp_obj_dict_t;
-
-int get_doubling_prime_greater_or_equal_to(int x);
-void mp_map_init(mp_map_t *map, int n);
-void mp_map_init_fixed_table(mp_map_t *map, int n, const mp_obj_t *table);
-mp_map_t *mp_map_new(int n);
-void mp_map_deinit(mp_map_t *map);
-void mp_map_free(mp_map_t *map);
-mp_map_elem_t* mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t lookup_kind);
-void mp_map_clear(mp_map_t *map);
-
-void mp_set_init(mp_set_t *set, int n);
-mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t lookup_kind);
-void mp_set_clear(mp_set_t *set);
diff --git a/py/modarray.c b/py/modarray.c
index 2544f7ed5..51c221fff 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -2,7 +2,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "builtin.h"
 
 STATIC const mp_map_elem_t mp_module_array_globals_table[] = {
diff --git a/py/modcollections.c b/py/modcollections.c
index ad951d5e9..3401600bb 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -2,7 +2,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "builtin.h"
 
 STATIC const mp_map_elem_t mp_module_collections_globals_table[] = {
diff --git a/py/modmath.c b/py/modmath.c
index b81482253..c3ea55f93 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -4,7 +4,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "builtin.h"
 
 #if MICROPY_ENABLE_FLOAT
diff --git a/py/modmicropython.c b/py/modmicropython.c
index 96ceb811c..23187c03e 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -2,7 +2,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "builtin.h"
 
 // Various builtins specific to MicroPython runtime,
diff --git a/py/obj.c b/py/obj.c
index d6fa37430..d72a538b7 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -9,7 +9,6 @@
 #include "obj.h"
 #include "runtime0.h"
 #include "runtime.h"
-#include "map.h"
 
 mp_obj_type_t *mp_obj_get_type(mp_obj_t o_in) {
     if (MP_OBJ_IS_SMALL_INT(o_in)) {
diff --git a/py/obj.h b/py/obj.h
index 6e334e1c8..88d9253ec 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -83,9 +83,52 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
 #define MP_DEFINE_CONST_STATICMETHOD_OBJ(obj_name, fun_name) const mp_obj_static_class_method_t obj_name = {{&mp_type_staticmethod}, fun_name}
 #define MP_DEFINE_CONST_CLASSMETHOD_OBJ(obj_name, fun_name) const mp_obj_static_class_method_t obj_name = {{&mp_type_classmethod}, fun_name}
 
-// Need to declare this here so we are not dependent on map.h
-struct _mp_map_t;
-struct _mp_map_elem_t;
+// Underlying map/hash table implementation (not dict object or map function)
+
+typedef struct _mp_map_elem_t {
+    mp_obj_t key;
+    mp_obj_t value;
+} mp_map_elem_t;
+
+// TODO maybe have a truncated mp_map_t for fixed tables, since alloc=used
+// put alloc last in the structure, so the truncated version does not need it
+// this would save 1 ROM word for all ROM objects that have a locals_dict
+// would also need a trucated dict structure
+
+typedef struct _mp_map_t {
+    machine_uint_t all_keys_are_qstrs : 1;
+    machine_uint_t table_is_fixed_array : 1;
+    machine_uint_t used : (8 * sizeof(machine_uint_t) - 2);
+    machine_uint_t alloc;
+    mp_map_elem_t *table;
+} mp_map_t;
+
+typedef enum _mp_map_lookup_kind_t {
+    MP_MAP_LOOKUP,                    // 0
+    MP_MAP_LOOKUP_ADD_IF_NOT_FOUND,   // 1
+    MP_MAP_LOOKUP_REMOVE_IF_FOUND,    // 2
+    MP_MAP_LOOKUP_FIRST = 4,
+} mp_map_lookup_kind_t;
+
+void mp_map_init(mp_map_t *map, int n);
+void mp_map_init_fixed_table(mp_map_t *map, int n, const mp_obj_t *table);
+mp_map_t *mp_map_new(int n);
+void mp_map_deinit(mp_map_t *map);
+void mp_map_free(mp_map_t *map);
+mp_map_elem_t* mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t lookup_kind);
+void mp_map_clear(mp_map_t *map);
+
+// Underlying set implementation (not set object)
+
+typedef struct _mp_set_t {
+    machine_uint_t alloc;
+    machine_uint_t used;
+    mp_obj_t *table;
+} mp_set_t;
+
+void mp_set_init(mp_set_t *set, int n);
+mp_obj_t mp_set_lookup(mp_set_t *set, mp_obj_t index, mp_map_lookup_kind_t lookup_kind);
+void mp_set_clear(mp_set_t *set);
 
 // Type definitions for methods
 
@@ -95,7 +138,7 @@ typedef mp_obj_t (*mp_fun_2_t)(mp_obj_t, mp_obj_t);
 typedef mp_obj_t (*mp_fun_3_t)(mp_obj_t, mp_obj_t, mp_obj_t);
 typedef mp_obj_t (*mp_fun_t)(void);
 typedef mp_obj_t (*mp_fun_var_t)(uint n, const mp_obj_t *);
-typedef mp_obj_t (*mp_fun_kw_t)(uint n, const mp_obj_t *, struct _mp_map_t *);
+typedef mp_obj_t (*mp_fun_kw_t)(uint n, const mp_obj_t *, mp_map_t *);
 
 typedef enum {
     PRINT_STR, PRINT_REPR
@@ -384,12 +427,16 @@ machine_int_t mp_obj_tuple_hash(mp_obj_t self_in);
 mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg);
 void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items);
 void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value);
-mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, struct _mp_map_t *kwargs);
+mp_obj_t mp_obj_list_sort(uint n_args, const mp_obj_t *args, mp_map_t *kwargs);
 
 // dict
+typedef struct _mp_obj_dict_t {
+    mp_obj_base_t base;
+    mp_map_t map;
+} mp_obj_dict_t;
 uint mp_obj_dict_len(mp_obj_t self_in);
 mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value);
-struct _mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in);
+mp_map_t *mp_obj_dict_get_map(mp_obj_t self_in);
 
 // set
 void mp_obj_set_store(mp_obj_t self_in, mp_obj_t item);
@@ -423,9 +470,9 @@ MP_DECLARE_CONST_FUN_OBJ(mp_identity_obj);
 typedef struct _mp_obj_module_t {
     mp_obj_base_t base;
     qstr name;
-    struct _mp_map_t *globals;
+    mp_map_t *globals;
 } mp_obj_module_t;
-struct _mp_map_t *mp_obj_module_get_globals(mp_obj_t self_in);
+mp_map_t *mp_obj_module_get_globals(mp_obj_t self_in);
 
 // staticmethod and classmethod types; defined here so we can make const versions
 // this structure is used for instances of both staticmethod and classmethod
diff --git a/py/objarray.c b/py/objarray.c
index 3251ce969..ea8654b45 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 #include "binary.h"
diff --git a/py/objcomplex.c b/py/objcomplex.c
index afda721cf..3fba56894 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -8,7 +8,6 @@
 #include "obj.h"
 #include "parsenum.h"
 #include "runtime0.h"
-#include "map.h"
 
 #if MICROPY_ENABLE_FLOAT
 
diff --git a/py/objdict.c b/py/objdict.c
index cb8e9d3e6..a9dbb76c4 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 
diff --git a/py/objfun.c b/py/objfun.c
index d4fa7592f..019101bed 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -9,7 +9,6 @@
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 #include "bc.h"
diff --git a/py/objgenerator.c b/py/objgenerator.c
index ce02e6f3a..d1bae30de 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "bc.h"
 #include "objgenerator.h"
diff --git a/py/objlist.c b/py/objlist.c
index c2feb0131..1030a862a 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 
diff --git a/py/objmodule.c b/py/objmodule.c
index a388ca3f3..cc5944b66 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -8,7 +8,6 @@
 #include "obj.h"
 #include "objmodule.h"
 #include "runtime.h"
-#include "map.h"
 #include "builtintables.h"
 
 STATIC mp_map_t mp_loaded_modules_map; // TODO: expose as sys.modules
diff --git a/py/objset.c b/py/objset.c
index 9b0ac2b10..2cabf6c50 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -9,7 +9,6 @@
 #include "obj.h"
 #include "runtime.h"
 #include "runtime0.h"
-#include "map.h"
 
 typedef struct _mp_obj_set_t {
     mp_obj_base_t base;
diff --git a/py/objstr.c b/py/objstr.c
index d02924c50..2dd7015c5 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 
diff --git a/py/objtuple.c b/py/objtuple.c
index faa355e5b..618664060 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 #include "objtuple.h"
diff --git a/py/objtype.c b/py/objtype.c
index 05d39b121..127512480 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 
diff --git a/py/runtime.c b/py/runtime.c
index a434d318e..ed01a5be0 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -12,7 +12,6 @@
 #include "runtime0.h"
 #include "runtime.h"
 #include "emitglue.h"
-#include "map.h"
 #include "builtin.h"
 #include "builtintables.h"
 #include "bc.h"
diff --git a/py/runtime.h b/py/runtime.h
index 1934ccd1e..b3d70d939 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -3,10 +3,10 @@ void mp_deinit(void);
 
 void mp_check_nargs(int n_args, machine_uint_t n_args_min, machine_uint_t n_args_max, int n_kw, bool is_kw);
 
-struct _mp_map_t *mp_locals_get(void);
-void mp_locals_set(struct _mp_map_t *m);
-struct _mp_map_t *mp_globals_get(void);
-void mp_globals_set(struct _mp_map_t *m);
+mp_map_t *mp_locals_get(void);
+void mp_locals_set(mp_map_t *m);
+mp_map_t *mp_globals_get(void);
+void mp_globals_set(mp_map_t *m);
 
 mp_obj_t mp_load_name(qstr qstr);
 mp_obj_t mp_load_global(qstr qstr);
@@ -58,7 +58,7 @@ mp_obj_t mp_iternext(mp_obj_t o); // will always return MP_OBJ_NULL instead of r
 mp_obj_t mp_make_raise_obj(mp_obj_t o);
 
 extern mp_obj_t mp_sys_path;
-struct _mp_map_t *mp_loaded_modules_get(void);
+mp_map_t *mp_loaded_modules_get(void);
 mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level);
 mp_obj_t mp_import_from(mp_obj_t module, qstr name);
 void mp_import_all(mp_obj_t module);
diff --git a/py/sequence.c b/py/sequence.c
index 8810a47d9..3aae4b942 100644
--- a/py/sequence.c
+++ b/py/sequence.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime0.h"
 #include "runtime.h"
 
diff --git a/stm/adc.c b/stm/adc.c
index acdaa97da..c7cca0ec0 100644
--- a/stm/adc.c
+++ b/stm/adc.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "adc.h"
 
 /* ADC defintions */
diff --git a/stm/audio.c b/stm/audio.c
index 22f635a5b..a4e42918c 100644
--- a/stm/audio.c
+++ b/stm/audio.c
@@ -9,7 +9,6 @@
 #include "qstr.h"
 #include "parse.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 
 #include "audio.h"
diff --git a/stm/exti.c b/stm/exti.c
index 33821cd18..ab33481eb 100644
--- a/stm/exti.c
+++ b/stm/exti.c
@@ -9,7 +9,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "nlr.h"
 
diff --git a/stm/file.c b/stm/file.c
index 208ce804b..40ac3ff9c 100644
--- a/stm/file.c
+++ b/stm/file.c
@@ -5,7 +5,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "file.h"
 #include "ff.h"
 
diff --git a/stm/i2c.c b/stm/i2c.c
index b3d06df14..011362cb5 100644
--- a/stm/i2c.c
+++ b/stm/i2c.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 
 typedef enum {
     PYB_I2C_1 = 0,
diff --git a/stm/led.c b/stm/led.c
index bfb98f9b5..17bb593f5 100644
--- a/stm/led.c
+++ b/stm/led.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "led.h"
 #include "pin.h"
 #include "build/pins.h"
diff --git a/stm/pin.c b/stm/pin.c
index 6b97d2f7c..b201c41e1 100644
--- a/stm/pin.c
+++ b/stm/pin.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 
 #include "pin.h"
 
diff --git a/stm/pin_map.c b/stm/pin_map.c
index 187ed3e63..9082afe49 100644
--- a/stm/pin_map.c
+++ b/stm/pin_map.c
@@ -9,7 +9,6 @@
 #include "obj.h"
 #include "runtime.h"
 #include "nlr.h"
-#include "map.h"
 
 #include "pin.h"
 
diff --git a/stm/pybmodule.c b/stm/pybmodule.c
index fde61b513..5ae65ad22 100644
--- a/stm/pybmodule.c
+++ b/stm/pybmodule.c
@@ -9,7 +9,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "gc.h"
 #include "gccollect.h"
 #include "systick.h"
diff --git a/stm/pybwlan.c b/stm/pybwlan.c
index 36a27c525..8d8ce3243 100644
--- a/stm/pybwlan.c
+++ b/stm/pybwlan.c
@@ -21,7 +21,6 @@
 #include "lexer.h"
 #include "parse.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 
 #include "cc3k/ccspi.h"
diff --git a/stm/sdcard.c b/stm/sdcard.c
index 59256292f..ed79b855c 100644
--- a/stm/sdcard.c
+++ b/stm/sdcard.c
@@ -9,7 +9,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "sdcard.h"
 
diff --git a/stm/servo.c b/stm/servo.c
index 176081e1a..db38bb21c 100644
--- a/stm/servo.c
+++ b/stm/servo.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "servo.h"
 
 // PWM
diff --git a/stm/usart.c b/stm/usart.c
index 27c40fd84..1dfbd433b 100644
--- a/stm/usart.c
+++ b/stm/usart.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "usart.h"
 
 pyb_usart_t pyb_usart_global_debug = PYB_USART_NONE;
diff --git a/stmhal/accel.c b/stmhal/accel.c
index a564902c0..ffccddc86 100644
--- a/stmhal/accel.c
+++ b/stmhal/accel.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "i2c.h"
 #include "accel.h"
diff --git a/stmhal/adc.c b/stmhal/adc.c
index c4e0b9e25..0b4f3e23e 100644
--- a/stmhal/adc.c
+++ b/stmhal/adc.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "adc.h"
 #include "pin.h"
diff --git a/stmhal/dac.c b/stmhal/dac.c
index b57e2c440..4dbf70022 100644
--- a/stmhal/dac.c
+++ b/stmhal/dac.c
@@ -9,7 +9,6 @@
 #include "qstr.h"
 #include "parse.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "dac.h"
 
diff --git a/stmhal/exti.c b/stmhal/exti.c
index 99bcd07e8..a9b05644c 100644
--- a/stmhal/exti.c
+++ b/stmhal/exti.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "nlr.h"
 
diff --git a/stmhal/file.c b/stmhal/file.c
index 219d58ddb..9575ffd7e 100644
--- a/stmhal/file.c
+++ b/stmhal/file.c
@@ -4,7 +4,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "file.h"
 #include "ff.h"
 
diff --git a/stmhal/help.c b/stmhal/help.c
index 3ab69ec62..66484576b 100644
--- a/stmhal/help.c
+++ b/stmhal/help.c
@@ -5,7 +5,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 
 STATIC const char *help_text =
 "Welcome to Micro Python!\n"
diff --git a/stmhal/i2c.c b/stmhal/i2c.c
index 0b76d35cb..f35d00b54 100644
--- a/stmhal/i2c.c
+++ b/stmhal/i2c.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "i2c.h"
 
diff --git a/stmhal/led.c b/stmhal/led.c
index 995b518e2..ffbaf3ca9 100644
--- a/stmhal/led.c
+++ b/stmhal/led.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "led.h"
 #include "pin.h"
diff --git a/stmhal/modos.c b/stmhal/modos.c
index 606dbe927..5684d1105 100644
--- a/stmhal/modos.c
+++ b/stmhal/modos.c
@@ -5,7 +5,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "systick.h"
 #include "rng.h"
 #include "storage.h"
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index 87fab706d..678408102 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "gc.h"
 #include "gccollect.h"
 #include "systick.h"
diff --git a/stmhal/modtime.c b/stmhal/modtime.c
index 4786c85c7..9756ec3b5 100644
--- a/stmhal/modtime.c
+++ b/stmhal/modtime.c
@@ -5,7 +5,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "modtime.h"
 
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
diff --git a/stmhal/pin_map.c b/stmhal/pin_map.c
index 8a0be1d52..2313540a3 100644
--- a/stmhal/pin_map.c
+++ b/stmhal/pin_map.c
@@ -9,7 +9,6 @@
 #include "obj.h"
 #include "runtime.h"
 #include "nlr.h"
-#include "map.h"
 
 #include "pin.h"
 
diff --git a/stmhal/sdcard.c b/stmhal/sdcard.c
index 84ee0b7b1..994eb26c2 100644
--- a/stmhal/sdcard.c
+++ b/stmhal/sdcard.c
@@ -6,7 +6,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "sdcard.h"
 #include "pin.h"
diff --git a/stmhal/servo.c b/stmhal/servo.c
index 4e8ff1543..15ba35165 100644
--- a/stmhal/servo.c
+++ b/stmhal/servo.c
@@ -7,7 +7,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "servo.h"
 
diff --git a/stmhal/usart.c b/stmhal/usart.c
index 14539c597..9bcc6be28 100644
--- a/stmhal/usart.c
+++ b/stmhal/usart.c
@@ -8,7 +8,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "usart.h"
 
 struct _pyb_usart_obj_t {
diff --git a/unix/ffi.c b/unix/ffi.c
index 71fb0b66a..cb63869e0 100644
--- a/unix/ffi.c
+++ b/unix/ffi.c
@@ -9,7 +9,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "binary.h"
 
diff --git a/unix/file.c b/unix/file.c
index 948ec4405..bd54e7482 100644
--- a/unix/file.c
+++ b/unix/file.c
@@ -9,7 +9,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "stream.h"
 
diff --git a/unix/main.c b/unix/main.c
index ffbdbb7e7..959499ac3 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -15,7 +15,6 @@
 #include "lexerunix.h"
 #include "parse.h"
 #include "obj.h"
-#include "map.h"
 #include "parsehelper.h"
 #include "compile.h"
 #include "runtime0.h"
diff --git a/unix/socket.c b/unix/socket.c
index ee74ea084..113b657ff 100644
--- a/unix/socket.c
+++ b/unix/socket.c
@@ -15,7 +15,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "objtuple.h"
 #include "objarray.h"
 #include "runtime.h"