diff --git a/micropython/modules/adcfft/adcfft.c b/micropython/modules/adcfft/adcfft.c
index 669150a2..619da0d2 100644
--- a/micropython/modules/adcfft/adcfft.c
+++ b/micropython/modules/adcfft/adcfft.c
@@ -13,12 +13,22 @@ STATIC const mp_rom_map_elem_t adcfft_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(adcfft_locals_dict, adcfft_locals_dict_table);
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    adcfft_type,
+    MP_QSTR_ADCFFT,
+    MP_TYPE_FLAG_NONE,
+    make_new, adcfft_make_new,
+    locals_dict, (mp_obj_dict_t*)&adcfft_locals_dict
+);
+#else
 const mp_obj_type_t adcfft_type = {
     { &mp_type_type },
     .name = MP_QSTR_ADCFFT,
     .make_new = adcfft_make_new,
     .locals_dict = (mp_obj_dict_t*)&adcfft_locals_dict,
 };
+#endif
 
 // Module
 STATIC const mp_map_elem_t adcfft_globals_table[] = {
diff --git a/micropython/modules/badger2040/badger2040.c b/micropython/modules/badger2040/badger2040.c
index 4aa0dfed..8112ffe6 100644
--- a/micropython/modules/badger2040/badger2040.c
+++ b/micropython/modules/badger2040/badger2040.c
@@ -75,12 +75,22 @@ STATIC const mp_rom_map_elem_t Badger2040_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(Badger2040_locals_dict, Badger2040_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    Badger2040_type,
+    MP_QSTR_Badger2040,
+    MP_TYPE_FLAG_NONE,
+    make_new, Badger2040_make_new,
+    locals_dict, (mp_obj_dict_t*)&Badger2040_locals_dict
+);
+#else
 const mp_obj_type_t Badger2040_type = {
     { &mp_type_type },
     .name = MP_QSTR_Badger2040,
     .make_new = Badger2040_make_new,
     .locals_dict = (mp_obj_dict_t*)&Badger2040_locals_dict,
 };
+#endif
 
 /***** Globals Table *****/
 
diff --git a/micropython/modules/breakout_as7262/breakout_as7262.c b/micropython/modules/breakout_as7262/breakout_as7262.c
index 27e2dd60..808ef085 100644
--- a/micropython/modules/breakout_as7262/breakout_as7262.c
+++ b/micropython/modules/breakout_as7262/breakout_as7262.c
@@ -57,12 +57,22 @@ STATIC const mp_rom_map_elem_t BreakoutAS7262_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutAS7262_locals_dict, BreakoutAS7262_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_as7262_BreakoutAS7262_type,
+    MP_QSTR_BreakoutAS7262,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutAS7262_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutAS7262_locals_dict
+);
+#else
 const mp_obj_type_t breakout_as7262_BreakoutAS7262_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutAS7262,
     .make_new = BreakoutAS7262_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutAS7262_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_bh1745/breakout_bh1745.c b/micropython/modules/breakout_bh1745/breakout_bh1745.c
index 5ad5d233..a90b1a4a 100644
--- a/micropython/modules/breakout_bh1745/breakout_bh1745.c
+++ b/micropython/modules/breakout_bh1745/breakout_bh1745.c
@@ -28,12 +28,22 @@ STATIC const mp_rom_map_elem_t BreakoutBH1745_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutBH1745_locals_dict, BreakoutBH1745_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_bh1745_BreakoutBH1745_type,
+    MP_QSTR_BreakoutBH1745,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutBH1745_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutBH1745_locals_dict
+);
+#else
 const mp_obj_type_t breakout_bh1745_BreakoutBH1745_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutBH1745,
     .make_new = BreakoutBH1745_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutBH1745_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_bme280/breakout_bme280.c b/micropython/modules/breakout_bme280/breakout_bme280.c
index 3e45e8c0..23886372 100644
--- a/micropython/modules/breakout_bme280/breakout_bme280.c
+++ b/micropython/modules/breakout_bme280/breakout_bme280.c
@@ -16,12 +16,22 @@ STATIC const mp_rom_map_elem_t BreakoutBME280_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutBME280_locals_dict, BreakoutBME280_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_bme280_BreakoutBME280_type,
+    MP_QSTR_BreakoutBME280,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutBME280_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutBME280_locals_dict
+);
+#else
 const mp_obj_type_t breakout_bme280_BreakoutBME280_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutBME280,
     .make_new = BreakoutBME280_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutBME280_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_bme68x/breakout_bme68x.c b/micropython/modules/breakout_bme68x/breakout_bme68x.c
