diff --git a/py/asmthumb.c b/py/asmthumb.c
index 891947567b339a21f947651664d25da4411efa74..03752ed938139b8792a0ebad555488ba1e525016 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -28,8 +28,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "asmthumb.h"
 
 // wrapper around everything in this file
diff --git a/py/asmx64.c b/py/asmx64.c
index 6c22ea25de5723fefa08bb1d73a9842f6a32a183..4695bdc731fd4aa80946bc0550c87495359510c1 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -29,8 +29,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 
 // wrapper around everything in this file
 #if MICROPY_EMIT_X64
diff --git a/py/binary.c b/py/binary.c
index 833d9c85ad2e0b3cfe2f456e4291a84aae73e104..9eab01c4ebac9df6585972abb907d0f38f86b530 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -29,8 +29,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "binary.h"
diff --git a/py/builtintables.c b/py/builtintables.c
index 66ea4ea446c12cd450957c3441acb52888e4fc54..8b4df931770692ba44ab5825f3ca27660b937ec6 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -26,8 +26,8 @@
 
 #include <stdlib.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/compile.c b/py/compile.c
index b9979af14854354155f886c7f193dfc583bfcf7b..d49edd6ef3d4f46f482972f22d28defa1aca178d 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -31,8 +31,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/emitbc.c b/py/emitbc.c
index 841dd4aabb57678b13b7ed7599e921b2318d86ed..3eb0d575b95917f102b7625d272e8e29b0a6ce5c 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/emitcommon.c b/py/emitcommon.c
index ea651836235b2458e7b4759beba3bbad6ed20343..4649793134d40eaadb039de38d3a534f972297fc 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/emitcpy.c b/py/emitcpy.c
index a8a6265b8cfe316a1f1b971b475bcd32fc159f57..fbca3805b33d736b8a0c117322f6d29db39a4a7c 100644
--- a/py/emitcpy.c
+++ b/py/emitcpy.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/emitglue.c b/py/emitglue.c
index f9b9460837c4a25b092108ec9c3aed48803a2f93..17dc8f867c13934a0142127c28eda9000bfdc8bc 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 8acee6c3ec7af85a3c0d6db03e0fa3969fdb8ab7..435e1b64d9c0e0ce18a343a18cf0ff1bd028d464 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -30,8 +30,8 @@
 #include <stdarg.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/emitnative.c b/py/emitnative.c
index 4dac5ffb091b71056d5d4350a701bad56caa3978..49acc0bb1c9067ab201766b020877686be8cdaf9 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -48,8 +48,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/emitpass1.c b/py/emitpass1.c
index 2e76420a212ae5e9d6d1ae54e31231dfa7e42965..bea1af4dbf768cfb5efcf7da73521f0414e39867 100644
--- a/py/emitpass1.c
+++ b/py/emitpass1.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/gc.c b/py/gc.c
index 90b7b89e5d954fef3594ac1c3a8511f74e5d443a..65bfea0b35a3404312b6cfa565980896fe1fb3d3 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -33,7 +33,6 @@
 #include "misc.h"
 #include "gc.h"
 
-#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
diff --git a/py/lexer.c b/py/lexer.c
index f69c395e7e4510a9dab282ec0087ceff5407090e..5d1113fb300f539c3699037220400d896b958b12 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 
diff --git a/py/lexerstr.c b/py/lexerstr.c
index 76e90671bea03a6325f9742d2f29df610687c205..666dbfa37c34972170b8f39a05e079894c827d92 100644
--- a/py/lexerstr.c
+++ b/py/lexerstr.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 
diff --git a/py/lexerunix.c b/py/lexerunix.c
index 89dc80b004a1244dfdcbea9ad0d28597eb6e519e..51bc915b228f7fef8d5b664ff43c5c284454d7ce 100644
--- a/py/lexerunix.c
+++ b/py/lexerunix.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 
 #if MICROPY_HELPER_LEXER_UNIX
 
diff --git a/py/malloc.c b/py/malloc.c
index b180ddf6b59694a7e5de14c9f48f413001a0ab30..8e90849e93dd07eb7d75284c763a0ff53d264d83 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 
 #if 0 // print debugging info
 #define DEBUG_printf DEBUG_printf
diff --git a/py/map.c b/py/map.c
index 40204016220f7a1ad4d4551858b46c03de1c4539..dcc13c52cc63f4cac3eeae10d7fa91fbbb3241cd 100644
--- a/py/map.c
+++ b/py/map.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"
diff --git a/py/modarray.c b/py/modarray.c
index 2b9f531f963eb2d056d50e4d5732d0686139ded0..3ff567f1d94973e86fea410e06ba80457d0d6824 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modcmath.c b/py/modcmath.c
index 14f204b8be9cfcf4c68ab49bb99661fc02aa835a..ddd8abf71ed533ea3743522555c4ac2488fcbbc4 100644
--- a/py/modcmath.c
+++ b/py/modcmath.c
@@ -26,8 +26,8 @@
 
 #include <math.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modcollections.c b/py/modcollections.c
