stmhal: Prefix includes with py/; remove need for -I../py.

drivers/cc3000/src/ccspi.c

@@ -34,13 +34,9 @@
 
 #include <string.h>
 
-#include "stm32f4xx_hal.h"
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "pin.h"
 #include "led.h"
 #include "extint.h"

stmhal/Makefile

@@ -33,7 +33,6 @@ CROSS_COMPILE = arm-none-eabi-
 
 INC =  -I.
 INC += -I..
-INC += -I$(PY_SRC)
 INC += -I$(BUILD)
 INC += -I$(CMSIS_DIR)/inc
 INC += -I$(CMSIS_DIR)/devinc

stmhal/accel.c

@@ -29,12 +29,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "i2c.h"
 #include "accel.h"
 

stmhal/adc.c

@@ -28,13 +28,9 @@
 #include <stm32f4xx_hal.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "binary.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/binary.h"
 #include "adc.h"
 #include "pin.h"
 #include "genhdr/pins.h"

stmhal/boards/stm32f4xx_prefix.c

@@ -1,15 +1,10 @@
 // stm32f4xx_prefix.c becomes the initial portion of the generated pins file.
 
 #include <stdio.h>
-#include <stdint.h>
 
-#include "stm32f4xx_hal.h"
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "pin.h"
+#include MICROPY_HAL_H
 
 #define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
 { \

stmhal/bufhelper.c

@@ -24,10 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "bufhelper.h"
 
 void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data) {

stmhal/can.c

@@ -29,13 +29,9 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objtuple.h"
+#include "py/runtime.h"
 #include "bufhelper.h"
 #include "can.h"
 #include "pybioctl.h"

stmhal/dac.c

@@ -30,13 +30,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "parse.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "timer.h"
 #include "dac.h"
 #include "pin.h"

stmhal/diskio.c

@@ -32,11 +32,7 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include "systick.h"
 #include "rtc.h"
 #include "storage.h"

stmhal/extint.c

@@ -30,15 +30,10 @@
 
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "gc.h"
-#include "obj.h"
-#include "runtime.h"
-#include "pfenv.h"
-
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/pfenv.h"
 #include "pin.h"
 #include "extint.h"
 

stmhal/ffconf.c

@@ -26,10 +26,7 @@
 
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "ff.h"
 #include "ffconf.h"
 #include "fsusermount.h"

stmhal/file.c

@@ -27,13 +27,9 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "stream.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/stream.h"
 #include "file.h"
 #include "ff.h"
 

stmhal/fsusermount.c

@@ -24,12 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "ff.h"
 #include "fsusermount.h"
 

stmhal/gccollect.c

@@ -27,11 +27,8 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
+#include "py/obj.h"
+#include "py/gc.h"
 #include "gccollect.h"
 #include MICROPY_HAL_H
 

stmhal/help.c

@@ -26,11 +26,8 @@
 
 #include <stdio.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 
 STATIC const char *help_text =
 "Welcome to Micro Python!\n"

stmhal/i2c.c

@@ -27,12 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "pin.h"
 #include "genhdr/pins.h"
 #include "bufhelper.h"

stmhal/import.c

@@ -25,12 +25,8 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "lexer.h"
+#include "py/lexer.h"
 #include "ff.h"
 
 mp_import_stat_t mp_import_stat(const char *path) {

stmhal/input.c

@@ -24,13 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "readline.h"
 #include "usb.h"
 

stmhal/irq.c

@@ -24,11 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "irq.h"
 
 #include MICROPY_HAL_H

stmhal/lcd.c

@@ -28,17 +28,11 @@
 #include <string.h>
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 
 #if MICROPY_HW_HAS_LCD
 
-#include "qstr.h"
-#include "parse.h"
-#include "obj.h"
-#include "runtime.h"
-
 #include "pin.h"
 #include "genhdr/pins.h"
 #include "bufhelper.h"

stmhal/led.c

@@ -27,12 +27,8 @@
 #include <stdio.h>
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "timer.h"
 #include "led.h"
 #include "pin.h"

stmhal/lexerfatfs.c

@@ -24,13 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
 #include <stdio.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "lexer.h"
+#include "py/lexer.h"
 #include "lexerfatfs.h"
 #include "ff.h"
 

stmhal/main.c

@@ -27,21 +27,16 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "stm32f4xx_hal.h"
+#include "py/nlr.h"
+#include "py/lexer.h"
+#include "py/parse.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/stackctrl.h"
+#include "py/gc.h"
 
-#include "mpconfig.h"
-#include "misc.h"
 #include "systick.h"
 #include "pendsv.h"
-#include "qstr.h"
-#include "misc.h"
-#include "nlr.h"
-#include "lexer.h"
-#include "parse.h"
-#include "obj.h"
-#include "runtime.h"
-#include "stackctrl.h"
-#include "gc.h"
 #include "gccollect.h"
 #include "readline.h"
 #include "pyexec.h"

stmhal/modnetwork.c

@@ -29,13 +29,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objlist.h"
+#include "py/runtime.h"
 #include "modnetwork.h"
 
 /// \module network - network configuration

stmhal/modnwcc3k.c

@@ -35,16 +35,11 @@
 // CC3000 defines its own ENOBUFS (different to standard one!)
 #undef ENOBUFS
 
-#include "stm32f4xx_hal.h"
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "stream.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objtuple.h"
+#include "py/objlist.h"
+#include "py/stream.h"
+#include "py/runtime.h"
 #include "modnetwork.h"
 #include "pin.h"
 #include "genhdr/pins.h"

stmhal/modnwwiznet5k.c

@@ -29,15 +29,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include "stm32f4xx_hal.h"
-
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objlist.h"
+#include "py/runtime.h"
 #include "modnetwork.h"
 #include "pin.h"
 #include "genhdr/pins.h"

stmhal/modpyb.c

@@ -29,12 +29,9 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/gc.h"
 #include "gccollect.h"
 #include "irq.h"
 #include "systick.h"

stmhal/modstm.c

@@ -29,11 +29,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "portmodules.h"
 
 // To use compile-time constants we are restricted to 31-bit numbers (a small int,

stmhal/moduos.c

@@ -27,12 +27,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/objtuple.h"
 #include "systick.h"
 #include "rng.h"
 #include "storage.h"

stmhal/moduselect.c

@@ -24,16 +24,12 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objlist.h"
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/objlist.h"
 #include "pybioctl.h"
 #include MICROPY_HAL_H
 

stmhal/modusocket.c

@@ -25,18 +25,13 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "objtuple.h"
-#include "objlist.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/objtuple.h"
+#include "py/objlist.h"
+#include "py/runtime.h"
 #include "modnetwork.h"
 
 /******************************************************************************/

stmhal/modutime.c

@@ -28,11 +28,8 @@
 #include <string.h>
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "portmodules.h"
 #include "rtc.h"
 

stmhal/mphal.c

@@ -1,10 +1,7 @@
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
 #include "usb.h"
 #include "mphal.h"
 

stmhal/pendsv.c

@@ -27,11 +27,7 @@
 #include <stdlib.h>
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include "pendsv.h"
 
 static void *pendsv_object = NULL;

stmhal/pin.c

@@ -28,14 +28,10 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include MICROPY_HAL_H
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "pin.h"
+#include MICROPY_HAL_H
 
 /// \moduleref pyb
 /// \class Pin - control I/O pins

stmhal/pin_defs_stmhal.c

@@ -1,11 +1,6 @@
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include MICROPY_HAL_H
+#include "py/obj.h"
 #include "pin.h"
+#include MICROPY_HAL_H
 
 // Returns the pin mode. This value returned by this macro should be one of:
 // GPIO_MODE_INPUT, GPIO_MODE_OUTPUT_PP, GPIO_MODE_OUTPUT_OD,

stmhal/pin_named_pins.c

@@ -25,16 +25,11 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include MICROPY_HAL_H
+#include "py/runtime.h"
 #include "pin.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) {
     pin_named_pins_obj_t *self = self_in;

stmhal/printf.c

@@ -28,15 +28,12 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "pfenv.h"
+#include "py/obj.h"
+#include "py/pfenv.h"
 #include "pybstdio.h"
 
 #if MICROPY_PY_BUILTINS_FLOAT
-#include "formatfloat.h"
+#include "py/formatfloat.h"
 #endif
 
 int pfenv_vprintf(const pfenv_t *pfenv, const char *fmt, va_list args);

stmhal/pybstdio.c

@@ -29,16 +29,12 @@
 #include <string.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "misc.h"
-#include "obj.h"
-#include "stream.h"
-#include MICROPY_HAL_H
+#include "py/obj.h"
+#include "py/stream.h"
 #include "usb.h"
 #include "uart.h"
 #include "pybstdio.h"
+#include MICROPY_HAL_H
 
 // TODO make stdin, stdout and stderr writable objects so they can
 // be changed by Python code.  This requires some changes, as these

stmhal/pyexec.c

@@ -28,14 +28,13 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "obj.h"
-#include "parsehelper.h"
-#include "compile.h"
-#include "runtime.h"
-#include "repl.h"
-#include "gc.h"
+#include "py/nlr.h"
+#include "py/parsehelper.h"
+#include "py/compile.h"
+#include "py/runtime.h"
+#include "py/repl.h"
+#include "py/gc.h"
+#include "py/pfenv.h"
 #ifdef MICROPY_HAL_H
 #include MICROPY_HAL_H
 #endif
@@ -44,7 +43,6 @@
 #include "pyexec.h"
 #include "pybstdio.h"
 #include "genhdr/py-version.h"
-#include "pfenv.h"
 
 pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
 STATIC bool repl_display_debugging_info = 0;

stmhal/readline.c

@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "misc.h"
+#include "py/mpconfig.h"
+#include "py/misc.h"
 #include "readline.h"
 #include "pybstdio.h"
 

stmhal/rng.c

@@ -28,10 +28,7 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "rng.h"
 
 #if MICROPY_HW_ENABLE_RNG

stmhal/rtc.c

@@ -28,11 +28,7 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include "rtc.h"
 
 /// \moduleref pyb

stmhal/sdcard.c

@@ -28,12 +28,8 @@
 
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "sdcard.h"
 #include "pin.h"
 #include "genhdr/pins.h"

stmhal/servo.c

@@ -28,12 +28,8 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "timer.h"
 #include "servo.h"
 

stmhal/spi.c

@@ -27,12 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
 #include "irq.h"
 #include "pin.h"
 #include "genhdr/pins.h"

stmhal/stm32f4xx_it.c

@@ -70,10 +70,7 @@
 #include "stm32f4xx_it.h"
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "extint.h"
 #include "timer.h"
 #include "uart.h"

stmhal/storage.c

@@ -28,11 +28,8 @@
 #include <string.h>
 #include <stm32f4xx_hal.h>
 
-#include "mpconfig.h"
-#include "misc.h"
+#include "py/obj.h"
 #include "systick.h"
-#include "qstr.h"
-#include "obj.h"
 #include "led.h"
 #include "flash.h"
 #include "storage.h"

stmhal/systick.c

@@ -25,11 +25,8 @@
  */
 
 #include <stm32f4xx_hal.h>
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+
+#include "py/obj.h"
 #include "irq.h"
 #include "systick.h"
 

stmhal/timer.c

@@ -32,17 +32,13 @@
 #include "usbd_cdc_msc_hid.h"
 #include "usbd_cdc_interface.h"
 
-#include "nlr.h"
-#include "misc.h"
-#include "mpconfig.h"
-#include "qstr.h"
-#include "gc.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/pfenv.h"
 #include "timer.h"
 #include "servo.h"
 #include "pin.h"
-#include "pfenv.h"
 
 /// \moduleref pyb
 /// \class Timer - periodically call a function

stmhal/uart.c

@@ -29,13 +29,9 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "stream.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/stream.h"
 #include "uart.h"
 #include "pybioctl.h"
 #include MICROPY_HAL_H

stmhal/usb.c

@@ -34,12 +34,8 @@
 #include "usbd_cdc_interface.h"
 #include "usbd_msc_storage.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "stream.h"
+#include "py/runtime.h"
+#include "py/stream.h"
 #include "bufhelper.h"
 #include "usb.h"
 #include "pybioctl.h"

stmhal/usbd_conf.h

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/

stmhal/usbd_msc_storage.c

@@ -34,7 +34,7 @@
 #include "usbd_cdc_msc_hid.h"
 #include "usbd_msc_storage.h"
 
-#include "misc.h"
+#include "py/misc.h"
 #include "storage.h"
 #include "diskio.h"
 #include "sdcard.h"

stmhal/usrsw.c

@@ -28,11 +28,7 @@
 
 #include "stm32f4xx_hal.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include "extint.h"
 #include "pin.h"
 #include "genhdr/pins.h"