diff --git a/src/arch/host/include/arch/atomic.h b/src/arch/host/include/arch/atomic.h
index cde2a8e1e..c80e5b879 100644
--- a/src/arch/host/include/arch/atomic.h
+++ b/src/arch/host/include/arch/atomic.h
@@ -6,8 +6,8 @@
  *         Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
  */
 
-#ifndef __ARCH_ATOMIC_H_
-#define __ARCH_ATOMIC_H_
+#ifndef __ARCH_ATOMIC_H__
+#define __ARCH_ATOMIC_H__
 
 #include <stdint.h>
 #include <errno.h>
@@ -42,4 +42,4 @@ static inline int32_t arch_atomic_sub(atomic_t *a, int32_t value)
 	return __sync_fetch_and_sub(&a->value, value);
 }
 
-#endif
+#endif /* __ARCH_ATOMIC_H__ */
diff --git a/src/arch/host/include/arch/cache.h b/src/arch/host/include/arch/cache.h
index 889360867..bfee49f91 100644
--- a/src/arch/host/include/arch/cache.h
+++ b/src/arch/host/include/arch/cache.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_CACHE__
-#define __INCLUDE_ARCH_CACHE__
+#ifndef __ARCH_CACHE_H__
+#define __ARCH_CACHE_H__
 
 #include <stdint.h>
 #include <stddef.h>
@@ -17,4 +17,4 @@ static inline void icache_invalidate_region(void *addr, size_t size) {}
 static inline void dcache_writeback_invalidate_region(void *addr,
 	size_t size) {}
 
-#endif
+#endif /* __ARCH_CACHE_H__ */
diff --git a/src/arch/host/include/arch/cpu.h b/src/arch/host/include/arch/cpu.h
index 32dab7d73..c2165993f 100644
--- a/src/arch/host/include/arch/cpu.h
+++ b/src/arch/host/include/arch/cpu.h
@@ -5,8 +5,8 @@
  * Author: Rander Wang <rander.wang@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_CPU__
-#define __INCLUDE_ARCH_CPU__
+#ifndef __ARCH_CPU_H__
+#define __ARCH_CPU_H__
 
 static inline void arch_cpu_enable_core(int id)
 {
@@ -35,4 +35,4 @@ static inline int cpu_read_threadptr(void)
 	return 0;
 }
 
-#endif
+#endif /* __ARCH_CPU_H__ */
diff --git a/src/arch/host/include/arch/interrupt.h b/src/arch/host/include/arch/interrupt.h
index dcc0a0a25..ba18c9a9d 100644
--- a/src/arch/host/include/arch/interrupt.h
+++ b/src/arch/host/include/arch/interrupt.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_INTERRUPT_H
-#define __ARCH_INTERRUPT_H
+#ifndef __ARCH_INTERRUPT_H__
+#define __ARCH_INTERRUPT_H__
 
 #include <sof/interrupt-map.h>
 #include <stdint.h>
@@ -29,4 +29,4 @@ static inline uint32_t arch_interrupt_global_disable(void) {return 0; }
 static inline void arch_interrupt_global_enable(uint32_t flags) {}
 static inline int arch_interrupt_init(void) {return 0; }
 
-#endif
+#endif /* __ARCH_INTERRUPT_H__ */
diff --git a/src/arch/host/include/arch/sof.h b/src/arch/host/include/arch/sof.h
index c7de73059..0d095f952 100644
--- a/src/arch/host/include/arch/sof.h
+++ b/src/arch/host/include/arch/sof.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_SOF__
-#define __INCLUDE_ARCH_SOF__
+#ifndef __ARCH_SOF_H__
+#define __ARCH_SOF_H__
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -51,4 +51,4 @@ static inline void *arch_dump_regs(void)
 	return NULL;
 }
 
-#endif
+#endif /* __ARCH_SOF_H__ */
diff --git a/src/arch/host/include/arch/spinlock.h b/src/arch/host/include/arch/spinlock.h
index 72fc97745..c71f0c147 100644
--- a/src/arch/host/include/arch/spinlock.h
+++ b/src/arch/host/include/arch/spinlock.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_SPINLOCK_H_
-#define __ARCH_SPINLOCK_H_
+#ifndef __ARCH_SPINLOCK_H__
+#define __ARCH_SPINLOCK_H__
 
 #include <stdint.h>
 #include <errno.h>
