diff --git a/cc3200/application.mk b/cc3200/application.mk
index 1762d1f6a79226bdfcd3ad64182d44c9a2c7fc61..25139ecf7f90b9751e6c6f4abaf6c4cf604e3bd7 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 38814706cd770de978c508251c0fd753946be394..27f388d95a20c684c08dc140af7622d9546ea48d 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 757770f60ce225e2c644ca06be81ba99f4de413b..b3e12c14bbf8eec4a1b57bcfbb9c71432192ed0b 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 83041d6463b6f5128ca5093ec41d628d30f96ca3..8a6b5704d76d26052447f832c89754a8a78df948 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 29d92dd64a995de121f6ecef2ce80f872be3616c..fbe73ebde76ff5caffb9cc5cb10bcbfb13383d6c 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 a2f61b7d66e0d9ff15ebb8e1c233f796dda2497a..54343487a252345c978723499e7fffa9891c5c41 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 f23d2412853051d75f90694ad39b0db1f1abc367..95633e066a7a89725ffd11f35412b3ff9dad134d 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 f4b56f3de602cc6625cea3cba05fde9641d61a4f..4d3a79a49c1c8cd62b9e066a84a4d9e3df3dbcab 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 40c22cd755f872208c434fc8e1500fcb94e35f19..622022b82d367c7181f8f77aa25691ea163375d9 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 79bf08c2e76473c91ab80d785fda8ff6ced6283f..f43818fe19295ee3f268af169c7b514f18975579 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 426d82bae75f452757884b4d5e84eca9b1381204..1fda9f62e22b4dec85533229630e3daab7b7bc1c 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 20e93d384ffb6632b3e7d3a259542bbad2622d78..54d3025ba189685f08b41eb88968dc7117212a27 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 4fd5b02ad3831e5ad5f34542e3c345eb660d640f..cfaae731080f7b41b97a8e446e0a238a98d04985 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 67e800e051009478a84a27f00c82d22a457a48db..c681d4945213216948f1643835fdf0703e5701b2 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 12fd3d8ad905455391ce8dea381b7b8f8dec9e0a..a615a0f06d21b9ada1f23f86c4d2307206f2dda5 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 91cd997867624be168e64ed92b423b112e2753c9..dbbebe539a044a96f40b9ab7c3458f5a1d1daaf0 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 a1f0bd2641dd3b9a7cd959bcce355621a61b3a35..e585161bc07433f611f1e410be305fb9d997ae38 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 1b3505b0d7050e5f2daf1ca4e5d47d7a07633d6f..b2a12900e6f94d655ca316cb0d07ca9719dfc0c2 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 2e100aecb4815dc426356d324d547cd705904489..7b5ae5f0065af4f971c30346bef0bece0b6de5f9 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 976c2bb33727d00bf938dca95df6ee8bf29f24ba..80a4f74aca4689fa096854dc0a8947c7de8954af 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 9058a4817b9093852f9e7a47f1e48f367ddb9ae5..418f3608a8b050c464ca3453066734fe1f086b19 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 7356942f212dc870c2d0e0790758af87f0edc61c..743db53d5e16e97251446d7c0fcf88a7218f3b2d 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 9dae880e6e55dd169193528c5078f1498cf2fb87..07896512d854b300c7efe9696935e32100c0a98f 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 013437a0464040f19e339e0d8fbb7830ca2a71d6..7f60fa174c2a8661b16937ed43fc9b023ed367cd 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 6af2f476c0b35e6ffa54d2fd0ac7df080fc0f426..9b882c033d3060dc7913fef24df7eef28aff208b 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 ca0d3de7394301840958c7111c61e4c7698efd54..a98dbdba78a3425afd3b5f638f33df915b46fa0a 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 5d47134a6d32b829ecafffdbb0be95af16ed9e6d..d10fbd8e8076d0ead0284701a052a477b73f6999 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 ee71ffb8d867801296a97212baa1be4d57fa46c7..505c2a105ed3e7842666884fa9ba7fdfd22e303b 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 8d4383068099cee810b31b6eae7cf456b1508901..5d6c2a7ca1d75f2cfba07200ae148773a19ebccf 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 7c0cd70255c1ac9f80e894a81b594e6d04decef1..40fcd340fbb913ee9b93e8eab2fde7d990784f1d 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 e934ab7dd4739822513c378bec0472cb729c71d8..0bc80f5b5efaddc1350ad33baed195c4033f3579 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 e608dcce76ff8f0aea022c2194dea238da07d7a2..651d58004423de0acfab0e0439cc8460f6d9dcd4 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 39e6e9ecf4e933c15f72b2ff68d8aa77b8bcc8d1..acab12eaea055342d299426b08621c9bb9007cdb 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 44e3ee1915eacf08ba430ea2b45f18927f6ea6b7..f942e2f6796e4351eb8bf152207c251f8d717732 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 5ea72b280daec506a8986eac4c308c31c96ca181..6ed97cc0ed5fe119dfd2f2001441130710355c5d 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 9ab19d63dd74239df49b20da8e24d9234335222e..a1b0f802ad1090ed78cfbed38fe4eb139ddd12dd 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