index 2090c572..a14c73fd 100644
--- a/micropython/modules/breakout_bme68x/breakout_bme68x.c
+++ b/micropython/modules/breakout_bme68x/breakout_bme68x.c
@@ -15,13 +15,22 @@ STATIC const mp_rom_map_elem_t BreakoutBME68X_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutBME68X_locals_dict, BreakoutBME68X_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_bme68x_BreakoutBME68X_type,
+    MP_QSTR_BreakoutBME68X,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutBME68X_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutBME68X_locals_dict
+);
+#else
 const mp_obj_type_t breakout_bme68x_BreakoutBME68X_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutBME68X,
     .make_new = BreakoutBME68X_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutBME68X_locals_dict,
 };
-
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // breakout_bme68x Module
diff --git a/micropython/modules/breakout_bmp280/breakout_bmp280.c b/micropython/modules/breakout_bmp280/breakout_bmp280.c
index 06cc2e2c..a3e0f115 100644
--- a/micropython/modules/breakout_bmp280/breakout_bmp280.c
+++ b/micropython/modules/breakout_bmp280/breakout_bmp280.c
@@ -16,12 +16,22 @@ STATIC const mp_rom_map_elem_t BreakoutBMP280_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutBMP280_locals_dict, BreakoutBMP280_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_bmp280_BreakoutBMP280_type,
+    MP_QSTR_BreakoutBMP280,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutBMP280_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutBMP280_locals_dict
+);
+#else
 const mp_obj_type_t breakout_bmp280_BreakoutBMP280_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutBMP280,
     .make_new = BreakoutBMP280_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutBMP280_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.c b/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.c
index 96814529..748864da 100644
--- a/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.c
+++ b/micropython/modules/breakout_dotmatrix/breakout_dotmatrix.c
@@ -28,12 +28,22 @@ STATIC const mp_rom_map_elem_t BreakoutDotMatrix_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutDotMatrix_locals_dict, BreakoutDotMatrix_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_dotmatrix_BreakoutDotMatrix_type,
+    MP_QSTR_BreakoutDotMatrix,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutDotMatrix_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutDotMatrix_locals_dict
+);
+#else
 const mp_obj_type_t breakout_dotmatrix_BreakoutDotMatrix_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutDotMatrix,
     .make_new = BreakoutDotMatrix_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutDotMatrix_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_encoder/breakout_encoder.c b/micropython/modules/breakout_encoder/breakout_encoder.c
index 35823915..806efdc6 100644
--- a/micropython/modules/breakout_encoder/breakout_encoder.c
+++ b/micropython/modules/breakout_encoder/breakout_encoder.c
@@ -34,12 +34,22 @@ STATIC const mp_rom_map_elem_t BreakoutEncoder_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutEncoder_locals_dict, BreakoutEncoder_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_encoder_BreakoutEncoder_type,
+    MP_QSTR_BreakoutEncoder,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutEncoder_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutEncoder_locals_dict
+);
+#else
 const mp_obj_type_t breakout_encoder_BreakoutEncoder_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutEncoder,
     .make_new = BreakoutEncoder_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutEncoder_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_icp10125/breakout_icp10125.c b/micropython/modules/breakout_icp10125/breakout_icp10125.c
index 2946ab3e..c3e10a96 100644
--- a/micropython/modules/breakout_icp10125/breakout_icp10125.c
+++ b/micropython/modules/breakout_icp10125/breakout_icp10125.c
@@ -22,12 +22,22 @@ STATIC const mp_rom_map_elem_t BreakoutICP10125_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutICP10125_locals_dict, BreakoutICP10125_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_icp10125_BreakoutICP10125_type,
+    MP_QSTR_BreakoutICP10125,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutICP10125_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutICP10125_locals_dict
+);
+#else
 const mp_obj_type_t breakout_icp10125_BreakoutICP10125_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutICP10125,
     .make_new = BreakoutICP10125_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutICP10125_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_ioexpander/breakout_ioexpander.c b/micropython/modules/breakout_ioexpander/breakout_ioexpander.c
index a9dc0852..eece8446 100644
--- a/micropython/modules/breakout_ioexpander/breakout_ioexpander.c
+++ b/micropython/modules/breakout_ioexpander/breakout_ioexpander.c
@@ -63,13 +63,22 @@ STATIC const mp_rom_map_elem_t BreakoutIOExpander_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutIOExpander_locals_dict, BreakoutIOExpander_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_ioexpander_BreakoutIOExpander_type,
+    MP_QSTR_BreakoutIOExpander,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutIOExpander_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutIOExpander_locals_dict
+);
+#else
 const mp_obj_type_t breakout_ioexpander_BreakoutIOExpander_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutIOExpander,
     .make_new = BreakoutIOExpander_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutIOExpander_locals_dict,
 };
