8 files changed, 7 insertions, 10 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile
index 51aa07f3c..09643be94 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -47,9 +47,6 @@ INC += -I$(CMSIS_DIR)/
 INC += -I$(HAL_DIR)/inc
 INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc
 #INC += -I$(USBHOST_DIR)
-INC += -I../lib/mp-readline
-INC += -I../lib/netutils
-INC += -I../lib/timeutils
 
 CFLAGS_CORTEX_M = -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
 CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4 -DMCU_SERIES_F4
diff --git a/stmhal/input.c b/stmhal/input.c
index 07e7ba35c..c78525cc9 100644
--- a/stmhal/input.c
+++ b/stmhal/input.c
@@ -26,7 +26,7 @@
 
 #include "py/nlr.h"
 #include "py/obj.h"
-#include "readline.h"
+#include "lib/mp-readline/readline.h"
 
 STATIC mp_obj_t mp_builtin_input(uint n_args, const mp_obj_t *args) {
     if (n_args == 1) {
diff --git a/stmhal/main.c b/stmhal/main.c
index 8d076a08b..566c2db07 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -31,6 +31,7 @@
 #include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/mphal.h"
+#include "lib/mp-readline/readline.h"
 #include "lib/utils/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
@@ -40,7 +41,6 @@
 #include "pendsv.h"
 #include "pybthread.h"
 #include "gccollect.h"
-#include "readline.h"
 #include "modmachine.h"
 #include "i2c.h"
 #include "spi.h"
diff --git a/stmhal/modnwcc3k.c b/stmhal/modnwcc3k.c
index ae403cacd..26c6cd48c 100644
--- a/stmhal/modnwcc3k.c
+++ b/stmhal/modnwcc3k.c
@@ -37,7 +37,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
 #include "modnetwork.h"
 #include "pin.h"
 #include "genhdr/pins.h"
diff --git a/stmhal/modnwwiznet5k.c b/stmhal/modnwwiznet5k.c
index e3d5c6370..b32f16913 100644
--- a/stmhal/modnwwiznet5k.c
+++ b/stmhal/modnwwiznet5k.c
@@ -33,7 +33,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
 #include "modnetwork.h"
 #include "pin.h"
 #include "genhdr/pins.h"
diff --git a/stmhal/moduos.c b/stmhal/moduos.c
index 0af682612..745c0d5d7 100644
--- a/stmhal/moduos.c
+++ b/stmhal/moduos.c
@@ -31,12 +31,12 @@
 #include "py/runtime.h"
 #include "py/objtuple.h"
 #include "py/objstr.h"
+#include "lib/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "genhdr/mpversion.h"
-#include "timeutils.h"
 #include "rng.h"
 #include "uart.h"
 #include "portmodules.h"
diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c
index d066501d0..fd60c5ad4 100644
--- a/stmhal/modusocket.c
+++ b/stmhal/modusocket.c
@@ -32,7 +32,7 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
 #include "modnetwork.h"
 
 #if MICROPY_PY_USOCKET
diff --git a/stmhal/modutime.c b/stmhal/modutime.c
index 2c7245080..97af35c49 100644
--- a/stmhal/modutime.c
+++ b/stmhal/modutime.c
@@ -31,9 +31,9 @@
 #include "py/nlr.h"
 #include "py/smallint.h"
 #include "py/obj.h"
+#include "lib/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 #include "systick.h"
-#include "timeutils.h"
 #include "portmodules.h"
 #include "rtc.h"