all: Remove inclusion of internal py header files.

Header files that are considered internal to the py core and should not
normally be included directly are:
    py/nlr.h - internal nlr configuration and declarations
    py/bc0.h - contains bytecode macro definitions
    py/runtime0.h - contains basic runtime enums

Instead, the top-level header files to include are one of:
    py/obj.h - includes runtime0.h and defines everything to use the
        mp_obj_t type
    py/runtime.h - includes mpstate.h and hence nlr.h, obj.h, runtime0.h,
        and defines everything to use the general runtime support functions

Additional, specific headers (eg py/objlist.h) can be included if needed.

drivers/cc3000/src/ccspi.c

@@ -34,8 +34,6 @@
 
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "pin.h"
 #include "led.h"

extmod/machine_mem.c

@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
 #include "extmod/machine_mem.h"
-#include "py/nlr.h"
 
 #if MICROPY_PY_MACHINE
 

extmod/modbtree.c

@@ -29,9 +29,7 @@
 #include <errno.h> // for declaration of global errno variable
 #include <fcntl.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
-#include "py/runtime0.h"
 #include "py/stream.h"
 
 #if MICROPY_PY_BTREE

extmod/modframebuf.c

@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_FRAMEBUF

extmod/modlwip.c

@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "py/nlr.h"
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/stream.h"

extmod/modubinascii.c

@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "extmod/modubinascii.h"

extmod/moductypes.c

@@ -28,7 +28,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/objtuple.h"
 #include "py/binary.h"

extmod/moduhashlib.c

@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_UHASHLIB

extmod/moduheapq.c

@@ -24,9 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "py/nlr.h"
 #include "py/objlist.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_UHEAPQ

extmod/modujson.c

@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 
-#include "py/nlr.h"
 #include "py/objlist.h"
 #include "py/objstringio.h"
 #include "py/parsenum.h"

extmod/modurandom.c

@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <string.h>
 
-//#include "py/nlr.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_URANDOM

extmod/modure.c

@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/objstr.h"

extmod/modussl_axtls.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 

extmod/modussl_mbedtls.c

@@ -31,10 +31,8 @@
 #include <string.h>
 #include <errno.h> // needed because mp_is_nonblocking_error uses system error codes
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/stream.h"
-#include "py/obj.h"
 
 // mbedtls_time_t
 #include "mbedtls/platform.h"

extmod/modutimeq.c

@@ -27,9 +27,7 @@
 
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/objlist.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/smallint.h"
 

extmod/moduzlib.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mperrno.h"

extmod/modwebrepl.c

@@ -28,8 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/builtin.h"

extmod/modwebsocket.c

@@ -28,8 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "extmod/modwebsocket.h"

extmod/uos_dupterm.c

@@ -27,7 +27,6 @@
 #include <string.h>
 #include "py/mpconfig.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/objtuple.h"
 #include "py/objarray.h"

extmod/vfs.c

@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/objstr.h"
 #include "py/mperrno.h"

extmod/vfs_fat.c

@@ -33,7 +33,6 @@
 #endif
 
 #include <string.h>
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "lib/oofatfs/ff.h"

extmod/vfs_fat_file.c

@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mperrno.h"

extmod/vfs_fat_misc.c

@@ -28,7 +28,6 @@
 #if MICROPY_VFS_FAT
 
 #include <string.h>
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs_fat.h"

lib/netutils/netutils.c

@@ -29,8 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/obj.h"
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "lib/netutils/netutils.h"
 

lib/utils/pyexec.c

@@ -29,7 +29,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"

mpy-cross/main.c

@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "py/mpstate.h"
 #include "py/compile.h"
 #include "py/persistentcode.h"
 #include "py/runtime.h"

ports/bare-arm/main.c

@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"

ports/cc3200/ftp/ftp.c

@@ -27,8 +27,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "py/mpstate.h"
-#include "py/obj.h"
+#include "py/runtime.h"
 #include "lib/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"

ports/cc3200/hal/cc3200_hal.c

@@ -33,7 +33,6 @@
 #include <string.h>
 
 
-#include "py/mpstate.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/objstr.h"

ports/cc3200/misc/mpexception.c

@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "mpexception.h"
 
 

ports/cc3200/mods/modmachine.c

@@ -27,7 +27,6 @@
 
 #include <stdint.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "irq.h"

ports/cc3200/mods/modnetwork.c

@@ -25,9 +25,6 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpstate.h"
-#include "py/obj.h"
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"

ports/cc3200/mods/modubinascii.c