-
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // breakout_ioexpander Module
diff --git a/micropython/modules/breakout_ltr559/breakout_ltr559.c b/micropython/modules/breakout_ltr559/breakout_ltr559.c
index 6c8a66bc..a02c56b1 100644
--- a/micropython/modules/breakout_ltr559/breakout_ltr559.c
+++ b/micropython/modules/breakout_ltr559/breakout_ltr559.c
@@ -45,12 +45,22 @@ STATIC const mp_rom_map_elem_t BreakoutLTR559_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutLTR559_locals_dict, BreakoutLTR559_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_ltr559_BreakoutLTR559_type,
+    MP_QSTR_BreakoutLTR559,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutLTR559_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutLTR559_locals_dict
+);
+#else
 const mp_obj_type_t breakout_ltr559_BreakoutLTR559_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutLTR559,
     .make_new = BreakoutLTR559_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutLTR559_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.c b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.c
index ea20a079..85e5ba55 100644
--- a/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.c
+++ b/micropython/modules/breakout_matrix11x7/breakout_matrix11x7.c
@@ -20,12 +20,22 @@ STATIC const mp_rom_map_elem_t BreakoutMatrix11x7_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutMatrix11x7_locals_dict, BreakoutMatrix11x7_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_matrix11x7_BreakoutMatrix11x7_type,
+    MP_QSTR_BreakoutMatrix11x7,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutMatrix11x7_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutMatrix11x7_locals_dict
+);
+#else
 const mp_obj_type_t breakout_matrix11x7_BreakoutMatrix11x7_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutMatrix11x7,
     .make_new = BreakoutMatrix11x7_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutMatrix11x7_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_mics6814/breakout_mics6814.c b/micropython/modules/breakout_mics6814/breakout_mics6814.c
index 11cb785e..e127cb71 100644
--- a/micropython/modules/breakout_mics6814/breakout_mics6814.c
+++ b/micropython/modules/breakout_mics6814/breakout_mics6814.c
@@ -48,12 +48,22 @@ STATIC const mp_rom_map_elem_t BreakoutMICS6814_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutMICS6814_locals_dict, BreakoutMICS6814_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_mics6814_BreakoutMICS6814_type,
+    MP_QSTR_BreakoutMICS6814,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutMICS6814_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutMICS6814_locals_dict
+);
+#else
 const mp_obj_type_t breakout_mics6814_BreakoutMICS6814_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutMICS6814,
     .make_new = BreakoutMICS6814_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutMICS6814_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_msa301/breakout_msa301.c b/micropython/modules/breakout_msa301/breakout_msa301.c
index 4dc01d7f..afbfcea2 100644
--- a/micropython/modules/breakout_msa301/breakout_msa301.c
+++ b/micropython/modules/breakout_msa301/breakout_msa301.c
@@ -81,12 +81,22 @@ STATIC const mp_rom_map_elem_t BreakoutMSA301_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutMSA301_locals_dict, BreakoutMSA301_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_msa301_BreakoutMSA301_type,
+    MP_QSTR_BreakoutMSA301,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutMSA301_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutMSA301_locals_dict
+);
+#else
 const mp_obj_type_t breakout_msa301_BreakoutMSA301_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutMSA301,
     .make_new = BreakoutMSA301_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutMSA301_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_pmw3901/breakout_paa5100.c b/micropython/modules/breakout_pmw3901/breakout_paa5100.c
index 3935c00e..2589ee81 100644
--- a/micropython/modules/breakout_pmw3901/breakout_paa5100.c
+++ b/micropython/modules/breakout_pmw3901/breakout_paa5100.c
@@ -32,6 +32,16 @@ STATIC const mp_rom_map_elem_t BreakoutPAA5100_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutPAA5100_locals_dict, BreakoutPAA5100_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_paa5100_BreakoutPAA5100_type,
+    MP_QSTR_BreakoutPAA5100,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutPAA5100_make_new,
+    print, BreakoutPMW3901_print,
+    locals_dict, (mp_obj_dict_t*)&BreakoutPAA5100_locals_dict
+);
+#else
 const mp_obj_type_t breakout_paa5100_BreakoutPAA5100_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutPAA5100,
