Merge pull request #208 from adafruit/merge-v1.9.2

Merge MicroPython v1.9.2

44 files changed, 148 insertions, 148 deletions

diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index 23b08470f..dc625e855 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -148,11 +148,11 @@ const mp_obj_property_t analogio_analogin_reference_voltage_obj = {
 };
 
 STATIC const mp_rom_map_elem_t analogio_analogin_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit),                 MP_ROM_PTR(&analogio_analogin_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__),              MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),               MP_ROM_PTR(&analogio_analogin___exit___obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_value),              MP_ROM_PTR(&analogio_analogin_value_obj)},
-    { MP_OBJ_NEW_QSTR(MP_QSTR_reference_voltage),  MP_ROM_PTR(&analogio_analogin_reference_voltage_obj)},
+    { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&analogio_analogin_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),          MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),           MP_ROM_PTR(&analogio_analogin___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_value),              MP_ROM_PTR(&analogio_analogin_value_obj)},
+    { MP_ROM_QSTR(MP_QSTR_reference_voltage),  MP_ROM_PTR(&analogio_analogin_reference_voltage_obj)},
 };
 
 STATIC MP_DEFINE_CONST_DICT(analogio_analogin_locals_dict, analogio_analogin_locals_dict_table);
diff --git a/shared-bindings/analogio/AnalogIn.h b/shared-bindings/analogio/AnalogIn.h
index 0ddc1ea0c..9c13526ac 100644
--- a/shared-bindings/analogio/AnalogIn.h
+++ b/shared-bindings/analogio/AnalogIn.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGIN_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGIN_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGIN_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGIN_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/analogio/AnalogIn.h"
diff --git a/shared-bindings/analogio/AnalogOut.h b/shared-bindings/analogio/AnalogOut.h
index 51b291afd..4276ec4ae 100644
--- a/shared-bindings/analogio/AnalogOut.h
+++ b/shared-bindings/analogio/AnalogOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGOUT_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGOUT_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGOUT_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/analogio/AnalogOut.h"
@@ -36,4 +36,4 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self, con
 void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self);
 void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self, uint16_t value);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGOUT_H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO_ANALOGOUT_H
diff --git a/shared-bindings/analogio/__init__.h b/shared-bindings/analogio/__init__.h
index 9a0c77cb8..284a95b6d 100644
--- a/shared-bindings/analogio/__init__.h
+++ b/shared-bindings/analogio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_ANALOGIO___INIT___H
diff --git a/shared-bindings/audiobusio/PDMIn.h b/shared-bindings/audiobusio/PDMIn.h
index c233e4848..a12b0a1f1 100644
--- a/shared-bindings/audiobusio/PDMIn.h
+++ b/shared-bindings/audiobusio/PDMIn.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO_AUDIOOUT_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO_AUDIOOUT_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO_AUDIOOUT_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO_AUDIOOUT_H
 
 #include "common-hal/audiobusio/PDMIn.h"
 #include "common-hal/microcontroller/Pin.h"
@@ -43,4 +43,4 @@ uint8_t common_hal_audiobusio_pdmin_get_bit_depth(audiobusio_pdmin_obj_t* self);
 uint32_t common_hal_audiobusio_pdmin_get_frequency(audiobusio_pdmin_obj_t* self);
 // TODO(tannewt): Add record to file
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO_AUDIOOUT_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO_AUDIOOUT_H
diff --git a/shared-bindings/audiobusio/__init__.h b/shared-bindings/audiobusio/__init__.h
index 0bcee3aad..f7a0c3cf9 100644
--- a/shared-bindings/audiobusio/__init__.h
+++ b/shared-bindings/audiobusio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOBUSIO___INIT___H
diff --git a/shared-bindings/audioio/AudioOut.h b/shared-bindings/audioio/AudioOut.h
index 0fb289e2d..2293486ad 100644
--- a/shared-bindings/audioio/AudioOut.h
+++ b/shared-bindings/audioio/AudioOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO_AUDIOOUT_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO_AUDIOOUT_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO_AUDIOOUT_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO_AUDIOOUT_H
 
 #include "common-hal/audioio/AudioOut.h"
 #include "common-hal/microcontroller/Pin.h"
