diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
index 6c491c8f66..e2cd6b3d01 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
@@ -1,4 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
 freeze("modules")
-
-include("$(MPY_DIR)/drivers/display", ssd1306=True)
+require("ssd1306")
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/manifest.py b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
index efc37137b2..9ac8ade827 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
+++ b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
@@ -1,4 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
 freeze("./modules")
-
-include("$(MPY_DIR)/drivers/display", ssd1306=True)
+require("ssd1306")
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index 658d11d585..fcc48d7218 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,15 +1,16 @@
 freeze("$(PORT_DIR)/modules")
 module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
 module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/drivers/neopixel")
 include("$(MPY_DIR)/extmod/uasyncio")
-include("$(MPY_DIR)/extmod/webrepl")
 
 # Require some micropython-lib modules.
-require("urequests")
-require("upysh")
-require("umqtt.simple")
+require("dht")
+require("ds18x20")
+require("neopixel")
+require("ntptime")
+require("onewire")
 require("umqtt.robust")
+require("umqtt.simple")
+require("upysh")
+require("urequests")
+require("webrepl")
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index 54b916546c..ef70884624 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -5,7 +5,7 @@ include("$(PORT_DIR)/boards/manifest.py")
 include("$(MPY_DIR)/extmod/uasyncio")
 
 # drivers
-include("$(MPY_DIR)/drivers/display", ssd1306=True)
+require("ssd1306")
 
 # micropython-lib: file utilities
 require("upysh")
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
index 57970a6b4d..15f6cffc3f 100644
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,8 +1,9 @@
 module("_boot.py", opt=3)
 module("apa102.py", base_path="$(PORT_DIR)/modules", opt=3)
 module("port_diag.py", base_path="$(PORT_DIR)/modules", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/webrepl")
-include("$(MPY_DIR)/drivers/neopixel")
+require("ntptime")
+require("dht")
+require("onewire")
+require("ds18x20")
+require("webrepl")
+require("neopixel")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index abcee253ff..e7defd0bb7 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,8 +1,9 @@
 freeze("$(PORT_DIR)/modules")
 module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
 module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/webrepl")
-include("$(MPY_DIR)/drivers/neopixel")
+require("ntptime")
+require("dht")
+require("onewire")
+require("ds18x20")
+require("neopixel")
+require("webrepl")
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index a273dfa370..e4e5a236a3 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -1,4 +1,5 @@
 freeze("$(PORT_DIR)/modules")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/drivers/dht")
 include("$(MPY_DIR)/extmod/uasyncio")
+require("onewire")
+require("ds18x20")
+require("dht")
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
index 2b0cc6c818..8396e0249c 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
@@ -1,4 +1,4 @@
 include("$(PORT_DIR)/modules/manifest.py")
-include("$(MPY_DIR)/drivers/hts221")
-include("$(MPY_DIR)/drivers/lps22h")
-include("$(MPY_DIR)/drivers/lsm9ds1")
+require("hts221")
+require("lps22h")
+require("lsm9ds1")
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
index c25ae79887..99b9c94051 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
@@ -1,2 +1,2 @@
 # We do not want to include default frozen modules,
-include("$(MPY_DIR)/drivers/sdcard")
+require("sdcard")
diff --git a/ports/renesas-ra/boards/RA4M1_EK/manifest.py b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
index c25ae79887..99b9c94051 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/manifest.py
+++ b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
@@ -1,2 +1,2 @@
 # We do not want to include default frozen modules,
-include("$(MPY_DIR)/drivers/sdcard")
+require("sdcard")
diff --git a/ports/renesas-ra/boards/manifest.py b/ports/renesas-ra/boards/manifest.py
index c66ec92015..01699c3d6e 100644
--- a/ports/renesas-ra/boards/manifest.py
+++ b/ports/renesas-ra/boards/manifest.py
@@ -1,4 +1,4 @@
 include("$(MPY_DIR)/extmod/uasyncio")
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
-include("$(MPY_DIR)/drivers/sdcard")
+require("dht")
+require("onewire")
+require("sdcard")
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index e139c7d60b..dbd45fa408 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -1,11 +1,11 @@
 include("$(PORT_DIR)/boards/manifest.py")
 
 # Networking
-include("$(MPY_DIR)/extmod/webrepl")
+require("webrepl")
 require("urequests")
 
 # Drivers
-include("$(MPY_DIR)/drivers/lsm6dsox")
+require("lsm6dsox")
 
 # Bluetooth
 require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index 66ff26b0c8..4d9eb87f20 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -2,6 +2,6 @@ include("../manifest.py")
 
 module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
 module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
 
+require("ntptime")
 require("urequests")
diff --git a/ports/rp2/boards/manifest.py b/ports/rp2/boards/manifest.py
index 9afcba17e8..e62d02f308 100644
--- a/ports/rp2/boards/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,5 +1,6 @@
 freeze("$(PORT_DIR)/modules")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/drivers/dht")
 include("$(MPY_DIR)/extmod/uasyncio")
-include("$(MPY_DIR)/drivers/neopixel")
+require("onewire")
+require("ds18x20")
+require("dht")
+require("neopixel")
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index 0ecdcd2153..4fa92b7205 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
-include("$(MPY_DIR)/extmod/webrepl")
+require("webrepl")
 require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
index 69da2897ae..2600fc5062 100644
--- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
@@ -1,2 +1 @@
-# Note: Freezes to display.ssd1306, so must use deprecated "freeze" function.
-freeze("$(MPY_DIR)/drivers/", ("display/ssd1306.py"))
+require("ssd1306")
diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index a9e92848d5..0ee11baf4b 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
 include("$(PORT_DIR)/boards/manifest_pyboard.py")
-include("$(MPY_DIR)/extmod/webrepl")
+require("webrepl")
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index 723caa3eb6..e6b77f8ab3 100644
--- a/ports/stm32/boards/manifest.py
+++ b/ports/stm32/boards/manifest.py
@@ -1,4 +1,4 @@
 include("$(MPY_DIR)/extmod/uasyncio")
 
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
+require("dht")
+require("onewire")
diff --git a/ports/stm32/boards/manifest_pyboard.py b/ports/stm32/boards/manifest_pyboard.py
index e4fb0a8c4d..789365a433 100644
--- a/ports/stm32/boards/manifest_pyboard.py
+++ b/ports/stm32/boards/manifest_pyboard.py
@@ -1 +1 @@
-include("$(MPY_DIR)/drivers/display", lcd160cr=True)
+require("lcd160cr")