diff --git a/ports/esp32/memory.h b/ports/esp32/memory.h
index f3777b0e39..1f07fe409d 100644
--- a/ports/esp32/memory.h
+++ b/ports/esp32/memory.h
@@ -1,2 +1,2 @@
-// this is needed for extmod/crypto-algorithms/sha256.c
+// this is needed for lib/crypto-algorithms/sha256.c
 #include <string.h>
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 17de685a61..41a1a73bc5 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -114,10 +114,10 @@ LIB_SRC_C += \
 	lib/littlefs/lfs2_util.c \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/ffunicode.c \
-	extmod/uzlib/crc32.c \
-	extmod/uzlib/adler32.c \
-	extmod/uzlib/tinflate.c \
-	extmod/uzlib/tinfgzip.c
+	lib/uzlib/adler32.c \
+	lib/uzlib/crc32.c \
+	lib/uzlib/tinfgzip.c \
+	lib/uzlib/tinflate.c
 
 SRC_C += \
 	main.c \
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index 652302e42b..6ed8a21d99 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "extmod/uzlib/uzlib.h"
+#include "lib/uzlib/uzlib.h"
 #include "gzstream.h"
 #include "mboot.h"
 
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index c1e1d59d23..6c7d2c7714 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "extmod/crypto-algorithms/sha256.c"
+#include "lib/crypto-algorithms/sha256.c"
 #include "boardctrl.h"
 #include "usbd_core.h"
 #include "storage.h"