@@ -18,4 +18,4 @@ static inline void arch_spinlock_init(spinlock_t *lock) {}
 static inline void arch_spin_lock(spinlock_t *lock) {}
 static inline void arch_spin_unlock(spinlock_t *lock) {}
 
-#endif
+#endif /* __ARCH_SPINLOCK_H__ */
diff --git a/src/arch/host/include/arch/string.h b/src/arch/host/include/arch/string.h
index f1ed694cc..00e1e648b 100644
--- a/src/arch/host/include/arch/string.h
+++ b/src/arch/host/include/arch/string.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_STRING_SOF__
-#define __INCLUDE_ARCH_STRING_SOF__
+#ifndef __ARCH_STRING_H__
+#define __ARCH_STRING_H__
 
 #include <errno.h>
 #include <string.h>
@@ -59,4 +59,4 @@ static inline int arch_memset_s(void *dest, size_t dest_size,
 	return 0;
 }
 
-#endif
+#endif /* __ARCH_STRING_H__ */
diff --git a/src/arch/host/include/arch/task.h b/src/arch/host/include/arch/task.h
index 941f6d301..3194244e9 100644
--- a/src/arch/host/include/arch/task.h
+++ b/src/arch/host/include/arch/task.h
@@ -11,8 +11,8 @@
  * \authors Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_TASK_H_
-#define __ARCH_TASK_H_
+#ifndef __ARCH_TASK_H__
+#define __ARCH_TASK_H__
 
 #include <sof/schedule/schedule.h>
 
@@ -33,4 +33,4 @@ static inline int arch_run_task(struct task *task)
 	return 0;
 }
 
-#endif
+#endif /* __ARCH_TASK_H__ */
diff --git a/src/arch/host/include/arch/timer.h b/src/arch/host/include/arch/timer.h
index 751614b36..698e5e416 100644
--- a/src/arch/host/include/arch/timer.h
+++ b/src/arch/host/include/arch/timer.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_TIMER_H_
-#define __ARCH_TIMER_H_
+#ifndef __ARCH_TIMER_H__
+#define __ARCH_TIMER_H__
 
 #include <arch/interrupt.h>
 #include <stdint.h>
@@ -25,4 +25,4 @@ static inline int arch_timer_set(struct timer *timer,
 	uint64_t ticks) {return 0; }
 static inline void arch_timer_clear(struct timer *timer) {}
 
-#endif
+#endif /* __ARCH_TIMER_H__ */
diff --git a/src/arch/host/include/arch/wait.h b/src/arch/host/include/arch/wait.h
index 2aadfb81e..b6ff86c93 100644
--- a/src/arch/host/include/arch/wait.h
+++ b/src/arch/host/include/arch/wait.h
@@ -5,6 +5,11 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
+#ifndef __ARCH_WAIT_H__
+#define __ARCH_WAIT_H__
+
 static inline void arch_wait_for_interrupt(int level) {}
 
 static inline void idelay(int n) {}
+
+#endif /* __ARCH_WAIT_H__ */
diff --git a/src/arch/xtensa/include/arch/alloc.h b/src/arch/xtensa/include/arch/alloc.h
index 491220c77..3ec22c20d 100644
--- a/src/arch/xtensa/include/arch/alloc.h
+++ b/src/arch/xtensa/include/arch/alloc.h
@@ -56,4 +56,4 @@ static inline void alloc_core_context(int core)
 }
 #endif
 
-#endif
+#endif /* __ARCH_ALLOC_H__ */
diff --git a/src/arch/xtensa/include/arch/atomic.h b/src/arch/xtensa/include/arch/atomic.h
index 7ad826050..1c95dca15 100644
--- a/src/arch/xtensa/include/arch/atomic.h
+++ b/src/arch/xtensa/include/arch/atomic.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_ATOMIC_H_
-#define __ARCH_ATOMIC_H_
+#ifndef __ARCH_ATOMIC_H__
+#define __ARCH_ATOMIC_H__
 
 #include <stdint.h>
 #include <errno.h>
@@ -64,4 +64,4 @@ static inline int32_t arch_atomic_sub(atomic_t *a, int32_t value)
 	return (*(volatile int32_t *)&a->value);
 }
 
