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

18 files changed, 30 insertions, 90 deletions

diff --git a/stmhal/pin.c b/stmhal/pin.c
index b71c93efc3..91d5d916da 100644
--- a/stmhal/pin.c
+++ b/stmhal/pin.c
@@ -30,8 +30,8 @@
 
 #include "py/nlr.h"
 #include "py/runtime.h"
-#include "pin.h"
 #include MICROPY_HAL_H
+#include "pin.h"
 
 /// \moduleref pyb
 /// \class Pin - control I/O pins
diff --git a/stmhal/pin_named_pins.c b/stmhal/pin_named_pins.c
index 420a5d9e0a..f6ee165711 100644
--- a/stmhal/pin_named_pins.c
+++ b/stmhal/pin_named_pins.c
@@ -28,8 +28,8 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "pin.h"
 #include MICROPY_HAL_H
+#include "pin.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;
diff --git a/teensy/Makefile b/teensy/Makefile
index 20ba41901d..bf3da67801 100644
--- a/teensy/Makefile
+++ b/teensy/Makefile
@@ -31,7 +31,6 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -mfloat
 
 INC =  -I.
 INC += -I..
-INC += -I$(PY_SRC)
 INC += -I../stmhal
 INC += -I$(BUILD)
 INC += -Icore
diff --git a/teensy/help.c b/teensy/help.c
index 598b6f4e30..38a8d550f9 100644
--- a/teensy/help.c
+++ b/teensy/help.c
@@ -26,11 +26,7 @@
 
 #include <stdio.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/obj.h"
 
 STATIC const char *help_text =
 "Welcome to Micro Python!\n"
diff --git a/teensy/import.c b/teensy/import.c
index 5332ebe599..2d5225b888 100644
--- a/teensy/import.c
+++ b/teensy/import.c
@@ -1,11 +1,6 @@
 #include <stdio.h>
-#include <stdint.h>
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "lexer.h"
 
