7 files changed, 15 insertions, 15 deletions
diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h
index c3e8bf3..483e815 100644
--- a/cmd/sbc_harness/config/config.h
+++ b/cmd/sbc_harness/config/config.h
@@ -1,4 +1,4 @@
-/* sbc_harness/config/config.h - Compile-time configuration for sbc_harness
+/* config.h - Compile-time configuration for sbc_harness
  *
  * Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
  * SPDX-Licence-Identifier: AGPL-3.0-or-later
diff --git a/cmd/sbc_harness/config/tusb_config.h b/cmd/sbc_harness/config/tusb_config.h
index 74561f3..47ebc3e 100644
--- a/cmd/sbc_harness/config/tusb_config.h
+++ b/cmd/sbc_harness/config/tusb_config.h
@@ -1,4 +1,4 @@
-/* sbc_harness/config/tusb_config.h - Compile-time configuration for the TinyUSB library
+/* tusb_config.h - Compile-time configuration for the TinyUSB library
  *
  * Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
  * SPDX-Licence-Identifier: AGPL-3.0-or-later
diff --git a/cmd/sbc_harness/hw/rp2040_hwspi.h b/cmd/sbc_harness/hw/rp2040_hwspi.h
index 8cf8aff..393eae6 100644
--- a/cmd/sbc_harness/hw/rp2040_hwspi.h
+++ b/cmd/sbc_harness/hw/rp2040_hwspi.h
@@ -5,8 +5,8 @@
  * SPDX-Licence-Identifier: AGPL-3.0-or-later
  */
 
-#ifndef _RP2040_HWSPI_H_
-#define _RP2040_HWSPI_H_
+#ifndef _HW_RP2040_HWSPI_H_
+#define _HW_RP2040_HWSPI_H_
 
 #include <pico/binary_info.h> /* for bi_* */
 
@@ -60,4 +60,4 @@ void _rp2040_hwspi_init(struct rp2040_hwspi *self,
                         uint pin_clk,
                         uint pin_cs);
 
-#endif /* _RP2040_HWSPI_H_ */
+#endif /* _HW_RP2040_HWSPI_H_ */
diff --git a/cmd/sbc_harness/usb_keyboard.h b/cmd/sbc_harness/usb_keyboard.h
index 2227220..f3593f3 100644
--- a/cmd/sbc_harness/usb_keyboard.h
+++ b/cmd/sbc_harness/usb_keyboard.h
@@ -4,8 +4,8 @@
  * SPDX-Licence-Identifier: AGPL-3.0-or-later
  */
 
-#ifndef _USB_KEYBOARD_H_
-#define _USB_KEYBOARD_H_
+#ifndef _SBC_HARNESS_USB_KEYBOARD_H_
+#define _SBC_HARNESS_USB_KEYBOARD_H_
 
 #include <stdint.h> /* for uint32_t */
 
@@ -17,4 +17,4 @@ CR_RPC_DECLARE(usb_keyboard_rpc, uint32_t, int)
 void usb_keyboard_init(void);
 COROUTINE usb_keyboard_cr(void *arg);
 
-#endif /* _USB_KEYBOARD_H_ */
+#endif /* _SBC_HARNESS_USB_KEYBOARD_H_ */
diff --git a/cmd/srv9p/config/config.h b/cmd/srv9p/config/config.h
index fa6faeb..0f6c37e 100644
--- a/cmd/srv9p/config/config.h
+++ b/cmd/srv9p/config/config.h
@@ -1,4 +1,4 @@
-/* srv9p/config/config.h - Compile-time configuration for srv9p
+/* config.h - Compile-time configuration for srv9p
  *
  * Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
  * SPDX-Licence-Identifier: AGPL-3.0-or-later
diff --git a/cmd/srv9p/gnet.h b/cmd/srv9p/gnet.h
index 4380c1d..3e8a0f4 100644
--- a/cmd/srv9p/gnet.h
+++ b/cmd/srv9p/gnet.h
@@ -4,8 +4,8 @@
  * SPDX-Licence-Identifier: AGPL-3.0-or-later
  */
 
-#ifndef _GNET_H_
-#define _GNET_H_
+#ifndef _SRV9P_GNET_H_
+#define _SRV9P_GNET_H_
 
 #include <stdint.h> /* for uint16_6 */
 
@@ -34,4 +34,4 @@ struct gnet_udp_conn {
 
 void gnet_udp_conn_init(struct gnet_udp_conn *self, uint16_t port);
 
-#endif /* _GNET_H_ */
+#endif /* _SRV9P_GNET_H_ */
diff --git a/cmd/srv9p/static9p.h b/cmd/srv9p/static9p.h
index e03a480..5ef6cb1 100644
--- a/cmd/srv9p/static9p.h
+++ b/cmd/srv9p/static9p.h
@@ -4,8 +4,8 @@
  * SPDX-Licence-Identifier: AGPL-3.0-or-later
  */
 
-#ifndef _STATIC9P_H_
-#define _STATIC9P_H_
+#ifndef _SRV9P_STATIC9P_H_
+#define _SRV9P_STATIC9P_H_
 
 #include <lib9p/srv.h>
 
@@ -44,4 +44,4 @@ struct static_file {
 extern struct lib9p_srv_file_vtable static_dir_vtable;
 extern struct lib9p_srv_file_vtable static_file_vtable;
 
-#endif /* _STATIC9P_H_ */
+#endif /* _SRV9P_STATIC9P_H_ */