6 files changed, 10 insertions, 30 deletions
diff --git a/cc3200/misc/FreeRTOSHooks.c b/cc3200/misc/FreeRTOSHooks.c
index 4fd5b02ad..cfaae7310 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 67e800e05..c681d4945 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 12fd3d8ad..a615a0f06 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 91cd99786..dbbebe539 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 a1f0bd264..e585161bc 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 1b3505b0d..b2a12900e 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) {