@@ -45,4 +45,4 @@ bool common_hal_audioio_audioout_get_playing(audioio_audioout_obj_t* self);
 uint32_t common_hal_audioio_audioout_get_frequency(audioio_audioout_obj_t* self);
 void common_hal_audioio_audioout_set_frequency(audioio_audioout_obj_t* self, uint32_t frequency);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO_AUDIOOUT_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO_AUDIOOUT_H
diff --git a/shared-bindings/audioio/__init__.h b/shared-bindings/audioio/__init__.h
index 32d1f2456..e4b7067d1 100644
--- a/shared-bindings/audioio/__init__.h
+++ b/shared-bindings/audioio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO___INIT___H
diff --git a/shared-bindings/bitbangio/I2C.h b/shared-bindings/bitbangio/I2C.h
index 26a3d6d47..d8acbecd2 100644
--- a/shared-bindings/bitbangio/I2C.h
+++ b/shared-bindings/bitbangio/I2C.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_I2C_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_I2C_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_I2C_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_I2C_H
 
 #include "py/obj.h"
 
@@ -60,4 +60,4 @@ extern uint8_t shared_module_bitbangio_i2c_read(bitbangio_i2c_obj_t *self,
                                                 uint16_t address,
                                                 uint8_t * data, size_t len);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_I2C_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_I2C_H
diff --git a/shared-bindings/bitbangio/OneWire.h b/shared-bindings/bitbangio/OneWire.h
index c21bf7067..894c6e368 100644
--- a/shared-bindings/bitbangio/OneWire.h
+++ b/shared-bindings/bitbangio/OneWire.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_ONEWIRE_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_ONEWIRE_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_ONEWIRE_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_ONEWIRE_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-module/bitbangio/types.h"
@@ -39,4 +39,4 @@ extern bool shared_module_bitbangio_onewire_reset(bitbangio_onewire_obj_t* self)
 extern bool shared_module_bitbangio_onewire_read_bit(bitbangio_onewire_obj_t* self);
 extern void shared_module_bitbangio_onewire_write_bit(bitbangio_onewire_obj_t* self, bool bit);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_ONEWIRE_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_ONEWIRE_H
diff --git a/shared-bindings/bitbangio/SPI.h b/shared-bindings/bitbangio/SPI.h
index a36da949e..93089a8aa 100644
--- a/shared-bindings/bitbangio/SPI.h
+++ b/shared-bindings/bitbangio/SPI.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_SPI_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_SPI_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_SPI_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_SPI_H
 
 #include "py/obj.h"
 
