cc3200: Add explicit py/ path-prefix for py includes.

This is how it should be, so one knows exactly where the includes are
coming from.

36 files changed, 64 insertions, 179 deletions

diff --git a/cc3200/application.mk b/cc3200/application.mk
index 1762d1f6a7..25139ecf7f 100644
--- a/cc3200/application.mk
+++ b/cc3200/application.mk
@@ -16,7 +16,6 @@ APP_INC += -Isimplelink/oslib
 APP_INC += -Itelnet
 APP_INC += -Iutil
 APP_INC += -Ibootmgr
-APP_INC += -I$(PY_SRC)
 APP_INC += -I$(BUILD)
 APP_INC += -I$(BUILD)/genhdr
 APP_INC += -I../lib/fatfs
diff --git a/cc3200/boards/cc3200_prefix.c b/cc3200/boards/cc3200_prefix.c
index 38814706cd..27f388d95a 100644
--- a/cc3200/boards/cc3200_prefix.c
+++ b/cc3200/boards/cc3200_prefix.c
@@ -30,10 +30,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
 #include "inc/hw_types.h"
 #include "inc/hw_memmap.h"
 #include "pybpin.h"
diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk
index 757770f60c..b3e12c14bb 100644
--- a/cc3200/bootmgr/bootloader.mk
+++ b/cc3200/bootmgr/bootloader.mk
@@ -10,7 +10,6 @@ BOOT_INC += -Isimplelink/oslib
 BOOT_INC += -Iutil
 BOOT_INC += -I..
 BOOT_INC += -I.
-BOOT_INC += -I$(PY_SRC)
 BOOT_INC += -I$(BUILD)
 
 BOOT_CPPDEFINES = -Dgcc -DBOOTLOADER -DTARGET_IS_CC3200 -DSL_TINY
@@ -120,4 +119,3 @@ $(HEADER_BUILD)/qstrdefs.generated.h: | $(HEADER_BUILD)
 # Create an empty "py-version.h" needed by py/mkrules.mk
 $(HEADER_BUILD)/py-version.h: | $(HEADER_BUILD)
 	touch $@
-	
\ No newline at end of file
diff --git a/cc3200/fatfs/src/diskio.c b/cc3200/fatfs/src/diskio.c
index 83041d6463..8a6b5704d7 100644
--- a/cc3200/fatfs/src/diskio.c
+++ b/cc3200/fatfs/src/diskio.c
@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include "diskio.h"		        /* FatFs lower layer API */
 #include "sflash_diskio.h"      /* Serial flash disk IO API */
 #if MICROPY_HW_HAS_SDCARD
diff --git a/cc3200/fatfs/src/drivers/sd_diskio.c b/cc3200/fatfs/src/drivers/sd_diskio.c
index 29d92dd64a..fbe73ebde7 100644
--- a/cc3200/fatfs/src/drivers/sd_diskio.c
+++ b/cc3200/fatfs/src/drivers/sd_diskio.c
@@ -37,15 +37,8 @@
 //*****************************************************************************
 #include <stdbool.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
 #include "hw_types.h"
 #include "hw_memmap.h"
 #include "hw_ints.h"
diff --git a/cc3200/fatfs/src/drivers/sflash_diskio.c b/cc3200/fatfs/src/drivers/sflash_diskio.c
index a2f61b7d66..54343487a2 100644
--- a/cc3200/fatfs/src/drivers/sflash_diskio.c
+++ b/cc3200/fatfs/src/drivers/sflash_diskio.c
@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include "std.h"
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
 #include "simplelink.h"
 #include "diskio.h"
diff --git a/cc3200/fatfs/src/ffconf.c b/cc3200/fatfs/src/ffconf.c
index f23d241285..95633e066a 100644
--- a/cc3200/fatfs/src/ffconf.c
+++ b/cc3200/fatfs/src/ffconf.c
@@ -27,10 +27,8 @@
 #include <string.h>
 #include <std.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/misc.h"
 #include "ff.h"
 #include "ffconf.h"
 #include "diskio.h"
