diff --git a/ports/atmel-samd/common-hal/alarm/SleepMemory.c b/ports/atmel-samd/common-hal/alarm/SleepMemory.c
index cb3b1b3aa9b9..8ad357756495 100644
--- a/ports/atmel-samd/common-hal/alarm/SleepMemory.c
+++ b/ports/atmel-samd/common-hal/alarm/SleepMemory.c
@@ -28,6 +28,7 @@
 
 #include "py/runtime.h"
 #include "common-hal/alarm/SleepMemory.h"
+#include "shared-bindings/alarm/SleepMemory.h"
 #include "shared-bindings/nvm/ByteArray.h"
 
 void alarm_sleep_memory_reset(void) {
diff --git a/ports/atmel-samd/supervisor/internal_flash.c b/ports/atmel-samd/supervisor/internal_flash.c
index afac00123278..3e57e21d9148 100644
--- a/ports/atmel-samd/supervisor/internal_flash.c
+++ b/ports/atmel-samd/supervisor/internal_flash.c
@@ -78,10 +78,6 @@ void port_internal_flash_flush(void) {
 void supervisor_flash_release_cache(void) {
 }
 
-void flash_flush(void) {
-    supervisor_flash_flush();
-}
-
 static int32_t convert_block_to_flash_addr(uint32_t block) {
     if (0 <= block && block < INTERNAL_FLASH_PART1_NUM_BLOCKS) {
         // a block in partition 1
@@ -91,7 +87,7 @@ static int32_t convert_block_to_flash_addr(uint32_t block) {
     return -1;
 }
 
-bool supervisor_flash_read_block(uint8_t *dest, uint32_t block) {
+STATIC bool supervisor_flash_read_block(uint8_t *dest, uint32_t block) {
     // non-MBR block, get data from flash memory
     int32_t src = convert_block_to_flash_addr(block);
     if (src == -1) {
@@ -102,7 +98,7 @@ bool supervisor_flash_read_block(uint8_t *dest, uint32_t block) {
     return error_code == ERR_NONE;
 }
 
-bool supervisor_flash_write_block(const uint8_t *src, uint32_t block) {
+STATIC bool supervisor_flash_write_block(const uint8_t *src, uint32_t block) {
     // non-MBR block, copy to cache
     int32_t dest = convert_block_to_flash_addr(block);
     if (dest == -1) {
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/board.c b/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
index 3d392892e30f..83ef69000792 100644
--- a/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
+++ b/ports/espressif/boards/ai_thinker_esp32-c3s/board.c
@@ -26,6 +26,7 @@
  */
 
 #include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/board.h"
 
 void board_init(void) {
 
diff --git a/ports/espressif/boards/microdev_micro_c3/board.c b/ports/espressif/boards/microdev_micro_c3/board.c
index 183740a7c3ae..7ffd406cfee0 100644
--- a/ports/espressif/boards/microdev_micro_c3/board.c
+++ b/ports/espressif/boards/microdev_micro_c3/board.c
@@ -25,6 +25,7 @@
  */
 
 #include "shared-bindings/microcontroller/Pin.h"
+#include "supervisor/board.h"
 
 void board_init(void) {
     // USB
@@ -54,5 +55,7 @@ bool board_requests_safe_mode(void) {
 void reset_board(void) {
 }
 
+#if CIRCUITPY_ALARM
 void board_deinit(void) {
 }
+#endif
diff --git a/ports/nrf/device/nrf52/startup_nrf52833.c b/ports/nrf/device/nrf52/startup_nrf52833.c
index ad608395208a..67abf71ce4ed 100644
--- a/ports/nrf/device/nrf52/startup_nrf52833.c
+++ b/ports/nrf/device/nrf52/startup_nrf52833.c
@@ -39,6 +39,8 @@ typedef void (*func)(void);
 
 extern void  _start(void) __attribute__((noreturn));
 extern void SystemInit(void);
+extern void Default_Handler(void);
+extern void Reset_Handler(void);
 
 void Default_Handler(void) {
     while (1) {
diff --git a/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c b/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c
index 57866b00ab4b..831bf96cdfc6 100644
--- a/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c
+++ b/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/board.c
@@ -28,6 +28,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 #include "supervisor/shared/board.h"
+#include "supervisor/board.h"
 
 void board_init(void) {
 }
diff --git a/shared-module/gamepadshift/GamePadShift.c b/shared-module/gamepadshift/GamePadShift.c
index 6efa0ea5cf09..0fb7d1e8d35a 100644
--- a/shared-module/gamepadshift/GamePadShift.c
+++ b/shared-module/gamepadshift/GamePadShift.c
@@ -26,6 +26,7 @@
 
 #include "py/mpstate.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/gamepadshift/GamePadShift.h"
 #include "shared-module/gamepadshift/GamePadShift.h"
 #include "supervisor/shared/tick.h"