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.

56 files changed, 1 insertions, 97 deletions

diff --git a/py/argcheck.c b/py/argcheck.c
index 0c5c5ca954..add6f8de85 100644
--- a/py/argcheck.c
+++ b/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) {
diff --git a/py/bc.c b/py/bc.c
index 917eba57d9..991b0cf267 100644
--- a/py/bc.c
+++ b/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"
 
diff --git a/py/bc.h b/py/bc.h
index 69e213e422..ebfdeaac1d 100644
--- a/py/bc.h
+++ b/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:
diff --git a/py/builtinevex.c b/py/builtinevex.c
index ba8048f702..846603f46b 100644
--- a/py/builtinevex.c
+++ b/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"
diff --git a/py/builtinimport.c b/py/builtinimport.c
index f5bfb0d982..04ce667234 100644
--- a/py/builtinimport.c
+++ b/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"
diff --git a/py/emit.h b/py/emit.h
index 2b2c904f60..270a40633c 100644
--- a/py/emit.h
+++ b/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
diff --git a/py/emitnative.c b/py/emitnative.c
index 4608cd1e0c..b2c9a73668 100644
--- a/py/emitnative.c
+++ b/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"
 
diff --git a/py/gc.c b/py/gc.c
index 3a505e9c78..9752b3532a 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -28,9 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/mpstate.h"
 #include "py/gc.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 
 #if MICROPY_ENABLE_GC
diff --git a/py/lexer.c b/py/lexer.c
index 074d6f3561..6017d69d6d 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/mpstate.h"
 #include "py/reader.h"
 #include "py/lexer.h"
 #include "py/runtime.h"
diff --git a/py/map.c b/py/map.c
index f07b8fbd22..4f76b9b16c 100644
--- a/py/map.c
+++ b/py/map.c
@@ -31,7 +31,6 @@
 
 #include "py/mpconfig.h"
 #include "py/misc.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 // Fixed empty map. Useful when need to call kw-receiving functions
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 0486251b66..82b08cdc91 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -27,12 +27,10 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/smallint.h"
 #include "py/objint.h"
 #include "py/objstr.h"
 #include "py/objtype.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
 #include "py/stream.h"
diff --git a/py/modmicropython.c b/py/modmicropython.c
index 6fa3f9ad28..2aac53adc7 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -26,7 +26,6 @@
 
 #include <stdio.h>
 
-#include "py/mpstate.h"
 #include "py/builtin.h"
 #include "py/stackctrl.h"
 #include "py/runtime.h"
diff --git a/py/modsys.c b/py/modsys.c
index ecc0b6065f..84a4eb0f47 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -25,8 +25,6 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/builtin.h"
 #include "py/objlist.h"
 #include "py/objtuple.h"
@@ -35,7 +33,6 @@
 #include "py/objtype.h"
 #include "py/stream.h"
 #include "py/smallint.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_SYS
diff --git a/py/nativeglue.c b/py/nativeglue.c
index e954234c27..61b624ec71 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/emitglue.h"
 #include "py/bc.h"
diff --git a/py/nlrthumb.c b/py/nlrthumb.c
index 8ff1bb2d22..6e7d717667 100644
--- a/py/nlrthumb.c
+++ b/py/nlrthumb.c
@@ -25,7 +25,6 @@
  */
 
 #include "py/mpstate.h"
-#include "py/nlr.h"
 
 #if (!defined(MICROPY_NLR_SETJMP) || !MICROPY_NLR_SETJMP) && (defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
 
diff --git a/py/nlrx64.c b/py/nlrx64.c
index aeaacd50c5..847d10398e 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -25,7 +25,6 @@
  */
 
 #include "py/mpstate.h"
-#include "py/nlr.h"
 
 #if !MICROPY_NLR_SETJMP && defined(__x86_64__)
 
diff --git a/py/nlrx86.c b/py/nlrx86.c
index a5a20f373d..094dea3cc8 100644
--- a/py/nlrx86.c
+++ b/py/nlrx86.c
@@ -24,9 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpconfig.h"
 #include "py/mpstate.h"
-#include "py/nlr.h"
 
 #if !MICROPY_NLR_SETJMP && defined(__i386__)
 
diff --git a/py/nlrxtensa.c b/py/nlrxtensa.c
index ccac3597b1..4520e7e7ac 100644
--- a/py/nlrxtensa.c
+++ b/py/nlrxtensa.c
@@ -25,7 +25,6 @@
  */
 
 #include "py/mpstate.h"
-#include "py/nlr.h"
 
 #if !MICROPY_NLR_SETJMP && defined(__xtensa__)
 
diff --git a/py/obj.c b/py/obj.c
index 857fe373f2..a1de89a032 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -29,12 +29,10 @@
 #include <stdarg.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/obj.h"
 #include "py/objtype.h"
 #include "py/objint.h"
 #include "py/objstr.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/stream.h" // for mp_obj_print
diff --git a/py/objarray.c b/py/objarray.c
index d51cc650b0..8a3e7faade 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -29,8 +29,6 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "py/nlr.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/objstr.h"
diff --git a/py/objbool.c b/py/objbool.c
index b94c57f871..5755b188e9 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -26,8 +26,6 @@
 
 #include <stdlib.h>
 
-#include "py/obj.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 typedef struct _mp_obj_bool_t {
diff --git a/py/objcomplex.c b/py/objcomplex.c
index 088ad5211b..409d656665 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -28,10 +28,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/parsenum.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_BUILTINS_COMPLEX
diff --git a/py/objdict.c b/py/objdict.c
index 6bb2435626..1553a83b46 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -27,9 +27,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
 #include "py/objtype.h"
diff --git a/py/objexcept.c b/py/objexcept.c
index 0a03df9d03..b87609a6b2 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -29,7 +29,6 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "py/mpstate.h"
 #include "py/objlist.h"
 #include "py/objstr.h"
 #include "py/objtuple.h"
diff --git a/py/objfloat.c b/py/objfloat.c
index 0831be3fdd..743287be63 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -29,9 +29,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/parsenum.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_BUILTINS_FLOAT
diff --git a/py/objfun.c b/py/objfun.c
index 5606511d8a..030b3f7cb0 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -28,10 +28,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/objtuple.h"
 #include "py/objfun.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/bc.h"
 #include "py/stackctrl.h"
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 2f39f3a52b..bf0bbb0e65 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -28,8 +28,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "py/bc.h"
 #include "py/objgenerator.h"
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index afd6fb22b0..ec41c2c5b1 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 
 // this is a wrapper object that turns something that has a __getitem__ method into an iterator
diff --git a/py/objint.c b/py/objint.c
index 000a0404c7..4f2e610a50 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -28,12 +28,10 @@
 #include <assert.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/parsenum.h"
 #include "py/smallint.h"
 #include "py/objint.h"
 #include "py/objstr.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/binary.h"
 
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 8d8ca1b2ce..2e567c5721 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -28,10 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/smallint.h"
 #include "py/objint.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_BUILTINS_FLOAT
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 15aad1d4d2..7b5cb0b9d4 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -28,11 +28,9 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/parsenumbase.h"
 #include "py/smallint.h"
 #include "py/objint.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_BUILTINS_FLOAT
diff --git a/py/objlist.c b/py/objlist.c
index d70867dedc..bc22d9fc35 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -27,9 +27,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/objlist.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 
diff --git a/py/objmodule.c b/py/objmodule.c
index fc8507c27b..f9363e379b 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/objmodule.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index fb9d9f02cf..38daccdf28 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -27,7 +27,6 @@
 
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/objtuple.h"
 #include "py/runtime.h"
 #include "py/objstr.h"
diff --git a/py/objnone.c b/py/objnone.c
index cd7319bec8..da1031835c 100644
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -26,9 +26,7 @@
 
 #include <stdlib.h>
 
-#include "py/nlr.h"
 #include "py/obj.h"
-#include "py/runtime0.h"
 
 typedef struct _mp_obj_none_t {
     mp_obj_base_t base;
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 61bd1e0ac2..01880bff9c 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 
 // This is universal iterator type which calls "iternext" method stored in
diff --git a/py/objproperty.c b/py/objproperty.c
index 0934fad058..b66d24a119 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_BUILTINS_PROPERTY
diff --git a/py/objrange.c b/py/objrange.c
index fa99c4c2db..3874adb11c 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -26,8 +26,6 @@
 
 #include <stdlib.h>
 
-#include "py/nlr.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 /******************************************************************************/
diff --git a/py/objreversed.c b/py/objreversed.c
index a596a2fde3..e498b553de 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_BUILTINS_REVERSED
diff --git a/py/objset.c b/py/objset.c
index aefc26aac2..6ed15c7914 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -28,9 +28,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/runtime.h"
-#include "py/runtime0.h"
 #include "py/builtin.h"
 
 #if MICROPY_PY_BUILTINS_SET
diff --git a/py/objsingleton.c b/py/objsingleton.c
index ea72ae38cc..67535391ea 100644
--- a/py/objsingleton.c
+++ b/py/objsingleton.c
@@ -27,9 +27,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/obj.h"
-#include "py/runtime0.h"
 
 /******************************************************************************/
 /* singleton objects defined by Python                                        */
diff --git a/py/objslice.c b/py/objslice.c
index 358c44d061..de996d831f 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -27,9 +27,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/obj.h"
-#include "py/runtime0.h"
 
 /******************************************************************************/
 /* slice object                                                               */
diff --git a/py/objstr.c b/py/objstr.c
index 11bfb41fc1..d17b0a68c1 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -28,11 +28,9 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/unicode.h"
 #include "py/objstr.h"
 #include "py/objlist.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 
diff --git a/py/objstringio.c b/py/objstringio.c
index 61da0203e1..5c50aa3174 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/objstr.h"
 #include "py/objstringio.h"
 #include "py/runtime.h"
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 785317406b..29f7695b73 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -28,10 +28,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/objstr.h"
 #include "py/objlist.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_BUILTINS_STR_UNICODE
diff --git a/py/objtuple.c b/py/objtuple.c
index b8916a1a7e..34b7664ebb 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -27,9 +27,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/objtuple.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 /******************************************************************************/
diff --git a/py/objtype.c b/py/objtype.c
index 033765a47f..d7f409e30e 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -30,9 +30,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/nlr.h"
 #include "py/objtype.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
diff --git a/py/parse.c b/py/parse.c
index e399aac535..8c51b03498 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -31,11 +31,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include "py/nlr.h"
 #include "py/lexer.h"
 #include "py/parse.h"
 #include "py/parsenum.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/objint.h"
 #include "py/objstr.h"
diff --git a/py/persistentcode.c b/py/persistentcode.c
index f954038ae5..d8b17c7e6b 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -99,7 +99,6 @@ STATIC void extract_prelude(const byte **ip, const byte **ip2, bytecode_prelude_
 #if MICROPY_PERSISTENT_CODE_LOAD
 
 #include "py/parsenum.h"
-#include "py/bc0.h"
 
 STATIC int read_byte(mp_reader_t *reader) {
     return reader->readbyte(reader->data);
diff --git a/py/runtime.c b/py/runtime.c
index f21eed204c..069548debb 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/parsenum.h"
 #include "py/compile.h"
 #include "py/objstr.h"
@@ -38,7 +36,6 @@
 #include "py/objmodule.h"
 #include "py/objgenerator.h"
 #include "py/smallint.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
 #include "py/stackctrl.h"
diff --git a/py/runtime.h b/py/runtime.h
index da12f8f049..d410b56141 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -27,7 +27,6 @@
 #define MICROPY_INCLUDED_PY_RUNTIME_H
 
 #include "py/mpstate.h"
-#include "py/obj.h"
 
 typedef enum {
     MP_VM_RETURN_NORMAL,
diff --git a/py/runtime_utils.c b/py/runtime_utils.c
index 56a9180645..a5c5403baf 100644
--- a/py/runtime_utils.c
+++ b/py/runtime_utils.c
@@ -26,8 +26,6 @@
  */
 
 #include "py/runtime.h"
-#include "py/obj.h"
-#include "py/nlr.h"
 
 void mp_call_function_1_protected(mp_obj_t fun, mp_obj_t arg) {
     nlr_buf_t nlr;
diff --git a/py/sequence.c b/py/sequence.c
index 0752ee1098..c66fde98f6 100644
--- a/py/sequence.c
+++ b/py/sequence.c
@@ -27,9 +27,6 @@
 
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
-#include "py/runtime0.h"
 #include "py/runtime.h"
 
 // Helpers for sequence types
diff --git a/py/stackctrl.c b/py/stackctrl.c
index 0bcd82f4f6..7cd35fee23 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -24,9 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
-#include "py/obj.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 
diff --git a/py/stream.c b/py/stream.c
index 0adf0af067..453dee769f 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "py/nlr.h"
 #include "py/objstr.h"
 #include "py/stream.h"
 #include "py/runtime.h"
diff --git a/py/vm.c b/py/vm.c
index 9a27b2b220..564200037a 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -29,8 +29,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/mpstate.h"
-#include "py/nlr.h"
 #include "py/emitglue.h"
 #include "py/objtype.h"
 #include "py/runtime.h"