@@ -55,4 +55,4 @@ extern bool shared_module_bitbangio_spi_write(bitbangio_spi_obj_t *self, const u
 // Reads in len bytes while outputting zeroes.
 extern bool shared_module_bitbangio_spi_read(bitbangio_spi_obj_t *self, uint8_t *data, size_t len);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_SPI_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO_SPI_H
diff --git a/shared-bindings/bitbangio/__init__.h b/shared-bindings/bitbangio/__init__.h
index 4404501eb..0e9206a44 100644
--- a/shared-bindings/bitbangio/__init__.h
+++ b/shared-bindings/bitbangio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_BITBANGIO___INIT___H
diff --git a/shared-bindings/board/__init__.h b/shared-bindings/board/__init__.h
index 9ab646a45..720239f28 100644
--- a/shared-bindings/board/__init__.h
+++ b/shared-bindings/board/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BOARD___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BOARD___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BOARD___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BOARD___INIT___H
 
 #include "py/obj.h"
 
 extern const mp_obj_dict_t board_module_globals;
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_BOARD___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_BOARD___INIT___H
diff --git a/shared-bindings/busio/I2C.h b/shared-bindings/busio/I2C.h
index 7b8b4573c..00a55726b 100644
--- a/shared-bindings/busio/I2C.h
+++ b/shared-bindings/busio/I2C.h
@@ -31,8 +31,8 @@
 // This file includes externs for all functions a port should implement to
 // support the machine module.
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H
 
 #include "py/obj.h"
 
@@ -67,4 +67,4 @@ extern uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addres
 extern uint8_t common_hal_busio_i2c_read(busio_i2c_obj_t *self, uint16_t address,
                                             uint8_t * data, size_t len);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_I2C_H
diff --git a/shared-bindings/busio/OneWire.h b/shared-bindings/busio/OneWire.h
index 4a358ddd5..893ee9919 100644
--- a/shared-bindings/busio/OneWire.h
+++ b/shared-bindings/busio/OneWire.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_ONEWIRE_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_ONEWIRE_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_ONEWIRE_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_ONEWIRE_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/busio/OneWire.h"
@@ -39,4 +39,4 @@ extern bool common_hal_busio_onewire_reset(busio_onewire_obj_t* self);
 extern bool common_hal_busio_onewire_read_bit(busio_onewire_obj_t* self);
 extern void common_hal_busio_onewire_write_bit(busio_onewire_obj_t* self, bool bit);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_ONEWIRE_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_ONEWIRE_H
diff --git a/shared-bindings/busio/SPI.h b/shared-bindings/busio/SPI.h
index 97b92e377..966444f25 100644
--- a/shared-bindings/busio/SPI.h
+++ b/shared-bindings/busio/SPI.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H
 
 #include "py/obj.h"
 
@@ -54,4 +54,4 @@ extern bool common_hal_busio_spi_write(busio_spi_obj_t *self, const uint8_t *dat
 // Reads in len bytes while outputting zeroes.
 extern bool common_hal_busio_spi_read(busio_spi_obj_t *self, uint8_t *data, size_t len, uint8_t write_value);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_SPI_H
diff --git a/shared-bindings/busio/UART.h b/shared-bindings/busio/UART.h
index 6311d21ce..4432d5996 100644
--- a/shared-bindings/busio/UART.h
+++ b/shared-bindings/busio/UART.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_UART_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_UART_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_UART_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_UART_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/busio/UART.h"
@@ -57,4 +57,4 @@ extern size_t common_hal_busio_uart_write(busio_uart_obj_t *self,
 extern uint32_t common_hal_busio_uart_rx_characters_available(busio_uart_obj_t *self);
 extern bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_UART_H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO_UART_H
diff --git a/shared-bindings/busio/__init__.h b/shared-bindings/busio/__init__.h
index 214c2b144..bcea30504 100644
--- a/shared-bindings/busio/__init__.h
+++ b/shared-bindings/busio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_BUSIO___INIT___H
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index 83134d0f8..7fd823a60 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -335,9 +335,9 @@ const mp_obj_property_t digitalio_digitalio_pull_obj = {
 
 STATIC const mp_rom_map_elem_t digitalio_digitalinout_locals_dict_table[] = {
     // instance methods
-    { MP_ROM_QSTR(MP_QSTR_deinit),                 MP_ROM_PTR(&digitalio_digitalinout_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR___enter__),              MP_ROM_PTR(&default___enter___obj) },
-    { MP_ROM_QSTR(MP_QSTR___exit__),               MP_ROM_PTR(&digitalio_digitalinout_obj___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&digitalio_digitalinout_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__),          MP_ROM_PTR(&default___enter___obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__),           MP_ROM_PTR(&digitalio_digitalinout_obj___exit___obj) },
     { MP_ROM_QSTR(MP_QSTR_switch_to_output),   MP_ROM_PTR(&digitalio_digitalinout_switch_to_output_obj) },
     { MP_ROM_QSTR(MP_QSTR_switch_to_input),    MP_ROM_PTR(&digitalio_digitalinout_switch_to_input_obj) },
 
diff --git a/shared-bindings/digitalio/DigitalInOut.h b/shared-bindings/digitalio/DigitalInOut.h
index 861e6f911..da0856edc 100644
--- a/shared-bindings/digitalio/DigitalInOut.h
+++ b/shared-bindings/digitalio/DigitalInOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/digitalio/DigitalInOut.h"
@@ -52,4 +52,4 @@ enum digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(dig
 void common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t* self, enum digitalio_pull_t pull);
 enum digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(digitalio_digitalinout_obj_t* self);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIGITALINOUT_H
diff --git a/shared-bindings/digitalio/Direction.h b/shared-bindings/digitalio/Direction.h
index 5b02acc02..e8fbf181d 100644
--- a/shared-bindings/digitalio/Direction.h
+++ b/shared-bindings/digitalio/Direction.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H
 
 #include "py/obj.h"
 
@@ -42,4 +42,4 @@ const mp_obj_type_t digitalio_direction_type;
 extern const digitalio_direction_obj_t digitalio_direction_input_obj;
 extern const digitalio_direction_obj_t digitalio_direction_output_obj;
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DIRECTION_H
diff --git a/shared-bindings/digitalio/DriveMode.h b/shared-bindings/digitalio/DriveMode.h
index 70722fbde..959885b1b 100644
--- a/shared-bindings/digitalio/DriveMode.h
+++ b/shared-bindings/digitalio/DriveMode.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H
 
 #include "py/obj.h"
 
@@ -43,4 +43,4 @@ const mp_obj_type_t digitalio_drive_mode_type;
 extern const digitalio_drive_mode_obj_t digitalio_drive_mode_push_pull_obj;
 extern const digitalio_drive_mode_obj_t digitalio_drive_mode_open_drain_obj;
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_DRIVEMODE_H
diff --git a/shared-bindings/digitalio/Pull.h b/shared-bindings/digitalio/Pull.h
index e63f98ea8..8c88d8673 100644
--- a/shared-bindings/digitalio/Pull.h
+++ b/shared-bindings/digitalio/Pull.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H
 
 #include "py/obj.h"
 
@@ -43,4 +43,4 @@ typedef struct {
 extern const digitalio_pull_obj_t digitalio_pull_up_obj;
 extern const digitalio_pull_obj_t digitalio_pull_down_obj;
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO_PULL_H
diff --git a/shared-bindings/digitalio/__init__.h b/shared-bindings/digitalio/__init__.h
index ed7cb5181..8ab7f789e 100644
--- a/shared-bindings/digitalio/__init__.h
+++ b/shared-bindings/digitalio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_DIGITALIO___INIT___H
diff --git a/shared-bindings/microcontroller/Pin.h b/shared-bindings/microcontroller/Pin.h
index 75193bb78..ed831b258 100644
--- a/shared-bindings/microcontroller/Pin.h
+++ b/shared-bindings/microcontroller/Pin.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PIN_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PIN_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PIN_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PIN_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "py/obj.h"
@@ -38,4 +38,4 @@ void assert_pin_free(const mcu_pin_obj_t* pin);
 
 bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PIN_H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER_PIN_H
diff --git a/shared-bindings/microcontroller/__init__.h b/shared-bindings/microcontroller/__init__.h
index 52aabf9b8..9bad926cd 100644
--- a/shared-bindings/microcontroller/__init__.h
+++ b/shared-bindings/microcontroller/__init__.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H
 
 #include "py/mpconfig.h"
 #include "py/obj.h"
@@ -44,4 +44,4 @@ extern const nvm_bytearray_obj_t common_hal_mcu_nvm_obj;
 
 #endif
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_MICROCONTROLLER___INIT___H
diff --git a/shared-bindings/nvm/ByteArray.h b/shared-bindings/nvm/ByteArray.h
index 43d942c23..5eee3ab50 100644
--- a/shared-bindings/nvm/ByteArray.h
+++ b/shared-bindings/nvm/ByteArray.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_NVM_BYTEARRAY_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_NVM_BYTEARRAY_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_NVM_BYTEARRAY_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_NVM_BYTEARRAY_H
 
 #include "common-hal/nvm/ByteArray.h"
 
@@ -40,4 +40,4 @@ bool common_hal_nvm_bytearray_set_bytes(nvm_bytearray_obj_t *self,
 void common_hal_nvm_bytearray_get_bytes(nvm_bytearray_obj_t *self,
     uint32_t start_index, uint32_t len, uint8_t* values);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_NVM_BYTEARRAY_H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_NVM_BYTEARRAY_H
diff --git a/shared-bindings/nvm/__init__.c b/shared-bindings/nvm/__init__.c
index 8caf33ffb..ef5c7ccb3 100644
--- a/shared-bindings/nvm/__init__.c
+++ b/shared-bindings/nvm/__init__.c
@@ -49,7 +49,7 @@
 //|
 //|     ByteArray
 STATIC const mp_rom_map_elem_t nvm_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_nvm) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nvm) },
     { MP_ROM_QSTR(MP_QSTR_ByteArray),   MP_ROM_PTR(&nvm_bytearray_type) },
 };
 
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 277224538..159f5448a 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -204,30 +204,30 @@ STATIC mp_obj_t os_urandom(mp_obj_t size_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_os) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&os_chdir_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&os_getcwd_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&os_listdir_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&os_mkdir_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_remove_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_rename), MP_ROM_PTR(&os_rename_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&os_rmdir_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_stat), MP_ROM_PTR(&os_stat_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&os_statvfs_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&os_remove_obj) }, // unlink aliases to remove
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&os_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&os_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&os_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&os_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&os_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&os_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&os_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&os_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&os_statvfs_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&os_remove_obj) }, // unlink aliases to remove
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sync), MP_ROM_PTR(&os_sync_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&os_sync_obj) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
 
 //| .. data:: sep
 //|