+#include "py/lexer.h"
 #include "memzip.h"
 
 mp_import_stat_t mp_import_stat(const char *path) {
diff --git a/teensy/lcd.c b/teensy/lcd.c
index 5b991aac77..e79b7d5acb 100644
--- a/teensy/lcd.c
+++ b/teensy/lcd.c
@@ -1,9 +1,4 @@
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "parse.h"
-#include "obj.h"
+#include "py/obj.h"
 #include "../stmhal/lcd.h"
 
 void lcd_init(void) {
diff --git a/teensy/led.c b/teensy/led.c
index 2f6e8d6301..fc60167b98 100644
--- a/teensy/led.c
+++ b/teensy/led.c
@@ -2,12 +2,8 @@
 
 #include "Arduino.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 "led.h"
 #include MICROPY_HAL_H
 #include "pin.h"
diff --git a/teensy/lexermemzip.c b/teensy/lexermemzip.c
index 4c363cd6dc..72fe6b1c6b 100644
--- a/teensy/lexermemzip.c
+++ b/teensy/lexermemzip.c
@@ -1,10 +1,6 @@
-#include <stdint.h>
 #include <stdlib.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "lexer.h"
+#include "py/lexer.h"
 #include "memzip.h"
 
 mp_lexer_t *mp_lexer_new_from_file(const char *filename)
diff --git a/teensy/main.c b/teensy/main.c
index bc687fa675..f3b0079bbd 100644
--- a/teensy/main.c
+++ b/teensy/main.c
@@ -3,19 +3,15 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "nlr.h"
-#include "lexer.h"
-#include "lexermemzip.h"
-#include "parse.h"
-#include "obj.h"
-#include "runtime.h"
-#include "gc.h"
+#include "py/nlr.h"
+#include "py/parse.h"
+#include "py/lexer.h"
+#include "py/runtime.h"
+#include "py/gc.h"
 #include "gccollect.h"
 #include "pyexec.h"
 #include "readline.h"
+#include "lexermemzip.h"
 
 #include "Arduino.h"
 #include MICROPY_HAL_H
diff --git a/teensy/memzip.c b/teensy/memzip.c
index 7934bea6b2..88c0843818 100644
--- a/teensy/memzip.c
+++ b/teensy/memzip.c
@@ -1,8 +1,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mpconfigport.h"
-#include "misc.h"
+#include "py/mpconfig.h"
+#include "py/misc.h"
 #include "memzip.h"
 
 extern uint8_t _staticfs[];
diff --git a/teensy/mk20dx256_prefix.c b/teensy/mk20dx256_prefix.c
index 048b64316a..d8e7480b58 100644
--- a/teensy/mk20dx256_prefix.c
+++ b/teensy/mk20dx256_prefix.c
@@ -1,15 +1,10 @@
 // stm32fxx-prefix.c becomes the initial portion of the generated pins file.
 
 #include <stdio.h>
-#include <stdint.h>
 #include <mk20dx128.h>
 
+#include "py/obj.h"
 #include "teensy_hal.h"
-
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
 #include "pin.h"
 
 #define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
diff --git a/teensy/modpyb.c b/teensy/modpyb.c
index 67c5896a5a..13454b2534 100644
--- a/teensy/modpyb.c
+++ b/teensy/modpyb.c
@@ -29,14 +29,11 @@
 #include <mk20dx128.h>
 #include "Arduino.h"
 
-#include "mpconfig.h"
-#include "misc.h"
+#include "py/obj.h"
+#include "py/gc.h"
 
 #include "teensy_hal.h"
 
-#include "qstr.h"
-#include "obj.h"
-#include "gc.h"
 #include "gccollect.h"
 #include "irq.h"
 #include "systick.h"
diff --git a/teensy/pin_defs_teensy.c b/teensy/pin_defs_teensy.c
index 35be669970..fd2476f7bc 100644
--- a/teensy/pin_defs_teensy.c
+++ b/teensy/pin_defs_teensy.c
@@ -1,11 +1,6 @@
 #include <stdint.h>
 #include <mk20dx128.h>
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "py/runtime.h"
 #include MICROPY_HAL_H
 #include "pin.h"
 
diff --git a/teensy/reg.c b/teensy/reg.c
index 8783a8351f..cbc427d876 100644
--- a/teensy/reg.c
+++ b/teensy/reg.c
@@ -1,11 +1,6 @@
 #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/runtime.h"
 #include "reg.h"
 
 #if MICROPY_REG
diff --git a/teensy/teensy_hal.c b/teensy/teensy_hal.c
index 6e9a27c30d..c28dd91828 100644
--- a/teensy/teensy_hal.c
+++ b/teensy/teensy_hal.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
-#include <stdint.h>
 
-#include "mpconfig.h"
+#include "py/mpconfig.h"
 
 #include "Arduino.h"
 
diff --git a/teensy/timer.c b/teensy/timer.c
index a4051e608c..e048f61d8a 100644
--- a/teensy/timer.c
+++ b/teensy/timer.c
@@ -29,18 +29,13 @@
 #include <string.h>
 #include <stddef.h>
 
-#include "mpconfig.h"
-#include "nlr.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
-#include "pfenv.h"
+#include "py/nlr.h"
+#include "py/runtime.h"
+#include "py/pfenv.h"
+#include "py/gc.h"
 #include MICROPY_HAL_H
-#include "gc.h"
 #include "pin.h"
 #include "reg.h"
-
 #include "timer.h"
 
 typedef enum {
diff --git a/teensy/uart.c b/teensy/uart.c
index 4751e3293f..7e08366b2e 100644
--- a/teensy/uart.c
+++ b/teensy/uart.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 MICROPY_HAL_H
 #include "bufhelper.h"
 #include "uart.h"
diff --git a/teensy/usb.c b/teensy/usb.c
index d1601c32d3..ed96826b35 100644
--- a/teensy/usb.c
+++ b/teensy/usb.c
@@ -1,13 +1,8 @@
 #include <string.h>
-#include <stdint.h>
 
-#include "Arduino.h"
+#include "py/runtime.h"
 
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "obj.h"
-#include "runtime.h"
+#include "Arduino.h"
 
 #include "usb.h"
 #include "usb_serial.h"