From 3765ea419a7b68d3349a3c90089cfec9063db94b Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 1 Jan 2015 20:35:21 +0000
Subject: [PATCH] extmod: Prefix py/ for includes from py core directory.

---
 extmod/modubinascii.c | 10 +++-------
 extmod/moductypes.c   | 13 +++++--------
 extmod/moduhashlib.c  |  8 ++------
 extmod/moduheapq.c    | 12 ++++--------
 extmod/modujson.c     | 12 ++++--------
 extmod/modure.c       | 10 +++-------
 extmod/moduzlib.c     |  8 ++------
 7 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 262d99bc31..57aa2c2ce2 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 4d2e3f6964..416565ed51 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 1c2e76b042..d4d05c3e95 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 8c8cd8345f..8112b55255 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 f1a5eda629..70daf81043 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 b9f2624563..fa7ae67740 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 751b064d37..680b5c1b8e 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