-//|   Separator used to dileneate path components such as folder and file names.
+//|   Separator used to delineate path components such as folder and file names.
 //|
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sep), MP_OBJ_NEW_QSTR(MP_QSTR__slash_) },
+    { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
diff --git a/shared-bindings/os/__init__.h b/shared-bindings/os/__init__.h
index 41715e7ac..3776fef64 100644
--- a/shared-bindings/os/__init__.h
+++ b/shared-bindings/os/__init__.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_OS___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_OS___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_OS___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_OS___INIT___H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -48,4 +48,4 @@ mp_obj_t common_hal_os_statvfs(const char* path);
 // Returns true if data was correctly sourced from a true random number generator.
 bool common_hal_os_urandom(uint8_t* buffer, mp_uint_t length);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_OS___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_OS___INIT___H
diff --git a/shared-bindings/pulseio/PWMOut.h b/shared-bindings/pulseio/PWMOut.h
index 423acf0e9..98858654d 100644
--- a/shared-bindings/pulseio/PWMOut.h
+++ b/shared-bindings/pulseio/PWMOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PWMOUT_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PWMOUT_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PWMOUT_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PWMOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/pulseio/PWMOut.h"
@@ -42,4 +42,4 @@ extern void common_hal_pulseio_pwmout_set_frequency(pulseio_pwmout_obj_t* self,
 extern uint32_t common_hal_pulseio_pwmout_get_frequency(pulseio_pwmout_obj_t* self);
 extern bool common_hal_pulseio_pwmout_get_variable_frequency(pulseio_pwmout_obj_t* self);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PWMOUT_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PWMOUT_H
diff --git a/shared-bindings/pulseio/PulseIn.h b/shared-bindings/pulseio/PulseIn.h
index 52e0b861b..1b96c93c9 100644
--- a/shared-bindings/pulseio/PulseIn.h
+++ b/shared-bindings/pulseio/PulseIn.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEIN_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEIN_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEIN_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEIN_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/pulseio/PulseIn.h"
@@ -43,4 +43,4 @@ extern uint16_t common_hal_pulseio_pulsein_get_maxlen(pulseio_pulsein_obj_t* sel
 extern uint16_t common_hal_pulseio_pulsein_get_len(pulseio_pulsein_obj_t* self);
 extern uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self, int16_t index);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEIN_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEIN_H
diff --git a/shared-bindings/pulseio/PulseOut.h b/shared-bindings/pulseio/PulseOut.h
index 17f034fda..d6279ed6f 100644
--- a/shared-bindings/pulseio/PulseOut.h
+++ b/shared-bindings/pulseio/PulseOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEOUT_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEOUT_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEOUT_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEOUT_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/pulseio/PulseOut.h"
@@ -39,4 +39,4 @@ extern void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t* self);
 extern void common_hal_pulseio_pulseout_send(pulseio_pulseout_obj_t* self,
     uint16_t* pulses, uint16_t len);
 
-#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEOUT_H__
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO_PULSEOUT_H
diff --git a/shared-bindings/pulseio/__init__.h b/shared-bindings/pulseio/__init__.h
index 26bb9f7b4..0691ad282 100644
--- a/shared-bindings/pulseio/__init__.h
+++ b/shared-bindings/pulseio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_PULSEIO___INIT___H
diff --git a/shared-bindings/random/__init__.h b/shared-bindings/random/__init__.h
index 558b5f194..b5011b1a8 100644
--- a/shared-bindings/random/__init__.h
+++ b/shared-bindings/random/__init__.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_RANDOM___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_RANDOM___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_RANDOM___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_RANDOM___INIT___H
 
 // This depends on shared_module because nearly all functionality is port
 // agnostic. The random module only depends on the common_hal_os_urandom or
@@ -37,4 +37,4 @@ mp_int_t shared_modules_random_randrange(mp_int_t start, mp_int_t stop, mp_int_t
 mp_float_t shared_modules_random_random(void);
 mp_float_t shared_modules_random_uniform(mp_float_t a, mp_float_t b);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_RANDOM___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_RANDOM___INIT___H
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index 993b87f32..4831b0037 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -118,11 +118,11 @@ mp_obj_t storage_remount(mp_obj_t mount_path, mp_obj_t readonly) {
 MP_DEFINE_CONST_FUN_OBJ_2(storage_remount_obj, storage_remount);
 
 STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_storage) },
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_storage) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_mount), MP_ROM_PTR(&storage_mount_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_umount), MP_ROM_PTR(&storage_umount_obj) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_remount), MP_ROM_PTR(&storage_remount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&storage_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&storage_umount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remount), MP_ROM_PTR(&storage_remount_obj) },
 
     //| .. class:: VfsFat(block_device)
     //|
