diff --git a/esp8266/Makefile b/esp8266/Makefile
index 7db5a76d35..d930a25559 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -68,7 +68,6 @@ SRC_C = \
 
 STM_SRC_C = $(addprefix stmhal/,\
 	printf.c \
-	pyexec.c \
 	pybstdio.c \
 	)
 
@@ -77,6 +76,7 @@ LIB_SRC_C = $(addprefix lib/,\
 	mp-readline/readline.c \
 	netutils/netutils.c \
 	timeutils/timeutils.c \
+	utils/pyexec.c \
 	)
 
 SRC_S = \
diff --git a/stmhal/pyexec.c b/lib/utils/pyexec.c
similarity index 100%
rename from stmhal/pyexec.c
rename to lib/utils/pyexec.c
diff --git a/minimal/Makefile b/minimal/Makefile
index 619d249526..1fe7b9dbc1 100644
--- a/minimal/Makefile
+++ b/minimal/Makefile
@@ -45,7 +45,7 @@ SRC_C = \
 	uart_core.c \
 	uart_extra.c \
 	stmhal/printf.c \
-	stmhal/pyexec.c \
+	lib/utils/pyexec.c \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
 
diff --git a/pic16bit/Makefile b/pic16bit/Makefile
index 309b47b797..a16a26386e 100644
--- a/pic16bit/Makefile
+++ b/pic16bit/Makefile
@@ -41,7 +41,7 @@ SRC_C = \
 	modpybled.c \
 	modpybswitch.c \
 	stmhal/pybstdio.c \
-	stmhal/pyexec.c \
+	lib/utils/pyexec.c \
 	lib/mp-readline/readline.c \
 
 SRC_S = \
diff --git a/stmhal/Makefile b/stmhal/Makefile
index 8c0cd2175f..ab1c345afa 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -103,6 +103,7 @@ SRC_LIB = $(addprefix lib/,\
 	mp-readline/readline.c \
 	netutils/netutils.c \
 	timeutils/timeutils.c \
+	utils/pyexec.c \
 	)
 
 SRC_C = \
@@ -132,7 +133,6 @@ SRC_C = \
 	printf.c \
 	gccollect.c \
 	pybstdio.c \
-	pyexec.c \
 	help.c \
 	input.c \
 	modmachine.c \
diff --git a/teensy/Makefile b/teensy/Makefile
index 32f753b3eb..42cb5123e5 100644
--- a/teensy/Makefile
+++ b/teensy/Makefile
@@ -99,7 +99,6 @@ STM_SRC_C = $(addprefix stmhal/,\
 	pin.c \
 	pin_named_pins.c \
 	printf.c \
-	pyexec.c \
 	pybstdio.c \
 	)
 
@@ -110,6 +109,7 @@ STM_SRC_S = $(addprefix stmhal/,\
 LIB_SRC_C = $(addprefix lib/,\
 	libc/string0.c \
 	mp-readline/readline.c \
+	utils/pyexec.c \
 	)
 
 SRC_TEENSY = $(addprefix core/,\