diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 463cad1442..d3bf62d2f7 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -258,54 +258,13 @@ extern const struct _mp_obj_module_t alarm_module;
 #define ALARM_MODULE
 #endif
 
-#if CIRCUITPY_ANALOGIO
-#define ANALOGIO_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_analogio), (mp_obj_t)&analogio_module },
-extern const struct _mp_obj_module_t analogio_module;
-#else
-#define ANALOGIO_MODULE
-#endif
-
-#if CIRCUITPY_ATEXIT
-extern const struct _mp_obj_module_t atexit_module;
-#define ATEXIT_MODULE           { MP_OBJ_NEW_QSTR(MP_QSTR_atexit), (mp_obj_t)&atexit_module },
-#else
-#define ATEXIT_MODULE
-#endif
-
-#if CIRCUITPY_AUDIOBUSIO
-#define AUDIOBUSIO_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_audiobusio), (mp_obj_t)&audiobusio_module },
-extern const struct _mp_obj_module_t audiobusio_module;
-#else
-#define AUDIOBUSIO_MODULE
-#endif
-
-#if CIRCUITPY_AUDIOCORE
-#define AUDIOCORE_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_audiocore), (mp_obj_t)&audiocore_module },
-extern const struct _mp_obj_module_t audiocore_module;
-#else
-#define AUDIOCORE_MODULE
-#endif
-
-#if CIRCUITPY_AUDIOIO
-#define AUDIOIO_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_audioio), (mp_obj_t)&audioio_module },
-extern const struct _mp_obj_module_t audioio_module;
-#else
-#define AUDIOIO_MODULE
-#endif
-
-#if CIRCUITPY_AUDIOMIXER
-#define AUDIOMIXER_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_audiomixer), (mp_obj_t)&audiomixer_module },
-extern const struct _mp_obj_module_t audiomixer_module;
-#else
-#define AUDIOMIXER_MODULE
-#endif
-
-#if CIRCUITPY_AUDIOMP3
-#define AUDIOMP3_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_audiomp3), (mp_obj_t)&audiomp3_module },
-extern const struct _mp_obj_module_t audiomp3_module;
-#else
-#define AUDIOMP3_MODULE
-#endif
+// CIRCUITPY_ANALOGIO uses MP_REGISTER_MODULE
+// CIRCUITPY_ATEXIT uses MP_REGISTER_MODULE
+// CIRCUITPY_AUDIOBUSIO uses MP_REGISTER_MODULE
+// CIRCUITPY_AUDIOCORE uses MP_REGISTER_MODULE
+// CIRCUITPY_AUDIOIO uses MP_REGISTER_MODULE
+// CIRCUITPY_AUDIOMIXER uses MP_REGISTER_MODULE
+// CIRCUITPY_AUDIOMP3 uses MP_REGISTER_MODULE
 
 #if CIRCUITPY_AUDIOPWMIO
 #define AUDIOPWMIO_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_audiopwmio), (mp_obj_t)&audiopwmio_module },
@@ -370,12 +329,7 @@ extern const struct _mp_obj_module_t board_module;
 #define BOARD_UART_ROOT_POINTER
 #endif
 
-#if CIRCUITPY_BUSDEVICE
-extern const struct _mp_obj_module_t adafruit_bus_device_module;
-#define BUSDEVICE_MODULE           { MP_OBJ_NEW_QSTR(MP_QSTR_adafruit_bus_device), (mp_obj_t)&adafruit_bus_device_module },
-#else
-#define BUSDEVICE_MODULE
-#endif
+// CIRCUITPY_BUSDEVICE (adafruit_bus_device_module) uses MP_REGISTER_MODULE
 
 #if CIRCUITPY_BUSIO
 extern const struct _mp_obj_module_t busio_module;
@@ -614,13 +568,7 @@ extern const struct _mp_obj_module_t pew_module;
 #define PEW_MODULE
 #endif
 
-#if CIRCUITPY_PIXELBUF
-extern const struct _mp_obj_module_t pixelbuf_module;
-#define PIXELBUF_MODULE   { MP_OBJ_NEW_QSTR(MP_QSTR_adafruit_pixelbuf),(mp_obj_t)&pixelbuf_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR__pixelbuf),(mp_obj_t)&pixelbuf_module },
-#else
-#define PIXELBUF_MODULE
-#endif
+// CIRCUITPY_PIXELBUF (pixelbuf_module) uses MP_REGISTER_MODULE
 
 #if CIRCUITPY_PS2IO
 extern const struct _mp_obj_module_t ps2io_module;
@@ -883,13 +831,6 @@ extern const struct _mp_obj_module_t msgpack_module;
 #define MICROPY_PORT_BUILTIN_MODULES_STRONG_LINKS \
     AESIO_MODULE \
     ALARM_MODULE \
-    ANALOGIO_MODULE \
-    ATEXIT_MODULE \
-    AUDIOBUSIO_MODULE \
-    AUDIOCORE_MODULE \
-    AUDIOIO_MODULE \
-    AUDIOMIXER_MODULE \
-    AUDIOMP3_MODULE \
     AUDIOPWMIO_MODULE \
     BINASCII_MODULE \
     BITBANGIO_MODULE \