diff --git a/cc3200/fatfs/src/ffconf.h b/cc3200/fatfs/src/ffconf.h
index f4b56f3de6..4d3a79a49c 100644
--- a/cc3200/fatfs/src/ffconf.h
+++ b/cc3200/fatfs/src/ffconf.h
@@ -3,7 +3,7 @@
 /---------------------------------------------------------------------------*/
 
 #include <stdint.h>
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include "FreeRTOS.h"
 #include "task.h"
 #include "semphr.h"
diff --git a/cc3200/fatfs/src/option/syscall.c b/cc3200/fatfs/src/option/syscall.c
index 40c22cd755..622022b82d 100644
--- a/cc3200/fatfs/src/option/syscall.c
+++ b/cc3200/fatfs/src/option/syscall.c
@@ -3,12 +3,8 @@
 /* (C)ChaN, 2014                                                          */
 /*------------------------------------------------------------------------*/
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
 #include "ff.h"
 
 
diff --git a/cc3200/ftp/ftp.c b/cc3200/ftp/ftp.c
index 79bf08c2e7..f43818fe19 100644
--- a/cc3200/ftp/ftp.c
+++ b/cc3200/ftp/ftp.c
@@ -28,12 +28,9 @@
 #include <ctype.h>
 #include <std.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "osi.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
diff --git a/cc3200/ftp/updater.c b/cc3200/ftp/updater.c
index 426d82bae7..1fda9f62e2 100644
--- a/cc3200/ftp/updater.c
+++ b/cc3200/ftp/updater.c
@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include "std.h"
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
 #include "simplelink.h"
 #include "flc.h"
diff --git a/cc3200/main.c b/cc3200/main.c
index 20e93d384f..54d3025ba1 100644
--- a/cc3200/main.c
+++ b/cc3200/main.c
@@ -28,11 +28,8 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
 #include "mptask.h"
 #include "simplelink.h"
 #include "osi.h"
diff --git a/cc3200/misc/FreeRTOSHooks.c b/cc3200/misc/FreeRTOSHooks.c
index 4fd5b02ad3..cfaae73108 100644
--- a/cc3200/misc/FreeRTOSHooks.c
+++ b/cc3200/misc/FreeRTOSHooks.c
@@ -28,11 +28,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "inc/hw_memmap.h"
 #include "pybuart.h"
 #include "osi.h"
diff --git a/cc3200/misc/help.c b/cc3200/misc/help.c
index 67e800e051..c681d49452 100644
--- a/cc3200/misc/help.c
+++ b/cc3200/misc/help.c
@@ -27,11 +27,8 @@
 
 #include <stdio.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
 
 STATIC const char help_text[] = "Welcome to Micro Python!\n"
                                 "For online help please visit http://micropython.org/help/.\n"
diff --git a/cc3200/misc/mperror.c b/cc3200/misc/mperror.c
index 12fd3d8ad9..a615a0f06d 100644
--- a/cc3200/misc/mperror.c
+++ b/cc3200/misc/mperror.c
@@ -29,12 +29,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "inc/hw_memmap.h"
 #include "pybuart.h"
 #include "utils.h"
diff --git a/cc3200/misc/mpexception.c b/cc3200/misc/mpexception.c
index 91cd997867..dbbebe539a 100644
--- a/cc3200/misc/mpexception.c
+++ b/cc3200/misc/mpexception.c
@@ -30,11 +30,6 @@
 #include <std.h>
 
 #include "py/mpstate.h"
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
 #include "mpexception.h"
 
 
diff --git a/cc3200/misc/pin_defs_cc3200.c b/cc3200/misc/pin_defs_cc3200.c
index a1f0bd2641..e585161bc0 100644
--- a/cc3200/misc/pin_defs_cc3200.c
+++ b/cc3200/misc/pin_defs_cc3200.c
@@ -25,11 +25,8 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
@@ -38,7 +35,6 @@
 #include "gpio.h"
 #include "pin.h"
 #include "pybpin.h"