-#endif
+#endif /* __ARCH_ATOMIC_H__ */
diff --git a/src/arch/xtensa/include/arch/cache.h b/src/arch/xtensa/include/arch/cache.h
index 3885af780..1f8250608 100644
--- a/src/arch/xtensa/include/arch/cache.h
+++ b/src/arch/xtensa/include/arch/cache.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_CACHE__
-#define __INCLUDE_ARCH_CACHE__
+#ifndef __ARCH_CACHE_H__
+#define __ARCH_CACHE_H__
 
 #include <stdint.h>
 #include <stddef.h>
@@ -71,4 +71,4 @@ static inline void dcache_writeback_invalidate_all(void)
 #endif
 }
 
-#endif
+#endif /* __ARCH_CACHE_H__ */
diff --git a/src/arch/xtensa/include/arch/cpu.h b/src/arch/xtensa/include/arch/cpu.h
index 289da8fdf..a373a77e4 100644
--- a/src/arch/xtensa/include/arch/cpu.h
+++ b/src/arch/xtensa/include/arch/cpu.h
@@ -5,8 +5,8 @@
  * Author: Rander Wang <rander.wang@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_CPU__
-#define __INCLUDE_ARCH_CPU__
+#ifndef __ARCH_CPU_H__
+#define __ARCH_CPU_H__
 
 #include <platform/cpu.h>
 #include <config.h>
@@ -59,4 +59,4 @@ static inline int cpu_read_threadptr(void)
 	return threadptr;
 }
 
-#endif
+#endif /* __ARCH_CPU_H__ */
diff --git a/src/arch/xtensa/include/arch/gdb/init.h b/src/arch/xtensa/include/arch/gdb/init.h
index c633288b2..651f4e4d8 100644
--- a/src/arch/xtensa/include/arch/gdb/init.h
+++ b/src/arch/xtensa/include/arch/gdb/init.h
@@ -9,4 +9,9 @@
  * Header file for init.S
  */
 
+#ifndef __ARCH_GDB_INIT_H__
+#define __ARCH_GDB_INIT_H__
+
 extern void gdb_init_debug_exception(void);
+
+#endif /* __ARCH_GDB_INIT_H__ */
diff --git a/src/arch/xtensa/include/arch/gdb/utilities.h b/src/arch/xtensa/include/arch/gdb/utilities.h
index 68ff6dcef..1c8485008 100644
--- a/src/arch/xtensa/include/arch/gdb/utilities.h
+++ b/src/arch/xtensa/include/arch/gdb/utilities.h
@@ -9,8 +9,13 @@
  * Header file for Xtensa-GDB utilities.
  */
 
+#ifndef __ARCH_GDB_UTILITIES_H__
+#define __ARCH_GDB_UTILITIES_H__
+
 void arch_gdb_read_sr(int sr);
 void arch_gdb_write_sr(int sr, int *sregs);
 unsigned char arch_gdb_load_from_memory(void *mem);
 void arch_gdb_memory_load_and_store(void *mem, unsigned char ch);
 void arch_gdb_single_step(int *sregs);
+
+#endif /* __ARCH_GDB_UTILITIES_H__ */
diff --git a/src/arch/xtensa/include/arch/gdb/xtensa-defs.h b/src/arch/xtensa/include/arch/gdb/xtensa-defs.h
index a139243a1..80ffe03b0 100644
--- a/src/arch/xtensa/include/arch/gdb/xtensa-defs.h
+++ b/src/arch/xtensa/include/arch/gdb/xtensa-defs.h
@@ -9,8 +9,8 @@
  * Header file for xtensa specific defs for GDB.
  */
 
-#ifndef XTENSA_DEFS_H
-#define XTENSA_DEFS_H
+#ifndef __ARCH_GDB_XTENSA_DEFS_H__
+#define __ARCH_GDB_XTENSA_DEFS_H__
 
 #include <xtensa/specreg.h>
 #include <xtensa/config/core-isa.h>
@@ -24,4 +24,4 @@
 #define DEBUG_EXCSAVE	(EXCSAVE + XCHAL_DEBUGLEVEL)
 #define DEBUG_PS	(EPS + XCHAL_DEBUGLEVEL)
 