@@ -39,6 +49,7 @@ const mp_obj_type_t breakout_paa5100_BreakoutPAA5100_type = {
     .make_new = BreakoutPAA5100_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutPAA5100_locals_dict,
 };
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // breakout_paa5100 Module
diff --git a/micropython/modules/breakout_pmw3901/breakout_pmw3901.c b/micropython/modules/breakout_pmw3901/breakout_pmw3901.c
index 24e7382d..92cf4eec 100644
--- a/micropython/modules/breakout_pmw3901/breakout_pmw3901.c
+++ b/micropython/modules/breakout_pmw3901/breakout_pmw3901.c
@@ -32,6 +32,16 @@ STATIC const mp_rom_map_elem_t BreakoutPMW3901_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutPMW3901_locals_dict, BreakoutPMW3901_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_pmw3901_BreakoutPMW3901_type,
+    MP_QSTR_BreakoutPMW3901,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutPMW3901_make_new,
+    print, BreakoutPMW3901_print,
+    locals_dict, (mp_obj_dict_t*)&BreakoutPMW3901_locals_dict
+);
+#else
 const mp_obj_type_t breakout_pmw3901_BreakoutPMW3901_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutPMW3901,
@@ -39,6 +49,7 @@ const mp_obj_type_t breakout_pmw3901_BreakoutPMW3901_type = {
     .make_new = BreakoutPMW3901_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutPMW3901_locals_dict,
 };
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // breakout_pmw3901 Module
diff --git a/micropython/modules/breakout_potentiometer/breakout_potentiometer.c b/micropython/modules/breakout_potentiometer/breakout_potentiometer.c
index 70d81af4..1ce3b918 100644
--- a/micropython/modules/breakout_potentiometer/breakout_potentiometer.c
+++ b/micropython/modules/breakout_potentiometer/breakout_potentiometer.c
@@ -32,12 +32,22 @@ STATIC const mp_rom_map_elem_t BreakoutPotentiometer_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutPotentiometer_locals_dict, BreakoutPotentiometer_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_potentiometer_BreakoutPotentiometer_type,
+    MP_QSTR_BreakoutPotentiometer,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutPotentiometer_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutPotentiometer_locals_dict
+);
+#else
 const mp_obj_type_t breakout_potentiometer_BreakoutPotentiometer_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutPotentiometer,
     .make_new = BreakoutPotentiometer_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutPotentiometer_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.c b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.c
index f4322a2c..652bb883 100644
--- a/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.c
+++ b/micropython/modules/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.c
@@ -20,12 +20,22 @@ STATIC const mp_rom_map_elem_t BreakoutRGBMatrix5x5_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutRGBMatrix5x5_locals_dict, BreakoutRGBMatrix5x5_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type,
+    MP_QSTR_BreakoutRGBMatrix5x5,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutRGBMatrix5x5_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutRGBMatrix5x5_locals_dict
+);
+#else
 const mp_obj_type_t breakout_rgbmatrix5x5_BreakoutRGBMatrix5x5_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutRGBMatrix5x5,
     .make_new = BreakoutRGBMatrix5x5_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutRGBMatrix5x5_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_rtc/breakout_rtc.c b/micropython/modules/breakout_rtc/breakout_rtc.c
index 586f01a3..33dedf67 100644
--- a/micropython/modules/breakout_rtc/breakout_rtc.c
+++ b/micropython/modules/breakout_rtc/breakout_rtc.c
@@ -136,12 +136,22 @@ STATIC const mp_rom_map_elem_t BreakoutRTC_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutRTC_locals_dict, BreakoutRTC_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_rtc_BreakoutRTC_type,
+    MP_QSTR_BreakoutRTC,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutRTC_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutRTC_locals_dict
+);
+#else
 const mp_obj_type_t breakout_rtc_BreakoutRTC_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutRTC,
     .make_new = BreakoutRTC_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutRTC_locals_dict,
 };
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // breakout_rtc Module
diff --git a/micropython/modules/breakout_sgp30/breakout_sgp30.c b/micropython/modules/breakout_sgp30/breakout_sgp30.c
index 39ad456f..805db368 100644
--- a/micropython/modules/breakout_sgp30/breakout_sgp30.c
+++ b/micropython/modules/breakout_sgp30/breakout_sgp30.c
@@ -34,12 +34,22 @@ STATIC const mp_rom_map_elem_t BreakoutSGP30_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutSGP30_locals_dict, BreakoutSGP30_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_sgp30_BreakoutSGP30_type,
+    MP_QSTR_BreakoutSGP30,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutSGP30_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutSGP30_locals_dict
+);
+#else
 const mp_obj_type_t breakout_sgp30_BreakoutSGP30_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutSGP30,
     .make_new = BreakoutSGP30_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutSGP30_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_trackball/breakout_trackball.c b/micropython/modules/breakout_trackball/breakout_trackball.c