-#include "runtime.h"
 #include MICROPY_HAL_H
 
 
diff --git a/cc3200/misc/pin_named_pins.c b/cc3200/misc/pin_named_pins.c
index 1b3505b0d7..b2a12900e6 100644
--- a/cc3200/misc/pin_named_pins.c
+++ b/cc3200/misc/pin_named_pins.c
@@ -29,15 +29,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
 #include "pybpin.h"
-#include "runtime.h"
 #include MICROPY_HAL_H
 
 STATIC void pin_named_pins_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
diff --git a/cc3200/mods/modnetwork.c b/cc3200/mods/modnetwork.c
index 2e100aecb4..7b5ae5f006 100644
--- a/cc3200/mods/modnetwork.c
+++ b/cc3200/mods/modnetwork.c
@@ -29,17 +29,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpstate.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
-#include "runtime.h"
 #include "modnetwork.h"
 #include "mpexception.h"
-#include "mpstate.h"
 
 /// \module network - network configuration
 ///
diff --git a/cc3200/mods/modpyb.c b/cc3200/mods/modpyb.c
index 976c2bb337..80a4f74aca 100644
--- a/cc3200/mods/modpyb.c
+++ b/cc3200/mods/modpyb.c
@@ -30,14 +30,7 @@
 #include <stdint.h>
 
 #include "py/mpstate.h"
-#include "mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
-#include "gccollect.h"
 #include "irq.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c
index 9058a4817b..418f3608a8 100644
--- a/cc3200/mods/moduos.c
+++ b/cc3200/mods/moduos.c
@@ -29,12 +29,10 @@
 #include <string.h>
 #include "std.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
+#include "py/mpconfig.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/objtuple.h"
 #include "ff.h"
 #include "diskio.h"
 #include "sflash_diskio.h"
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
index 7356942f21..743db53d5e 100644
--- a/cc3200/mods/modusocket.c
+++ b/cc3200/mods/modusocket.c
@@ -30,18 +30,11 @@
 #include <string.h>
 
 #include "simplelink.h"
-#include "mpconfig.h"
+#include "py/mpstate.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include "modnetwork.h"
 #include "mpexception.h"
-#include "mpstate.h"
 
 /******************************************************************************/
 // socket class
diff --git a/cc3200/mods/modutime.c b/cc3200/mods/modutime.c
index 9dae880e6e..07896512d8 100644
--- a/cc3200/mods/modutime.c
+++ b/cc3200/mods/modutime.c
@@ -28,12 +28,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "modutime.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
index 013437a046..7f60fa174c 100644
--- a/cc3200/mods/modwlan.c
+++ b/cc3200/mods/modwlan.c
@@ -29,15 +29,10 @@
 #include <stdbool.h>
 
 #include "simplelink.h"
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "modnetwork.h"
 #include "modwlan.h"
 #include "pybioctl.h"
diff --git a/cc3200/mods/pybadc.c b/cc3200/mods/pybadc.c
index 6af2f476c0..9b882c033d 100644
--- a/cc3200/mods/pybadc.c
+++ b/cc3200/mods/pybadc.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
 #include "py/nlr.h"
 #include "py/runtime.h"
diff --git a/cc3200/mods/pybextint.c b/cc3200/mods/pybextint.c
index ca0d3de739..a98dbdba78 100644
--- a/cc3200/mods/pybextint.c
+++ b/cc3200/mods/pybextint.c
@@ -29,14 +29,10 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpstate.h"
 #include MICROPY_HAL_H
-#include "py/nlr.h"
-#include "misc.h"
-#include "qstr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
-#include "py/pfenv.h"
 #include "py/objlist.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
@@ -49,7 +45,6 @@
 #include "pybextint.h"
 #include "mpexception.h"
 #include "interrupt.h"
-#include "mpstate.h"
 #include "cc3200_asm.h"
 
 /// \moduleref pyb