@@ -130,7 +130,7 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = {
     //|
     //|   :param block_device: Block device the the filesystem lives on
     //|
-    { MP_OBJ_NEW_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(storage_module_globals, storage_module_globals_table);
diff --git a/shared-bindings/storage/__init__.h b/shared-bindings/storage/__init__.h
index a5d8d6253..574b5ff8d 100644
--- a/shared-bindings/storage/__init__.h
+++ b/shared-bindings/storage/__init__.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_STORAGE___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_STORAGE___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_STORAGE___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_STORAGE___INIT___H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -35,4 +35,4 @@ void common_hal_storage_umount_path(const char* path);
 void common_hal_storage_umount_object(mp_obj_t vfs_obj);
 void common_hal_storage_remount(const char* path, bool readonly);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_STORAGE___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_STORAGE___INIT___H
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index a224f9026..105758951 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -133,13 +133,13 @@ const mp_obj_namedtuple_type_t struct_time_type_obj = {
 };
 #endif
 
-STATIC const mp_map_elem_t time_module_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_time) },
+STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_monotonic), (mp_obj_t)&time_monotonic_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sleep), (mp_obj_t)&time_sleep_obj },
+    { MP_ROM_QSTR(MP_QSTR_monotonic), MP_ROM_PTR(&time_monotonic_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&time_sleep_obj) },
     #if MICROPY_PY_COLLECTIONS
