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.

22 files changed, 1 insertions, 29 deletions

diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index af987cb7f7..b9f16507c4 100644
--- a/extmod/machine_mem.c
+++ b/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
 
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 5017079da3..5c13115328 100644
--- a/extmod/modbtree.c
+++ b/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
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 239302295b..20e40d5791 100644
--- a/extmod/modframebuf.c
+++ b/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
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 6b8caa42bb..f7e776af91 100644
--- a/extmod/modlwip.c
+++ b/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"
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index f15efea0f1..8256a50cf2 100644
--- a/extmod/modubinascii.c
+++ b/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"
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index dc03f6de50..c3da083cf6 100644
--- a/extmod/moductypes.c
+++ b/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"
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index f3beb39399..3fad69247e 100644
--- a/extmod/moduhashlib.c
+++ b/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
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 4a620bad81..71c15368bf 100644
--- a/extmod/moduheapq.c
+++ b/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
diff --git a/extmod/modujson.c b/extmod/modujson.c
index 6c4aa1611d..f14682d26f 100644
--- a/extmod/modujson.c
+++ b/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"
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 4b63dace4d..1512a3fd4a 100644
--- a/extmod/modurandom.c
+++ b/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
diff --git a/extmod/modure.c b/extmod/modure.c
index 7e1c24325f..78de4706d2 100644
--- a/extmod/modure.c
+++ b/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"
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index b5d2412d26..88a89a23d4 100644
--- a/extmod/modussl_axtls.c
+++ b/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"
 
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index a65470e161..d7316cb4ae 100644
--- a/extmod/modussl_mbedtls.c
+++ b/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"
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index faa5895830..94cbd20d2f 100644
--- a/extmod/modutimeq.c
+++ b/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"
 
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index b446dba737..e9af07370e 100644
--- a/extmod/moduzlib.c
+++ b/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"
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index d618f5370d..4ff282aac3 100644
--- a/extmod/modwebrepl.c
+++ b/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"
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
index 6c6e32c1a2..a651164b2f 100644
--- a/extmod/modwebsocket.c
+++ b/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"
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index 233d145aab..1d6f02dcea 100644
--- a/extmod/uos_dupterm.c
+++ b/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"
diff --git a/extmod/vfs.c b/extmod/vfs.c
index 3bdce80db8..a1cd8d5f67 100644
--- a/extmod/vfs.c
+++ b/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"
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index b270541119..22346bdf1d 100644
--- a/extmod/vfs_fat.c
+++ b/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"
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 8fb48f01a6..1fcbb253dc 100644
--- a/extmod/vfs_fat_file.c
+++ b/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"
diff --git a/extmod/vfs_fat_misc.c b/extmod/vfs_fat_misc.c
index 7c16db7e5b..9a26b4a2f9 100644
--- a/extmod/vfs_fat_misc.c
+++ b/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"