diff --git a/src/common/pico_base/include/pico.h b/src/common/pico_base/include/pico.h
index 784566e..7024db8 100644
--- a/src/common/pico_base/include/pico.h
+++ b/src/common/pico_base/include/pico.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PICO_H_
-#define PICO_H_
+#ifndef _PICO_H
+#define _PICO_H
 
 /** \file pico.h
  *  \defgroup pico_base pico_base
diff --git a/src/common/pico_base/include/pico/config.h b/src/common/pico_base/include/pico/config.h
index 10a9c6a..6bd6a97 100644
--- a/src/common/pico_base/include/pico/config.h
+++ b/src/common/pico_base/include/pico/config.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PICO_CONFIG_H_
-#define PICO_CONFIG_H_
+#ifndef _PICO_CONFIG_H
+#define _PICO_CONFIG_H
 
 // -----------------------------------------------------
 // NOTE: THIS HEADER IS ALSO INCLUDED BY ASSEMBLY CODE SO
diff --git a/src/common/pico_divider/include/pico/divider.h b/src/common/pico_divider/include/pico/divider.h
index 749f734..4c71301 100644
--- a/src/common/pico_divider/include/pico/divider.h
+++ b/src/common/pico_divider/include/pico/divider.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_DIVIDER_H_
-#define _PICO_DIVIDER_H_
+#ifndef _PICO_DIVIDER_H
+#define _PICO_DIVIDER_H
 
 #include "pico.h"
 #include "hardware/divider.h"
diff --git a/src/common/pico_sync/include/pico/critical_section.h b/src/common/pico_sync/include/pico/critical_section.h
index 9d61150..eb49033 100644
--- a/src/common/pico_sync/include/pico/critical_section.h
+++ b/src/common/pico_sync/include/pico/critical_section.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PLATFORM_CRITICAL_SECTION_H
-#define _PLATFORM_CRITICAL_SECTION_H
+#ifndef _PICO_CRITICAL_SECTION_H
+#define _PICO_CRITICAL_SECTION_H
 
 #include "pico/lock_core.h"
 
diff --git a/src/common/pico_sync/include/pico/mutex.h b/src/common/pico_sync/include/pico/mutex.h
index ca93760..088bb4c 100644
--- a/src/common/pico_sync/include/pico/mutex.h
+++ b/src/common/pico_sync/include/pico/mutex.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PLATFORM_MUTEX_H
-#define _PLATFORM_MUTEX_H
+#ifndef _PICO_MUTEX_H
+#define _PICO_MUTEX_H
 
 #include "pico/lock_core.h"
 
diff --git a/src/common/pico_sync/include/pico/sem.h b/src/common/pico_sync/include/pico/sem.h
index f9f724b..9bb5731 100644
--- a/src/common/pico_sync/include/pico/sem.h
+++ b/src/common/pico_sync/include/pico/sem.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PLATFORM_SEM_H
-#define _PLATFORM_SEM_H
+#ifndef _PICO_SEM_H
+#define _PICO_SEM_H
 
 #include "pico/lock_core.h"
 
diff --git a/src/common/pico_util/include/pico/util/datetime.h b/src/common/pico_util/include/pico/util/datetime.h
index bb32835..a897f6e 100644
--- a/src/common/pico_util/include/pico/util/datetime.h
+++ b/src/common/pico_util/include/pico/util/datetime.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_DATETIME_H
-#define _PICO_DATETIME_H
+#ifndef _PICO_UTIL_DATETIME_H
+#define _PICO_UTIL_DATETIME_H
 
 #include "pico.h"
 
diff --git a/src/common/pico_util/include/pico/util/queue.h b/src/common/pico_util/include/pico/util/queue.h
index eb71e36..e920009 100644
--- a/src/common/pico_util/include/pico/util/queue.h
+++ b/src/common/pico_util/include/pico/util/queue.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _UTIL_QUEUE_H
-#define _UTIL_QUEUE_H
+#ifndef _PICO_UTIL_QUEUE_H
+#define _PICO_UTIL_QUEUE_H
 
 #include "pico.h"
 #include "hardware/sync.h"
diff --git a/src/host/hardware_gpio/include/hardware/gpio.h b/src/host/hardware_gpio/include/hardware/gpio.h
index b2b83a1..ee2f7f6 100644
--- a/src/host/hardware_gpio/include/hardware/gpio.h
+++ b/src/host/hardware_gpio/include/hardware/gpio.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_GPIO_H_
-#define _HARDWARE_GPIO_H_
+#ifndef _HARDWARE_GPIO_H
+#define _HARDWARE_GPIO_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/host/pico_platform/include/pico/platform.h b/src/host/pico_platform/include/pico/platform.h
index b5e8137..8c25b51 100644
--- a/src/host/pico_platform/include/pico/platform.h
+++ b/src/host/pico_platform/include/pico/platform.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_PLATFORM_H_
-#define _PICO_PLATFORM_H_
+#ifndef _PICO_PLATFORM_H
+#define _PICO_PLATFORM_H
 
 #include "hardware/platform_defs.h"
 #include <stddef.h>
diff --git a/src/rp2_common/boot_stage2/include/boot_stage2/config.h b/src/rp2_common/boot_stage2/include/boot_stage2/config.h
index 5e57f95..5f3d120 100644
--- a/src/rp2_common/boot_stage2/include/boot_stage2/config.h
+++ b/src/rp2_common/boot_stage2/include/boot_stage2/config.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _BOOT_STAGE2_CONFIG_H_
-#define _BOOT_STAGE2_CONFIG_H_
+#ifndef _BOOT_STAGE2_CONFIG_H
+#define _BOOT_STAGE2_CONFIG_H
 
 // NOTE THIS HEADER IS INCLUDED FROM ASSEMBLY
 
diff --git a/src/rp2_common/hardware_adc/include/hardware/adc.h b/src/rp2_common/hardware_adc/include/hardware/adc.h
index b8987ee..372930f 100644
--- a/src/rp2_common/hardware_adc/include/hardware/adc.h
+++ b/src/rp2_common/hardware_adc/include/hardware/adc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_ADC_H_
-#define _HARDWARE_ADC_H_
+#ifndef _HARDWARE_ADC_H
+#define _HARDWARE_ADC_H
 
 #include "pico.h"
 #include "hardware/structs/adc.h"
diff --git a/src/rp2_common/hardware_clocks/include/hardware/clocks.h b/src/rp2_common/hardware_clocks/include/hardware/clocks.h
index 04d373d..80aabb2 100644
--- a/src/rp2_common/hardware_clocks/include/hardware/clocks.h
+++ b/src/rp2_common/hardware_clocks/include/hardware/clocks.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_CLOCKS_H_
-#define _HARDWARE_CLOCKS_H_
+#ifndef _HARDWARE_CLOCKS_H
+#define _HARDWARE_CLOCKS_H
 
 #include "pico.h"
 #include "hardware/structs/clocks.h"
diff --git a/src/rp2_common/hardware_dma/include/hardware/dma.h b/src/rp2_common/hardware_dma/include/hardware/dma.h
index 5af9813..c614f1e 100644
--- a/src/rp2_common/hardware_dma/include/hardware/dma.h
+++ b/src/rp2_common/hardware_dma/include/hardware/dma.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_DMA_H_
-#define _HARDWARE_DMA_H_
+#ifndef _HARDWARE_DMA_H
+#define _HARDWARE_DMA_H
 
 #include "pico.h"
 #include "hardware/structs/dma.h"
diff --git a/src/rp2_common/hardware_exception/include/hardware/exception.h b/src/rp2_common/hardware_exception/include/hardware/exception.h
index 005168b..b8bddea 100644
--- a/src/rp2_common/hardware_exception/include/hardware/exception.h
+++ b/src/rp2_common/hardware_exception/include/hardware/exception.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_EXCEPTION_H_
-#define _HARDWARE_EXCEPTION_H_
+#ifndef _HARDWARE_EXCEPTION_H
+#define _HARDWARE_EXCEPTION_H
 
 #include "pico.h"
 #include "hardware/address_mapped.h"
diff --git a/src/rp2_common/hardware_gpio/include/hardware/gpio.h b/src/rp2_common/hardware_gpio/include/hardware/gpio.h
index 1dff258..a76cb43 100644
--- a/src/rp2_common/hardware_gpio/include/hardware/gpio.h
+++ b/src/rp2_common/hardware_gpio/include/hardware/gpio.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_GPIO_H_
-#define _HARDWARE_GPIO_H_
+#ifndef _HARDWARE_GPIO_H
+#define _HARDWARE_GPIO_H
 
 #include "pico.h"
 #include "hardware/structs/sio.h"
diff --git a/src/rp2_common/hardware_irq/include/hardware/irq.h b/src/rp2_common/hardware_irq/include/hardware/irq.h
index 66679fe..9b6aff2 100644
--- a/src/rp2_common/hardware_irq/include/hardware/irq.h
+++ b/src/rp2_common/hardware_irq/include/hardware/irq.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_IRQ_H_
-#define _HARDWARE_IRQ_H_
+#ifndef _HARDWARE_IRQ_H
+#define _HARDWARE_IRQ_H
 
 // These two config items are also used by assembler, so keeping separate
 // PICO_CONFIG: PICO_MAX_SHARED_IRQ_HANDLERS, Maximum number of shared IRQ handlers, default=4, advanced=true, group=hardware_irq
diff --git a/src/rp2_common/hardware_pio/include/hardware/pio.h b/src/rp2_common/hardware_pio/include/hardware/pio.h
index ff2ae3c..762c3be 100644
--- a/src/rp2_common/hardware_pio/include/hardware/pio.h
+++ b/src/rp2_common/hardware_pio/include/hardware/pio.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_PIO_H_
-#define _HARDWARE_PIO_H_
+#ifndef _HARDWARE_PIO_H
+#define _HARDWARE_PIO_H
 
 #include "pico.h"
 #include "hardware/address_mapped.h"
diff --git a/src/rp2_common/hardware_pio/include/hardware/pio_instructions.h b/src/rp2_common/hardware_pio/include/hardware/pio_instructions.h
index 3662135..c27a4c1 100644
--- a/src/rp2_common/hardware_pio/include/hardware/pio_instructions.h
+++ b/src/rp2_common/hardware_pio/include/hardware/pio_instructions.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_PIO_INSTRUCTIONS_H_
-#define _HARDWARE_PIO_INSTRUCTIONS_H_
+#ifndef _HARDWARE_PIO_INSTRUCTIONS_H
+#define _HARDWARE_PIO_INSTRUCTIONS_H
 
 #include "pico.h"
 
diff --git a/src/rp2_common/hardware_pll/include/hardware/pll.h b/src/rp2_common/hardware_pll/include/hardware/pll.h
index 0466504..46e0db9 100644
--- a/src/rp2_common/hardware_pll/include/hardware/pll.h
+++ b/src/rp2_common/hardware_pll/include/hardware/pll.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_PLL_H_
-#define _HARDWARE_PLL_H_
+#ifndef _HARDWARE_PLL_H
+#define _HARDWARE_PLL_H
 
 #include "pico.h"
 #include "hardware/structs/pll.h"
diff --git a/src/rp2_common/hardware_vreg/include/hardware/vreg.h b/src/rp2_common/hardware_vreg/include/hardware/vreg.h
index 7b4e259..b488000 100644
--- a/src/rp2_common/hardware_vreg/include/hardware/vreg.h
+++ b/src/rp2_common/hardware_vreg/include/hardware/vreg.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_VREG_H_
-#define _HARDWARE_VREG_H_
+#ifndef _HARDWARE_VREG_H
+#define _HARDWARE_VREG_H
 
 #include "pico.h"
 #include "hardware/structs/vreg_and_chip_reset.h"
diff --git a/src/rp2_common/hardware_xosc/include/hardware/xosc.h b/src/rp2_common/hardware_xosc/include/hardware/xosc.h
index a5e33b0..d49de4e 100644
--- a/src/rp2_common/hardware_xosc/include/hardware/xosc.h
+++ b/src/rp2_common/hardware_xosc/include/hardware/xosc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _HARDWARE_XOSC_H_
-#define _HARDWARE_XOSC_H_
+#ifndef _HARDWARE_XOSC_H
+#define _HARDWARE_XOSC_H
 
 #include "pico.h"
 #include "hardware/structs/xosc.h"
diff --git a/src/rp2_common/pico_bootrom/include/pico/bootrom.h b/src/rp2_common/pico_bootrom/include/pico/bootrom.h
index 4484568..2810304 100644
--- a/src/rp2_common/pico_bootrom/include/pico/bootrom.h
+++ b/src/rp2_common/pico_bootrom/include/pico/bootrom.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PLATFORM_BOOTROM_H
-#define _PLATFORM_BOOTROM_H
+#ifndef _PICO_BOOTROM_H
+#define _PICO_BOOTROM_H
 
 #include "pico.h"
 
diff --git a/src/rp2_common/pico_bootrom/include/pico/bootrom/sf_table.h b/src/rp2_common/pico_bootrom/include/pico/bootrom/sf_table.h
index 4eb4b1c..2bb5435 100644
--- a/src/rp2_common/pico_bootrom/include/pico/bootrom/sf_table.h
+++ b/src/rp2_common/pico_bootrom/include/pico/bootrom/sf_table.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_SF_TABLE_H
-#define _PICO_SF_TABLE_H
+#ifndef _PICO_BOOTROM_SF_TABLE_H
+#define _PICO_BOOTROM_SF_TABLE_H
 
 // NOTE THESE FUNCTION IMPLEMENTATIONS MATCH THE BEHAVIOR DESCRIBED IN THE BOOTROM SECTION OF THE RP2040 DATASHEET
 
diff --git a/src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_freertos.h b/src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_freertos.h
index 342a85c..e838a87 100644
--- a/src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_freertos.h
+++ b/src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_freertos.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _EXAMPLE_CYW43_ARCH_ARCH_FREERTOS_SYS_H
-#define _EXAMPLE_CYW43_ARCH_ARCH_FREERTOS_SYS_H
+#ifndef _PICO_CYW43_ARCH_ARCH_FREERTOS_H
+#define _PICO_CYW43_ARCH_ARCH_FREERTOS_H
 
 #include "pico/cyw43_arch/arch_common.h"
 
diff --git a/src/rp2_common/pico_int64_ops/include/pico/int64_ops.h b/src/rp2_common/pico_int64_ops/include/pico/int64_ops.h
index db3213e..401c5ab 100644
--- a/src/rp2_common/pico_int64_ops/include/pico/int64_ops.h
+++ b/src/rp2_common/pico_int64_ops/include/pico/int64_ops.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_INT64_H
-#define _PICO_INT64_H
+#ifndef _PICO_INT64_OPS_H
+#define _PICO_INT64_OPS_H
 
 #include "pico/types.h"
 
diff --git a/src/rp2_common/pico_mem_ops/include/pico/mem_ops.h b/src/rp2_common/pico_mem_ops/include/pico/mem_ops.h
index 0c224fb..2f8d55f 100644
--- a/src/rp2_common/pico_mem_ops/include/pico/mem_ops.h
+++ b/src/rp2_common/pico_mem_ops/include/pico/mem_ops.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_MEMORY_H
-#define _PICO_MEMORY_H
+#ifndef _PICO_MEM_OPS_H
+#define _PICO_MEM_OPS_H
 
 #include "pico/types.h"
 
diff --git a/src/rp2_common/pico_platform/include/pico/platform.h b/src/rp2_common/pico_platform/include/pico/platform.h
index fab7f29..155a52c 100644
--- a/src/rp2_common/pico_platform/include/pico/platform.h
+++ b/src/rp2_common/pico_platform/include/pico/platform.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_PLATFORM_H_
-#define _PICO_PLATFORM_H_
+#ifndef _PICO_PLATFORM_H
+#define _PICO_PLATFORM_H
 
 /** \file platform.h
  *  \defgroup pico_platform pico_platform
diff --git a/src/rp2_common/pico_printf/include/pico/printf.h b/src/rp2_common/pico_printf/include/pico/printf.h
index 25cea48..2a40119 100644
--- a/src/rp2_common/pico_printf/include/pico/printf.h
+++ b/src/rp2_common/pico_printf/include/pico/printf.h
@@ -29,8 +29,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef PICO_PRINTF_H_
-#define PICO_PRINTF_H_
+#ifndef _PICO_PRINTF_H
+#define _PICO_PRINTF_H
 
 /** \file printf.h
  *  \defgroup pico_printf pico_printf
diff --git a/src/rp2_common/pico_unique_id/include/pico/unique_id.h b/src/rp2_common/pico_unique_id/include/pico/unique_id.h
index 4132a60..f62f037 100644
--- a/src/rp2_common/pico_unique_id/include/pico/unique_id.h
+++ b/src/rp2_common/pico_unique_id/include/pico/unique_id.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _PICO_UNIQUE_ID_H_
-#define _PICO_UNIQUE_ID_H_
+#ifndef _PICO_UNIQUE_ID_H
+#define _PICO_UNIQUE_ID_H
 
 #include "pico.h"