@@ -25,8 +25,6 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpconfig.h"
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "extmod/modubinascii.h"

ports/cc3200/mods/moduhashlib.c

@@ -30,7 +30,6 @@
 
 #include "py/mpconfig.h"
 #include MICROPY_HAL_H
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"

ports/cc3200/mods/moduos.c

@@ -28,8 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "py/runtime.h"

ports/cc3200/mods/pybadc.c

@@ -28,8 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/mpconfig.h"
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/gc.h"

ports/cc3200/mods/pybi2c.c

@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"

ports/cc3200/mods/pybpin.c

@@ -29,11 +29,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpconfig.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "py/gc.h"
-#include "py/mpstate.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"

ports/cc3200/mods/pybsleep.c

@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "inc/hw_types.h"

ports/cc3200/mods/pybspi.c

@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "bufhelper.h"

ports/cc3200/mods/pybtimer.c

@@ -29,9 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/mpconfig.h"
-#include "py/obj.h"
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mperrno.h"

ports/cc3200/mods/pybuart.c

@@ -29,8 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/mpconfig.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "py/objlist.h"
 #include "py/stream.h"
@@ -48,7 +46,6 @@
 #include "mpirq.h"
 #include "pybsleep.h"
 #include "mpexception.h"
-#include "py/mpstate.h"
 #include "osi.h"
 #include "utils.h"
 #include "pin.h"

ports/cc3200/mpthreadport.c

@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#include "py/mpconfig.h"
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mpthread.h"

ports/cc3200/util/gccollect.c

@@ -28,8 +28,6 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "py/mpconfig.h"
-#include "py/mpstate.h"
 #include "py/gc.h"
 #include "py/mpthread.h"
 #include "gccollect.h"

ports/esp8266/esp_mphal.c

@@ -31,8 +31,6 @@
 #include "esp_mphal.h"
 #include "user_interface.h"
 #include "ets_alt_task.h"
-#include "py/obj.h"
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "extmod/misc.h"
 #include "lib/utils/pyexec.h"

ports/esp8266/machine_adc.c

@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "user_interface.h"
 

ports/esp8266/machine_pin.c

@@ -33,7 +33,6 @@
 #include "user_interface.h"
 #include "gpio.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"

ports/esp8266/machine_pwm.c

@@ -29,7 +29,6 @@
 
 #include "esppwm.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "modmachine.h"
 

ports/esp8266/machine_rtc.c

@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "lib/timeutils/timeutils.h"
 #include "user_interface.h"

ports/esp8266/machine_wdt.c

@@ -27,8 +27,6 @@
 //#include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "user_interface.h"
 #include "etshal.h"

ports/esp8266/main.c

@@ -27,9 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/compile.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/mperrno.h"

ports/esp8266/modnetwork.c

@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/mphal.h"

ports/esp8266/modutime.c

@@ -28,8 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/gc.h"
 #include "py/runtime.h"
 #include "py/mphal.h"

ports/minimal/main.c

@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"

ports/qemu-arm/main.c

@@ -4,10 +4,8 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "py/nlr.h"
 #include "py/obj.h"
 #include "py/compile.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/gc.h"

ports/qemu-arm/test_main.c

@@ -4,10 +4,8 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "py/nlr.h"
 #include "py/obj.h"
 #include "py/compile.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/gc.h"

ports/stm32/accel.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "pin.h"
 #include "genhdr/pins.h"

ports/stm32/adc.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/mphal.h"

ports/stm32/can.c

@@ -28,7 +28,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "py/nlr.h"
 #include "py/objtuple.h"
 #include "py/runtime.h"
 #include "py/gc.h"

ports/stm32/gccollect.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "py/mpstate.h"
 #include "py/obj.h"
 #include "py/gc.h"
 #include "py/mpthread.h"

ports/stm32/i2c.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "irq.h"

ports/stm32/irq.c

@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "py/nlr.h"
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "irq.h"

ports/stm32/lcd.c

@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "py/nlr.h"
 #include "py/runtime.h"
 
 #if MICROPY_HW_HAS_LCD

ports/stm32/led.c

@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "timer.h"

ports/stm32/modmachine.h

@@ -26,8 +26,6 @@
 #ifndef MICROPY_INCLUDED_STMHAL_MODMACHINE_H
 #define MICROPY_INCLUDED_STMHAL_MODMACHINE_H
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/obj.h"
 
 void machine_init(void);

ports/stm32/modnetwork.c

@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "modnetwork.h"

ports/stm32/modnwcc3k.c