-    { MP_OBJ_NEW_QSTR(MP_QSTR_struct_time), (mp_obj_t)&struct_time_type_obj },
+    { MP_ROM_QSTR(MP_QSTR_struct_time), MP_ROM_PTR(&struct_time_type_obj) },
     #endif
 };
 
diff --git a/shared-bindings/time/__init__.h b/shared-bindings/time/__init__.h
index 37bd26a4d..f6ecb5989 100644
--- a/shared-bindings/time/__init__.h
+++ b/shared-bindings/time/__init__.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_TIME___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_TIME___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_TIME___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_TIME___INIT___H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -33,4 +33,4 @@
 extern uint64_t common_hal_time_monotonic(void);
 extern void common_hal_time_delay_ms(uint32_t);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_TIME___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_TIME___INIT___H
diff --git a/shared-bindings/touchio/TouchIn.h b/shared-bindings/touchio/TouchIn.h
index 495cb2b14..6ee668f38 100644
--- a/shared-bindings/touchio/TouchIn.h
+++ b/shared-bindings/touchio/TouchIn.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/touchio/TouchIn.h"
@@ -36,4 +36,4 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self, const mcu
 void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self);
 bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H
diff --git a/shared-bindings/touchio/__init__.h b/shared-bindings/touchio/__init__.h
index fc40e462b..f1d350141 100644
--- a/shared-bindings/touchio/__init__.h
+++ b/shared-bindings/touchio/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H
 
 #include "py/obj.h"
 
 // Nothing now.
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H
diff --git a/shared-bindings/uheap/__init__.h b/shared-bindings/uheap/__init__.h
index 79dc0999b..53afb4172 100644
--- a/shared-bindings/uheap/__init__.h
+++ b/shared-bindings/uheap/__init__.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_UHEAP___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_UHEAP___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_UHEAP___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_UHEAP___INIT___H
 
 #include "py/obj.h"
 
 extern uint32_t shared_module_uheap_info(mp_obj_t obj);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_UHEAP___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_UHEAP___INIT___H