-#endif /* XTENSA_DEFS_H */
+#endif /* __ARCH_GDB_XTENSA_DEFS_H__ */
diff --git a/src/arch/xtensa/include/arch/idc.h b/src/arch/xtensa/include/arch/idc.h
index 608c3d717..212482861 100644
--- a/src/arch/xtensa/include/arch/idc.h
+++ b/src/arch/xtensa/include/arch/idc.h
@@ -35,4 +35,4 @@ static inline int arch_idc_send_msg(struct idc_msg *msg, uint32_t mode)
 static inline int arch_idc_init(void) { return 0; }
 #endif
 
-#endif
+#endif /* __ARCH_IDC_H__ */
diff --git a/src/arch/xtensa/include/arch/init.h b/src/arch/xtensa/include/arch/init.h
index 3d78d889c..5d4490d11 100644
--- a/src/arch/xtensa/include/arch/init.h
+++ b/src/arch/xtensa/include/arch/init.h
@@ -121,4 +121,4 @@ static inline void register_exceptions(void)
  */
 static inline void __memmap_init(void) { }
 
-#endif
+#endif /* __ARCH_INIT_H__ */
diff --git a/src/arch/xtensa/include/arch/interrupt.h b/src/arch/xtensa/include/arch/interrupt.h
index 9bc4ad004..5bbd58026 100644
--- a/src/arch/xtensa/include/arch/interrupt.h
+++ b/src/arch/xtensa/include/arch/interrupt.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_INTERRUPT_H
-#define __ARCH_INTERRUPT_H
+#ifndef __ARCH_INTERRUPT_H__
+#define __ARCH_INTERRUPT_H__
 
 #include <xtensa/xtruntime.h>
 #include <xtensa/hal.h>
@@ -86,4 +86,4 @@ static inline void arch_interrupt_global_enable(uint32_t flags)
 		     :: "a" (flags) : "memory");
 }
 
-#endif
+#endif /* __ARCH_INTERRUPT_H__ */
diff --git a/src/arch/xtensa/include/arch/offset-defs.h b/src/arch/xtensa/include/arch/offset-defs.h
index df17e2af0..d9fb45d2b 100644
--- a/src/arch/xtensa/include/arch/offset-defs.h
+++ b/src/arch/xtensa/include/arch/offset-defs.h
@@ -3,6 +3,9 @@
  * Copyright(c) 2019 Intel Corporation. All rights reserved.
  */
 
+#ifndef __ARCH_OFFSET_DEFS_H__
+#define __ARCH_OFFSET_DEFS_H__
+
 #include <xtensa/config/core-isa.h>
 
 #define REG_OFFSET_EXCCAUSE     0x0
@@ -31,3 +34,5 @@
 #define REG_OFFSET_EXCSAVE1     0x5c
 #define REG_OFFSET_AR_BEGIN     0x60
 #define REG_OFFSET_AR_END       (REG_OFFSET_AR_BEGIN + 4 * XCHAL_NUM_AREGS)
+
+#endif /* __ARCH_OFFSET_DEFS_H__ */
diff --git a/src/arch/xtensa/include/arch/sof.h b/src/arch/xtensa/include/arch/sof.h
index 276102304..e681192cc 100644
--- a/src/arch/xtensa/include/arch/sof.h
+++ b/src/arch/xtensa/include/arch/sof.h
@@ -6,8 +6,8 @@
  *         Janusz Jankowski <janusz.jankowski@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_SOF__
-#define __INCLUDE_ARCH_SOF__
+#ifndef __ARCH_SOF_H__
+#define __ARCH_SOF_H__
 
 #include <stdint.h>
 #include <stddef.h>
@@ -74,4 +74,4 @@ static inline void arch_dump_regs(uint32_t ps, uintptr_t stack_ptr,
 	dcache_writeback_region(buf, ARCH_OOPS_SIZE);
 }
 
-#endif
+#endif /* __ARCH_SOF_H__ */
diff --git a/src/arch/xtensa/include/arch/spinlock.h b/src/arch/xtensa/include/arch/spinlock.h
index 96e9e6e2c..9a2006439 100644
--- a/src/arch/xtensa/include/arch/spinlock.h
+++ b/src/arch/xtensa/include/arch/spinlock.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_SPINLOCK_H_
-#define __ARCH_SPINLOCK_H_
+#ifndef __ARCH_SPINLOCK_H__
+#define __ARCH_SPINLOCK_H__
 
 #include <stdint.h>
 #include <errno.h>