index ee118231..32ba5d52 100644
--- a/micropython/modules/breakout_trackball/breakout_trackball.c
+++ b/micropython/modules/breakout_trackball/breakout_trackball.c
@@ -36,12 +36,22 @@ STATIC const mp_rom_map_elem_t BreakoutTrackball_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(BreakoutTrackball_locals_dict, BreakoutTrackball_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    breakout_trackball_BreakoutTrackball_type,
+    MP_QSTR_BreakoutTrackball,
+    MP_TYPE_FLAG_NONE,
+    make_new, BreakoutTrackball_make_new,
+    locals_dict, (mp_obj_dict_t*)&BreakoutTrackball_locals_dict
+);
+#else
 const mp_obj_type_t breakout_trackball_BreakoutTrackball_type = {
     { &mp_type_type },
     .name = MP_QSTR_BreakoutTrackball,
     .make_new = BreakoutTrackball_make_new,
     .locals_dict = (mp_obj_dict_t*)&BreakoutTrackball_locals_dict,
 };
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/micropython/modules/breakout_vl53l5cx/vl53l5cx.c b/micropython/modules/breakout_vl53l5cx/vl53l5cx.c
index 7700add3..5515725f 100644
--- a/micropython/modules/breakout_vl53l5cx/vl53l5cx.c
+++ b/micropython/modules/breakout_vl53l5cx/vl53l5cx.c
@@ -47,12 +47,22 @@ STATIC const mp_rom_map_elem_t VL53L5CX_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(VL53L5CX_locals_dict, VL53L5CX_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    VL53L5CX_type,
+    MP_QSTR_VL53L5CX,
+    MP_TYPE_FLAG_NONE,
+    make_new, VL53L5CX_make_new,
+    locals_dict, (mp_obj_dict_t*)&VL53L5CX_locals_dict
+);
+#else
 const mp_obj_type_t VL53L5CX_type = {
     { &mp_type_type },
     .name = MP_QSTR_VL53L5CX,
     .make_new = VL53L5CX_make_new,
     .locals_dict = (mp_obj_dict_t*)&VL53L5CX_locals_dict,
 };