diff --git a/shared-bindings/usb_hid/Device.h b/shared-bindings/usb_hid/Device.h
index 234d7ebc2..33b9f1c99 100644
--- a/shared-bindings/usb_hid/Device.h
+++ b/shared-bindings/usb_hid/Device.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H
 
 #include "common-hal/usb_hid/types.h"
 
@@ -35,4 +35,4 @@ void common_hal_usb_hid_device_send_report(usb_hid_device_obj_t *self, uint8_t*
 uint8_t common_hal_usb_hid_device_get_usage_page(usb_hid_device_obj_t *self);
 uint8_t common_hal_usb_hid_device_get_usage(usb_hid_device_obj_t *self);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_USB_HID_DEVICE_H
diff --git a/shared-bindings/ustack/__init__.h b/shared-bindings/ustack/__init__.h
index d4f3d50a8..561d581b2 100644
--- a/shared-bindings/ustack/__init__.h
+++ b/shared-bindings/ustack/__init__.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_USTACK___INIT___H__
-#define __MICROPY_INCLUDED_SHARED_BINDINGS_USTACK___INIT___H__
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_USTACK___INIT___H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_USTACK___INIT___H
 
 #include "py/obj.h"
 
@@ -35,4 +35,4 @@ extern uint32_t shared_module_ustack_max_stack_usage(void);
 extern uint32_t shared_module_ustack_stack_size(void);
 extern uint32_t shared_module_ustack_stack_usage(void);
 
-#endif  // __MICROPY_INCLUDED_SHARED_BINDINGS_USTACK___INIT___H__
+#endif  // MICROPY_INCLUDED_SHARED_BINDINGS_USTACK___INIT___H