@@ -68,4 +68,4 @@ static inline void arch_spin_unlock(spinlock_t *lock)
 		: "memory");
 }
 
-#endif
+#endif /* __ARCH_SPINLOCK_H__ */
diff --git a/src/arch/xtensa/include/arch/string.h b/src/arch/xtensa/include/arch/string.h
index df127c120..be22d6a80 100644
--- a/src/arch/xtensa/include/arch/string.h
+++ b/src/arch/xtensa/include/arch/string.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __INCLUDE_ARCH_STRING_SOF__
-#define __INCLUDE_ARCH_STRING_SOF__
+#ifndef __ARCH_STRING_H__
+#define __ARCH_STRING_H__
 
 #include <errno.h>
 #include <stdlib.h>
@@ -77,4 +77,4 @@ static inline int arch_memset_s(void *dest, size_t dest_size,
 	return 0;
 }
 
-#endif
+#endif /* __ARCH_STRING_H__ */
diff --git a/src/arch/xtensa/include/arch/task.h b/src/arch/xtensa/include/arch/task.h
index cd577229e..95710d5ad 100644
--- a/src/arch/xtensa/include/arch/task.h
+++ b/src/arch/xtensa/include/arch/task.h
@@ -11,8 +11,8 @@
  * \authors Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_TASK_H_
-#define __ARCH_TASK_H_
+#ifndef __ARCH_TASK_H__
+#define __ARCH_TASK_H__
 
 #include <sof/list.h>
 
@@ -66,4 +66,4 @@ void arch_free_tasks(void);
  */
 int arch_assign_tasks(void);
 
-#endif
+#endif /* __ARCH_TASK_H__ */
diff --git a/src/arch/xtensa/include/arch/timer.h b/src/arch/xtensa/include/arch/timer.h
index 8921f41f1..605475857 100644
--- a/src/arch/xtensa/include/arch/timer.h
+++ b/src/arch/xtensa/include/arch/timer.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_TIMER_H_
-#define __ARCH_TIMER_H_
+#ifndef __ARCH_TIMER_H__
+#define __ARCH_TIMER_H__
 
 #include <arch/interrupt.h>
 #include <stdint.h>
@@ -65,4 +65,4 @@ static inline void arch_timer_clear(struct timer *timer)
 	arch_interrupt_clear(timer->irq);
 }
 
-#endif
+#endif /* __ARCH_TIMER_H__ */
diff --git a/src/arch/xtensa/include/arch/wait.h b/src/arch/xtensa/include/arch/wait.h
index ad894a686..b26816ad8 100644
--- a/src/arch/xtensa/include/arch/wait.h
+++ b/src/arch/xtensa/include/arch/wait.h
@@ -5,8 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifndef __ARCH_WAIT_H_
-#define __ARCH_WAIT_H_
+#ifndef __ARCH_WAIT_H__
+#define __ARCH_WAIT_H__
 
 #include <xtensa/xtruntime.h>
 #include <arch/interrupt.h>
@@ -58,4 +58,4 @@ static inline void idelay(int n)
 		asm volatile("nop");
 }
 
-#endif
+#endif /* __ARCH_WAIT_H__ */
diff --git a/src/arch/xtensa/xtos/xtos-structs.h b/src/arch/xtensa/xtos/xtos-structs.h
index 0c3a7cdfa..e8eeec606 100644
--- a/src/arch/xtensa/xtos/xtos-structs.h
+++ b/src/arch/xtensa/xtos/xtos-structs.h
@@ -5,12 +5,12 @@
  * Author: Tomasz Lauda <tomasz.lauda@linux.intel.com>
  */
 
+#ifndef __XTOS_XTOS_STRUCTS_H__
+#define __XTOS_XTOS_STRUCTS_H__
+
 #include "xtos-internal.h"
 #include <config.h>
 
-#ifndef __XTOS_STRUCTS_H__
-#define __XTOS_STRUCTS_H__
-
 struct idc;
 struct irq_task;
 struct notify;
@@ -41,4 +41,4 @@ struct core_context {
 
 void _xtos_initialize_pointers_per_core(void);
 
-#endif /* __XTOS_STRUCTS_H__ */
+#endif /* __XTOS_XTOS_STRUCTS_H__ */