@@ -897,7 +838,6 @@ extern const struct _mp_obj_module_t msgpack_module;
     BITOPS_MODULE \
     BLEIO_MODULE \
     BOARD_MODULE \
-    BUSDEVICE_MODULE \
     BUSIO_MODULE \
     CAMERA_MODULE \
     CANIO_MODULE \
@@ -925,7 +865,6 @@ extern const struct _mp_obj_module_t msgpack_module;
     NEOPIXEL_WRITE_MODULE \
     ONEWIREIO_MODULE \
     PEW_MODULE \
-    PIXELBUF_MODULE \
     PS2IO_MODULE \
     PULSEIO_MODULE \
     PWMIO_MODULE \
diff --git a/shared-bindings/adafruit_bus_device/__init__.c b/shared-bindings/adafruit_bus_device/__init__.c
index 84abbd0c2e..f25a882557 100644
--- a/shared-bindings/adafruit_bus_device/__init__.c
+++ b/shared-bindings/adafruit_bus_device/__init__.c
@@ -76,3 +76,5 @@ const mp_obj_module_t adafruit_bus_device_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&adafruit_bus_device_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_adafruit_bus_device, adafruit_bus_device_module, CIRCUITPY_BUSDEVICE);
diff --git a/shared-bindings/adafruit_pixelbuf/__init__.c b/shared-bindings/adafruit_pixelbuf/__init__.c
index 1f4ecb8ae1..7b8d0da829 100644
--- a/shared-bindings/adafruit_pixelbuf/__init__.c
+++ b/shared-bindings/adafruit_pixelbuf/__init__.c
@@ -54,3 +54,5 @@ const mp_obj_module_t pixelbuf_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&pixelbuf_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_adafruit_pixelbuf, pixelbuf_module, CIRCUITPY_PIXELBUF);
diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c
index 4e5aebf010..51f8a21537 100644
--- a/shared-bindings/analogio/__init__.c
+++ b/shared-bindings/analogio/__init__.c
@@ -72,3 +72,5 @@ const mp_obj_module_t analogio_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&analogio_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_analogio, analogio_module, CIRCUITPY_ANALOGIO);
diff --git a/shared-bindings/atexit/__init__.c b/shared-bindings/atexit/__init__.c
index 2d6faf9c72..e6d1372ccf 100644
--- a/shared-bindings/atexit/__init__.c
+++ b/shared-bindings/atexit/__init__.c
@@ -91,3 +91,5 @@ const mp_obj_module_t atexit_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&atexit_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_atexit, atexit_module, CIRCUITPY_ATEXIT);
diff --git a/shared-bindings/audiobusio/__init__.c b/shared-bindings/audiobusio/__init__.c
index 23e246ec22..0476443768 100644
--- a/shared-bindings/audiobusio/__init__.c
+++ b/shared-bindings/audiobusio/__init__.c
@@ -58,3 +58,5 @@ const mp_obj_module_t audiobusio_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&audiobusio_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_audiobusio, audiobusio_module, CIRCUITPY_AUDIOBUSIO);
diff --git a/shared-bindings/audiocore/__init__.c b/shared-bindings/audiocore/__init__.c
index 9fe4a81c4c..f03c64ccf8 100644
--- a/shared-bindings/audiocore/__init__.c
+++ b/shared-bindings/audiocore/__init__.c
@@ -50,3 +50,5 @@ const mp_obj_module_t audiocore_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&audiocore_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_audiocore, audiocore_module, CIRCUITPY_AUDIOCORE);
diff --git a/shared-bindings/audioio/__init__.c b/shared-bindings/audioio/__init__.c
index 426f756d44..9f8411f484 100644
--- a/shared-bindings/audioio/__init__.c
+++ b/shared-bindings/audioio/__init__.c
@@ -61,3 +61,5 @@ const mp_obj_module_t audioio_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&audioio_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_audioio, audioio_module, CIRCUITPY_AUDIOIO);
diff --git a/shared-bindings/audiomixer/__init__.c b/shared-bindings/audiomixer/__init__.c
index 9d0bf676fc..a29d4f18ef 100644
--- a/shared-bindings/audiomixer/__init__.c
+++ b/shared-bindings/audiomixer/__init__.c
@@ -46,3 +46,5 @@ const mp_obj_module_t audiomixer_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&audiomixer_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_audiomixer, audiomixer_module, CIRCUITPY_AUDIOMIXER);
diff --git a/shared-bindings/audiomp3/__init__.c b/shared-bindings/audiomp3/__init__.c
index 29bdd0bb21..d6c408b143 100644
--- a/shared-bindings/audiomp3/__init__.c
+++ b/shared-bindings/audiomp3/__init__.c
@@ -45,3 +45,5 @@ const mp_obj_module_t audiomp3_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&audiomp3_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_audiomp3, audiomp3_module, CIRCUITPY_AUDIOMP3);