@@ -30,7 +30,6 @@
 // CC3000 defines its own ENOBUFS (different to standard one!)
 #undef ENOBUFS
 
-#include "py/nlr.h"
 #include "py/objtuple.h"
 #include "py/objlist.h"
 #include "py/stream.h"

ports/stm32/modnwwiznet5k.c

@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"

ports/stm32/modpyb.c

@@ -27,8 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/obj.h"
 #include "py/gc.h"
 #include "py/builtin.h"

ports/stm32/moduos.c

@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/objtuple.h"
 #include "py/objstr.h"

ports/stm32/modusocket.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/objtuple.h"
 #include "py/objlist.h"
 #include "py/runtime.h"

ports/stm32/mphalport.c

@@ -1,6 +1,5 @@
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"

ports/stm32/mpthreadport.c

@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#include "py/mpconfig.h"
-#include "py/mpstate.h"
 #include "py/gc.h"
 #include "py/mpthread.h"
 #include "gccollect.h"

ports/stm32/pendsv.c

@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "lib/utils/interrupt_char.h"
 #include "pendsv.h"

ports/stm32/pin.c

@@ -28,7 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/virtpin.h"

ports/stm32/sdcard.c

@@ -26,7 +26,6 @@
 
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "lib/oofatfs/ff.h"

ports/stm32/spi.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/machine_spi.h"

ports/stm32/stm32_it.c

@@ -67,7 +67,6 @@
 
 #include <stdio.h>
 
-#include "py/mpstate.h"
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "stm32_it.h"

ports/stm32/uart.c

@@ -28,7 +28,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mperrno.h"

ports/teensy/led.c

@@ -2,7 +2,6 @@
 
 #include "Arduino.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "led.h"

ports/teensy/teensy_hal.c

@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "usb.h"

ports/teensy/timer.c

@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stddef.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"

ports/teensy/uart.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "bufhelper.h"
 #include "uart.h"

ports/unix/file.c

@@ -31,7 +31,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/builtin.h"

ports/unix/main.c

@@ -37,8 +37,6 @@
 #include <errno.h>
 #include <signal.h>
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/builtin.h"

ports/unix/modffi.c

@@ -32,7 +32,6 @@
 #include <ffi.h>
 #include <stdint.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/mperrno.h"

ports/unix/modjni.c

@@ -30,8 +30,6 @@
 #include <dlfcn.h>
 #include <ctype.h>
 
-#include "py/nlr.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 

ports/unix/modos.c

@@ -34,7 +34,6 @@
 #include <dirent.h>
 #include "py/mpconfig.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/objtuple.h"
 #include "py/mphal.h"

ports/unix/modsocket.c

@@ -38,7 +38,6 @@
 #include <netdb.h>
 #include <errno.h>
 
-#include "py/nlr.h"
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "py/runtime.h"

ports/unix/mpthreadport.c

@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "py/mpstate.h"
 #include "py/runtime.h"
 #include "py/mpthread.h"
 #include "py/gc.h"

ports/unix/unix_mphal.c

@@ -29,7 +29,6 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include "py/mpstate.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "extmod/misc.h"

ports/zephyr/machine_pin.c

@@ -32,7 +32,6 @@
 #include <zephyr.h>
 #include <gpio.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"

ports/zephyr/main.c

@@ -33,7 +33,6 @@
 #include <net/net_context.h>
 #endif
 
-#include "py/nlr.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"

py/argcheck.c

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 
 void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_args_max, bool takes_kw) {

py/bc.c

@@ -29,9 +29,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
-#include "py/objfun.h"
-#include "py/runtime0.h"
+#include "py/runtime.h"
 #include "py/bc0.h"
 #include "py/bc.h"
 

py/bc.h

@@ -27,7 +27,6 @@
 #define MICROPY_INCLUDED_PY_BC_H
 
 #include "py/runtime.h"
-#include "py/obj.h"
 #include "py/objfun.h"
 
 // bytecode layout:

py/builtinevex.c

@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 
-#include "py/nlr.h"
 #include "py/objfun.h"
 #include "py/compile.h"
 #include "py/runtime.h"

py/builtinimport.c

@@ -29,7 +29,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/compile.h"
 #include "py/objmodule.h"
 #include "py/persistentcode.h"

py/emit.h

@@ -28,7 +28,6 @@
 
 #include "py/lexer.h"
 #include "py/scope.h"
-#include "py/runtime0.h"
 
 /* Notes on passes:
  * We don't know exactly the opcodes in pass 1 because they depend on the

py/emitnative.c

@@ -46,7 +46,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/emit.h"
 #include "py/bc.h"