+#endif
 
 /***** Module Globals *****/
 STATIC const mp_map_elem_t vl53l5cx_globals_table[] = {
diff --git a/micropython/modules/encoder/encoder.c b/micropython/modules/encoder/encoder.c
index 52f389b2..4756d128 100644
--- a/micropython/modules/encoder/encoder.c
+++ b/micropython/modules/encoder/encoder.c
@@ -40,6 +40,16 @@ STATIC const mp_rom_map_elem_t Encoder_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(Encoder_locals_dict, Encoder_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    Encoder_type,
+    MP_QSTR_encoder,
+    MP_TYPE_FLAG_NONE,
+    make_new, Encoder_make_new,
+    print, Encoder_print,
+    locals_dict, (mp_obj_dict_t*)&Encoder_locals_dict
+);
+#else
 const mp_obj_type_t Encoder_type = {
     { &mp_type_type },
     .name = MP_QSTR_encoder,
@@ -47,6 +57,7 @@ const mp_obj_type_t Encoder_type = {
     .make_new = Encoder_make_new,
     .locals_dict = (mp_obj_dict_t*)&Encoder_locals_dict,
 };
+#endif
 
 /***** Globals Table *****/
 STATIC const mp_map_elem_t encoder_globals_table[] = {
diff --git a/micropython/modules/hub75/hub75.c b/micropython/modules/hub75/hub75.c
index bcb77cc4..b8993e89 100644
--- a/micropython/modules/hub75/hub75.c
+++ b/micropython/modules/hub75/hub75.c
@@ -23,6 +23,16 @@ STATIC const mp_rom_map_elem_t Hub75_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(Hub75_locals_dict, Hub75_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    Hub75_type,
+    MP_QSTR_hub75,
+    MP_TYPE_FLAG_NONE,
+    make_new, Hub75_make_new,
+    print, Hub75_print,
+    locals_dict, (mp_obj_dict_t*)&Hub75_locals_dict
+);
+#else
 const mp_obj_type_t Hub75_type = {
     { &mp_type_type },
     .name = MP_QSTR_hub75,
@@ -30,6 +40,7 @@ const mp_obj_type_t Hub75_type = {
     .make_new = Hub75_make_new,
     .locals_dict = (mp_obj_dict_t*)&Hub75_locals_dict,
 };
+#endif
 
 /***** Globals Table *****/
 
diff --git a/micropython/modules/jpegdec/jpegdec.c b/micropython/modules/jpegdec/jpegdec.c
index cebb6fb5..85dfade9 100644
--- a/micropython/modules/jpegdec/jpegdec.c
+++ b/micropython/modules/jpegdec/jpegdec.c
@@ -20,6 +20,16 @@ STATIC const mp_rom_map_elem_t JPEG_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(JPEG_locals_dict, JPEG_locals_dict_table);
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    JPEG_type,
+    MP_QSTR_jpegdec,
+    MP_TYPE_FLAG_NONE,
+    make_new, _JPEG_make_new,
+    //print, _JPEG_print,
+    locals_dict, (mp_obj_dict_t*)&JPEG_locals_dict
+);
+#else
 const mp_obj_type_t JPEG_type = {
     { &mp_type_type },
     .name = MP_QSTR_jpegdec,
@@ -27,6 +37,7 @@ const mp_obj_type_t JPEG_type = {
     .make_new = _JPEG_make_new,
     .locals_dict = (mp_obj_dict_t*)&JPEG_locals_dict,
 };
+#endif
 
 // module
 STATIC const mp_map_elem_t JPEG_globals_table[] = {
diff --git a/micropython/modules/motor/motor.c b/micropython/modules/motor/motor.c
index aef5c0a3..3bdb9e80 100644
--- a/micropython/modules/motor/motor.c
+++ b/micropython/modules/motor/motor.c
@@ -128,6 +128,16 @@ STATIC MP_DEFINE_CONST_DICT(Motor_locals_dict, Motor_locals_dict_table);
 STATIC MP_DEFINE_CONST_DICT(MotorCluster_locals_dict, MotorCluster_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    Motor_type,
+    MP_QSTR_motor,
+    MP_TYPE_FLAG_NONE,
+    make_new, Motor_make_new,
+    print, Motor_print,
+    locals_dict, (mp_obj_dict_t*)&Motor_locals_dict
+);
+#else
 const mp_obj_type_t Motor_type = {
     { &mp_type_type },
     .name = MP_QSTR_motor,
@@ -135,7 +145,18 @@ const mp_obj_type_t Motor_type = {
     .make_new = Motor_make_new,
     .locals_dict = (mp_obj_dict_t*)&Motor_locals_dict,
 };
+#endif
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    MotorCluster_type,
+    MP_QSTR_motor_cluster,
+    MP_TYPE_FLAG_NONE,
+    make_new, MotorCluster_make_new,
+    print, MotorCluster_print,
+    locals_dict, (mp_obj_dict_t*)&MotorCluster_locals_dict
+);
+#else
 const mp_obj_type_t MotorCluster_type = {
     { &mp_type_type },
     .name = MP_QSTR_motor_cluster,
@@ -143,6 +164,7 @@ const mp_obj_type_t MotorCluster_type = {
     .make_new = MotorCluster_make_new,
     .locals_dict = (mp_obj_dict_t*)&MotorCluster_locals_dict,
 };
+#endif
 
 
 /***** Module Constants *****/
diff --git a/micropython/modules/pcf85063a/pcf85063a.c b/micropython/modules/pcf85063a/pcf85063a.c
index 3d0dbeda..a55e2912 100644
--- a/micropython/modules/pcf85063a/pcf85063a.c
+++ b/micropython/modules/pcf85063a/pcf85063a.c
@@ -64,12 +64,22 @@ STATIC const mp_rom_map_elem_t PCF85063A_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(PCF85063A_locals_dict, PCF85063A_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    pcf85063a_PCF85063A_type,
+    MP_QSTR_pcf85063a,
+    MP_TYPE_FLAG_NONE,
+    make_new, PCF85063A_make_new,
+    locals_dict, (mp_obj_dict_t*)&PCF85063A_locals_dict
+);
+#else
 const mp_obj_type_t pcf85063a_PCF85063A_type = {
     { &mp_type_type },
     .name = MP_QSTR_pcf85063a,
     .make_new = PCF85063A_make_new,
     .locals_dict = (mp_obj_dict_t*)&PCF85063A_locals_dict,
 };
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // pcf85063a Module
diff --git a/micropython/modules/picographics/picographics.c b/micropython/modules/picographics/picographics.c
index f1c0bc81..edd93098 100644
--- a/micropython/modules/picographics/picographics.c
+++ b/micropython/modules/picographics/picographics.c
@@ -93,6 +93,16 @@ STATIC const mp_rom_map_elem_t ModPicoGraphics_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(ModPicoGraphics_locals_dict, ModPicoGraphics_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    ModPicoGraphics_type,
+    MP_QSTR_picographics,
+    MP_TYPE_FLAG_NONE,
+    make_new, ModPicoGraphics_make_new,
+    buffer, ModPicoGraphics_get_framebuffer,
+    locals_dict, (mp_obj_dict_t*)&ModPicoGraphics_locals_dict
+);
+#else
 const mp_obj_type_t ModPicoGraphics_type = {
     { &mp_type_type },
     .name = MP_QSTR_picographics,
@@ -100,6 +110,7 @@ const mp_obj_type_t ModPicoGraphics_type = {
     .buffer_p = { .get_buffer = ModPicoGraphics_get_framebuffer },
     .locals_dict = (mp_obj_dict_t*)&ModPicoGraphics_locals_dict,
 };
+#endif
 
 /***** Module Globals *****/
 STATIC const mp_map_elem_t picographics_globals_table[] = {
diff --git a/micropython/modules/pimoroni_bus/pimoroni_bus.c b/micropython/modules/pimoroni_bus/pimoroni_bus.c
index ac336e0b..4f32952f 100644
--- a/micropython/modules/pimoroni_bus/pimoroni_bus.c
+++ b/micropython/modules/pimoroni_bus/pimoroni_bus.c
@@ -2,19 +2,39 @@
 
 MP_DEFINE_CONST_FUN_OBJ_1(SPISlot_obj, SPISlot);
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    SPIPins_type,
+    MP_QSTR_SPIBus,
+    MP_TYPE_FLAG_NONE,
+    make_new, SPIPins_make_new,
+    print, PimoroniBus_print
+);
+#else
 const mp_obj_type_t SPIPins_type = {
     { &mp_type_type },
     .name = MP_QSTR_SPIBus,
     .print = PimoroniBus_print,
     .make_new = SPIPins_make_new
 };
+#endif
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    ParallelPins_type,
+    MP_QSTR_ParallelBus,
+    MP_TYPE_FLAG_NONE,
+    make_new, ParallelPins_make_new,
+    print, PimoroniBus_print
+);
+#else
 const mp_obj_type_t ParallelPins_type = {
     { &mp_type_type },
     .name = MP_QSTR_ParallelBus,
     .print = PimoroniBus_print,
     .make_new = ParallelPins_make_new
 };
+#endif
 
 STATIC const mp_map_elem_t pimoroni_bus_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_pimoroni_bus) },
diff --git a/micropython/modules/pimoroni_i2c/pimoroni_i2c.c b/micropython/modules/pimoroni_i2c/pimoroni_i2c.c
index 69550bc8..ca475974 100644
--- a/micropython/modules/pimoroni_i2c/pimoroni_i2c.c
+++ b/micropython/modules/pimoroni_i2c/pimoroni_i2c.c
@@ -21,6 +21,17 @@ STATIC const mp_machine_i2c_p_t machine_i2c_p = {
 };
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    PimoroniI2C_type,
+    MP_QSTR_pimoroni_i2c,
+    MP_TYPE_FLAG_NONE,
+    make_new, PimoroniI2C_make_new,
+    print, PimoroniI2C_print,
+    protocol, &machine_i2c_p,
+    locals_dict, (mp_obj_dict_t*)&mp_machine_i2c_locals_dict
+);
+#else
 const mp_obj_type_t PimoroniI2C_type = {
     { &mp_type_type },
     .name = MP_QSTR_pimoroni_i2c,
@@ -29,7 +40,7 @@ const mp_obj_type_t PimoroniI2C_type = {
     .protocol = &machine_i2c_p,
     .locals_dict = (mp_obj_dict_t*)&mp_machine_i2c_locals_dict,
 };
-
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // breakout_potentiometer Module
diff --git a/micropython/modules/plasma/plasma.c b/micropython/modules/plasma/plasma.c
index 2413428f..da84c677 100644
--- a/micropython/modules/plasma/plasma.c
+++ b/micropython/modules/plasma/plasma.c
@@ -44,6 +44,16 @@ STATIC MP_DEFINE_CONST_DICT(PlasmaAPA102_locals_dict, PlasmaAPA102_locals_dict_t
 STATIC MP_DEFINE_CONST_DICT(PlasmaWS2812_locals_dict, PlasmaWS2812_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    PlasmaAPA102_type,
+    MP_QSTR_plasma_apa102,
+    MP_TYPE_FLAG_NONE,
+    make_new, PlasmaAPA102_make_new,
+    print, PlasmaAPA102_print,
+    locals_dict, (mp_obj_dict_t*)&PlasmaAPA102_locals_dict
+);
+#else
 const mp_obj_type_t PlasmaAPA102_type = {
     { &mp_type_type },
     .name = MP_QSTR_plasma_apa102,
@@ -51,7 +61,18 @@ const mp_obj_type_t PlasmaAPA102_type = {
     .make_new = PlasmaAPA102_make_new,
     .locals_dict = (mp_obj_dict_t*)&PlasmaAPA102_locals_dict,
 };
+#endif
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    PlasmaWS2812_type,
+    MP_QSTR_plasma_ws2812,
+    MP_TYPE_FLAG_NONE,
+    make_new, PlasmaWS2812_print,
+    print, PlasmaWS2812_make_new,
+    locals_dict, (mp_obj_dict_t*)&PlasmaWS2812_locals_dict
+);
+#else
 const mp_obj_type_t PlasmaWS2812_type = {
     { &mp_type_type },
     .name = MP_QSTR_plasma_ws2812,
@@ -59,6 +80,7 @@ const mp_obj_type_t PlasmaWS2812_type = {
     .make_new = PlasmaWS2812_make_new,
     .locals_dict = (mp_obj_dict_t*)&PlasmaWS2812_locals_dict,
 };
+#endif
 
 typedef struct _mp_obj_float_t {
     mp_obj_base_t base;
diff --git a/micropython/modules/servo/servo.c b/micropython/modules/servo/servo.c
index 9e393f4a..524ea9d7 100644
--- a/micropython/modules/servo/servo.c
+++ b/micropython/modules/servo/servo.c
@@ -150,6 +150,16 @@ STATIC MP_DEFINE_CONST_DICT(Servo_locals_dict, Servo_locals_dict_table);
 STATIC MP_DEFINE_CONST_DICT(ServoCluster_locals_dict, ServoCluster_locals_dict_table);
 
 /***** Class Definition *****/
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    Calibration_type,
+    MP_QSTR_calibration,
+    MP_TYPE_FLAG_NONE,
+    make_new, Calibration_make_new,
+    print, Calibration_print,
+    locals_dict, (mp_obj_dict_t*)&Calibration_locals_dict
+);
+#else
 const mp_obj_type_t Calibration_type = {
     { &mp_type_type },
     .name = MP_QSTR_calibration,
@@ -157,7 +167,18 @@ const mp_obj_type_t Calibration_type = {
     .make_new = Calibration_make_new,
     .locals_dict = (mp_obj_dict_t*)&Calibration_locals_dict,
 };
+#endif
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    Servo_type,
+    MP_QSTR_servo,
+    MP_TYPE_FLAG_NONE,
+    make_new, Servo_make_new,
+    print, Servo_print,
+    locals_dict, (mp_obj_dict_t*)&Servo_locals_dict
+);
+#else
 const mp_obj_type_t Servo_type = {
     { &mp_type_type },
     .name = MP_QSTR_servo,
@@ -165,7 +186,18 @@ const mp_obj_type_t Servo_type = {
     .make_new = Servo_make_new,
     .locals_dict = (mp_obj_dict_t*)&Servo_locals_dict,
 };
+#endif
 
+#ifdef MP_DEFINE_CONST_OBJ_TYPE
+MP_DEFINE_CONST_OBJ_TYPE(
+    ServoCluster_type,
+    MP_QSTR_servo_cluster,
+    MP_TYPE_FLAG_NONE,
+    make_new, ServoCluster_make_new,
+    print, ServoCluster_print,
+    locals_dict, (mp_obj_dict_t*)&ServoCluster_locals_dict
+);
+#else
 const mp_obj_type_t ServoCluster_type = {
     { &mp_type_type },
     .name = MP_QSTR_servo_cluster,
@@ -173,6 +205,7 @@ const mp_obj_type_t ServoCluster_type = {
     .make_new = ServoCluster_make_new,
     .locals_dict = (mp_obj_dict_t*)&ServoCluster_locals_dict,
 };
+#endif
 
 typedef struct _mp_obj_float_t {
     mp_obj_base_t base;