diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c index 262d99bc311508511507de3e5ac661d0f4818d99..57aa2c2ce2b0dec8f223382c490256cc7a582a11 100644 --- a/extmod/modubinascii.c +++ b/extmod/modubinascii.c @@ -28,13 +28,9 @@ #include <assert.h> #include <string.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.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" #if MICROPY_PY_UBINASCII diff --git a/extmod/moductypes.c b/extmod/moductypes.c index 4d2e3f696468d53f6243564f8a935ebd783e6258..416565ed515f6f23650fa24c5091f86c599a5129 100644 --- a/extmod/moductypes.c +++ b/extmod/moductypes.c @@ -27,14 +27,11 @@ #include <assert.h> #include <string.h> #include <stdint.h> -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "runtime.h" -#include "objtuple.h" -#include "binary.h" + +#include "py/nlr.h" +#include "py/runtime.h" +#include "py/objtuple.h" +#include "py/binary.h" #if MICROPY_PY_UCTYPES diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c index 1c2e76b042973e0369a2235e020c40427121fae2..d4d05c3e95bb23a965adacf2d4988c5ae105bbe3 100644 --- a/extmod/moduhashlib.c +++ b/extmod/moduhashlib.c @@ -27,12 +27,8 @@ #include <assert.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" #if MICROPY_PY_UHASHLIB diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c index 8c8cd8345f5bb5307a7ad51fee7c25c7688ed409..8112b552559d6474738041d096f27caf359afb25 100644 --- a/extmod/moduheapq.c +++ b/extmod/moduheapq.c @@ -26,14 +26,10 @@ #include <unistd.h> -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "objlist.h" -#include "runtime0.h" -#include "runtime.h" +#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 f1a5eda629e022b4b080a9389b5ce5f921fc7745..70daf81043461d76e2295c2e454eae3bb941a70a 100644 --- a/extmod/modujson.c +++ b/extmod/modujson.c @@ -28,14 +28,10 @@ #include <unistd.h> #include <string.h> -#include "mpconfig.h" -#include "misc.h" -#include "nlr.h" -#include "qstr.h" -#include "obj.h" -#include "objlist.h" -#include "parsenum.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/objlist.h" +#include "py/parsenum.h" +#include "py/runtime.h" #if MICROPY_PY_UJSON diff --git a/extmod/modure.c b/extmod/modure.c index b9f26245636ea0208a3e01599a68b0183951cd1b..fa7ae67740b4c3c3d0418e9e51fd9c840ef7d2d6 100644 --- a/extmod/modure.c +++ b/extmod/modure.c @@ -28,13 +28,9 @@ #include <assert.h> #include <string.h> -#include "mpconfig.h" -#include "nlr.h" -#include "misc.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" #if MICROPY_PY_URE diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c index 751b064d372edf124b9155cd565ec8174a85aa88..680b5c1b8e80ba1f148c1de28b5b5696bec3226b 100644 --- a/extmod/moduzlib.c +++ b/extmod/moduzlib.c @@ -31,12 +31,8 @@ #include <sys/time.h> #include <math.h> -#include "mpconfig.h" -#include "misc.h" -#include "qstr.h" -#include "nlr.h" -#include "obj.h" -#include "runtime.h" +#include "py/nlr.h" +#include "py/runtime.h" #if MICROPY_PY_UZLIB