index 2f732085ff1921df00e181c9124e056df1a58dcf..5cd0b317a12ea907d8624eb62bfef83dfa11d944 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modgc.c b/py/modgc.c
index a82a7a0ebef1b60cbb0947815feeadff3c1a2bb0..f136ce733df3c0e7886a1bbe85193ecfe54c427c 100644
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modio.c b/py/modio.c
index e2ebc990b9b5ef18020e383dce7900cf6ed9a8ce..ef3b29b53ffe777fbe0571a2fcd8919bed340e27 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modmath.c b/py/modmath.c
index ff6129c5bc816b8672747cc0475596a9aa51b958..0d0d13b4e2e116698542eac4fb72e04e94361e20 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -26,8 +26,8 @@
 
 #include <math.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modmicropython.c b/py/modmicropython.c
index c1a293a531e2860e5906f2b4d19682f04459f121..bbb315189b14ac2a011d2ea4f0afabd64693d4d1 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modstruct.c b/py/modstruct.c
index ae6cb9eb901e3e8cea1299bda0a2fb68baea5942..2e40264e8df5c6f510bf62a5ac569316daf63b22 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -27,8 +27,8 @@
 
 #include <assert.h>
 #include <string.h>
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/modsys.c b/py/modsys.c
index 519d470b0a0089a359135b0084af6af8cfcc25dd..1e7f7eff7f975b49c7f1cf0596d65e566ef11a72 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "builtin.h"
diff --git a/py/mpz.c b/py/mpz.c
index ab300b91dfc16f48489c09d8d7e65a0aba0a2a76..3f1e859fc6ba2822c34aa041740d1a946a87ac66 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "mpz.h"
 
 #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_MPZ
diff --git a/py/objenumerate.c b/py/objenumerate.c
index 2fdf30b23cfe9ff52b4092a0d98c0d5ad877a9c1..37414464de2d8cc191aa0257438b83544081ae3a 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"
diff --git a/py/parse.c b/py/parse.c
index af09c335f25325b961bda777d80631c3c09c7841..492c1678b5cd82808877bdffc88a75bb177f7432 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -30,8 +30,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parsenumbase.h"
diff --git a/py/parsehelper.c b/py/parsehelper.c
index 3ead5a3031c8bb019019ab9c6023801ffce92112..105afe711edd1819f7a67520adddd75726c06749 100644
--- a/py/parsehelper.c
+++ b/py/parsehelper.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"
diff --git a/py/parsenum.c b/py/parsenum.c
index 36b069050173ca2b182a27e30ccc5f159a872f65..b9801ab6a1ca6c5c5150e0d02cfe4cc7cc95a527 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -27,8 +27,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "nlr.h"
 #include "obj.h"
diff --git a/py/parsenumbase.c b/py/parsenumbase.c
index ce140655bd915ac1c57ef0f1c3704bde2a403341..4fddac9c3d61f40c03d327018d99ec7ca213c08a 100644
--- a/py/parsenumbase.c
+++ b/py/parsenumbase.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "parsenumbase.h"
 
 // find real radix base, and strip preceding '0x', '0o' and '0b'
diff --git a/py/pfenv.c b/py/pfenv.c
index e631f8654a30a728201d91c9bb03bd57fee54ebd..ca1e3e919bc335fb173268e6f42dc3750bb5bb5d 100644
--- a/py/pfenv.c
+++ b/py/pfenv.c
@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "mpz.h"
diff --git a/py/qstr.c b/py/qstr.c
index 7ccb34f1c3e400dc6dffafdefcb4d3d0c3ce4d3c..10bc20ecba25abfc1a7cffa13da0eac84e089529 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -27,8 +27,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 
 // NOTE: we are using linear arrays to store and search for qstr's (unique strings, interned strings)
diff --git a/py/repl.c b/py/repl.c
index 457ce165b7a35d77e2040cdec52be2a517afbc29..2c3dfbd4d99607e72a99a398f3630d853db69a82 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "repl.h"
 
 #if MICROPY_HELPER_REPL
diff --git a/py/scope.c b/py/scope.c
index 839e8216c10755c72c83bb73048620769b9fc5f4..83c2b6e07c1322a5177b8e76775d54b8df8864f5 100644
--- a/py/scope.c
+++ b/py/scope.c
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "parse.h"
diff --git a/py/smallint.c b/py/smallint.c
index 5543f126c3549a4a4a762b6282cc65d9a8cadfe1..c57f364e36d520adca78a2faf4aea73965c722bb 100644
--- a/py/smallint.c
+++ b/py/smallint.c
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "smallint.h"
diff --git a/py/unicode.c b/py/unicode.c
index c8faa57009bf9f07fc780112831a5f24d8d5b314..88f835131d7774b771f54c10825476fd466bb197 100644
--- a/py/unicode.c
+++ b/py/unicode.c
@@ -26,8 +26,8 @@
 
 #include <stdint.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 
 // attribute flags
 #define FL_PRINT (0x01)
diff --git a/py/vstr.c b/py/vstr.c
index ea6a1c937f9ef56de21b16ba33e63d32f7ce060d..f8b7e4dabcfdc6f57472b01123ea0fd925b2e439 100644
--- a/py/vstr.c
+++ b/py/vstr.c
@@ -29,8 +29,8 @@
 #include <stdarg.h>
 #include <string.h>
 #include <assert.h>
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 
 // returned value is always at least 1 greater than argument
 #define ROUND_ALLOC(a) (((a) & ((~0) - 7)) + 8)