diff --git a/cc3200/mods/pybi2c.c b/cc3200/mods/pybi2c.c
index 5d47134a6d..d10fbd8e80 100644
--- a/cc3200/mods/pybi2c.c
+++ b/cc3200/mods/pybi2c.c
@@ -29,13 +29,8 @@
 #include <string.h>
 
 #include "py/mpstate.h"
-#include "mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include "bufhelper.h"
 #include "inc/hw_types.h"
 #include "inc/hw_i2c.h"
diff --git a/cc3200/mods/pybpin.c b/cc3200/mods/pybpin.c
index ee71ffb8d8..505c2a105e 100644
--- a/cc3200/mods/pybpin.c
+++ b/cc3200/mods/pybpin.c
@@ -29,13 +29,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
diff --git a/cc3200/mods/pybrtc.c b/cc3200/mods/pybrtc.c
index 8d43830680..5d6c2a7ca1 100644
--- a/cc3200/mods/pybrtc.c
+++ b/cc3200/mods/pybrtc.c
@@ -27,12 +27,10 @@
 
 #include <stdio.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "modutime.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
diff --git a/cc3200/mods/pybsd.c b/cc3200/mods/pybsd.c
index 7c0cd70255..40fcd340fb 100644
--- a/cc3200/mods/pybsd.c
+++ b/cc3200/mods/pybsd.c
@@ -24,13 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
diff --git a/cc3200/mods/pybsystick.c b/cc3200/mods/pybsystick.c
index e934ab7dd4..0bc80f5b5e 100644
--- a/cc3200/mods/pybsystick.c
+++ b/cc3200/mods/pybsystick.c
@@ -25,12 +25,9 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "irq.h"
 #include "pybsystick.h"
 #include "systick.h"
diff --git a/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c
index e608dcce76..651d580044 100644
--- a/cc3200/mods/pybuart.c
+++ b/cc3200/mods/pybuart.c
@@ -30,15 +30,12 @@
 #include <errno.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "py/objlist.h"
-#include "stream.h"
+#include "py/stream.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
diff --git a/cc3200/mptask.c b/cc3200/mptask.c
index 39e6e9ecf4..acab12eaea 100644
--- a/cc3200/mptask.c
+++ b/cc3200/mptask.c
@@ -28,18 +28,11 @@
 #include <stdint.h>
 #include <std.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "lexer.h"
-#include "parse.h"
-#include "obj.h"
-#include "compile.h"
-#include "runtime0.h"
-#include "runtime.h"
-#include "repl.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/gc.h"
 #include "inc/hw_memmap.h"
 #include "inc/hw_types.h"
 #include "pin.h"
@@ -50,7 +43,6 @@
 #include "gccollect.h"
 #include "gchelper.h"
 #include "readline.h"
-#include "gc.h"
 #include "osi.h"
 #include "mptask.h"
 #include "mperror.h"
diff --git a/cc3200/serverstask.c b/cc3200/serverstask.c
index 44e3ee1915..f942e2f679 100644
--- a/cc3200/serverstask.c
+++ b/cc3200/serverstask.c
@@ -27,12 +27,9 @@
 #include <stdint.h>
 #include <std.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/misc.h"
 #include "osi.h"
 #include "simplelink.h"
 #include "serverstask.h"
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
index 5ea72b280d..6ed97cc0ed 100644
--- a/cc3200/telnet/telnet.c
+++ b/cc3200/telnet/telnet.c
@@ -27,12 +27,9 @@
 #include <stdint.h>
 #include <std.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "telnet.h"
 #include "simplelink.h"
 #include "modwlan.h"
diff --git a/cc3200/util/gccollect.c b/cc3200/util/gccollect.c
index 9ab19d63dd..a1b0f802ad 100644
--- a/cc3200/util/gccollect.c
+++ b/cc3200/util/gccollect.c
@@ -28,11 +28,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
+#include "py/mpconfig.h"
+#include "py/gc.h"
 #include "gccollect.h"
 #include "gchelper.h"
 #include MICROPY_HAL_H