diff --git a/arch/arc/include/kernel_arch_data.h b/arch/arc/include/kernel_arch_data.h
index feaa788be10..c5aa471d13c 100644
--- a/arch/arc/include/kernel_arch_data.h
+++ b/arch/arc/include/kernel_arch_data.h
@@ -17,8 +17,8 @@
  * symbols" in the offsets.o module.
  */
 
-#ifndef _kernel_arch_data__h_
-#define _kernel_arch_data__h_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -188,4 +188,4 @@ typedef struct _kernel_arch _kernel_arch_t;
 }
 #endif
 
-#endif /* _kernel_arch_data__h_ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/arc/include/kernel_arch_func.h b/arch/arc/include/kernel_arch_func.h
index c683c7a55c4..c5cbbb18d22 100644
--- a/arch/arc/include/kernel_arch_func.h
+++ b/arch/arc/include/kernel_arch_func.h
@@ -17,8 +17,8 @@
  * symbols" in the offsets.o module.
  */
 
-#ifndef _kernel_arch_func__h_
-#define _kernel_arch_func__h_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -75,4 +75,4 @@ extern void _arc_userspace_enter(k_thread_entry_t user_entry, void *p1,
 }
 #endif
 
-#endif /* _kernel_arch_func__h_ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/arc/include/kernel_arch_thread.h b/arch/arc/include/kernel_arch_thread.h
index 0e48edcde00..00e9029f9ca 100644
--- a/arch/arc/include/kernel_arch_thread.h
+++ b/arch/arc/include/kernel_arch_thread.h
@@ -17,8 +17,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef _kernel_arch_thread__h_
-#define _kernel_arch_thread__h_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_THREAD_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_THREAD_H_
 
 /*
  * Reason a thread has relinquished control: threads can only be in the NONE
@@ -79,4 +79,4 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_thread__h_ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_KERNEL_ARCH_THREAD_H_ */
diff --git a/arch/arc/include/offsets_short_arch.h b/arch/arc/include/offsets_short_arch.h
index 14412ca4069..b4185e85fa1 100644
--- a/arch/arc/include/offsets_short_arch.h
+++ b/arch/arc/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _offsets_short_arch__h_
-#define _offsets_short_arch__h_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -43,4 +43,4 @@
 
 /* end - threads */
 
-#endif /* _offsets_short_arch__h_ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/arc/include/swap_macros.h b/arch/arc/include/swap_macros.h
index 5f7113b8977..16dd27e3867 100644
--- a/arch/arc/include/swap_macros.h
+++ b/arch/arc/include/swap_macros.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SWAP_MACROS__H_
-#define _SWAP_MACROS__H_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_SWAP_MACROS_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_SWAP_MACROS_H_
 
 #include <kernel_structs.h>
 #include <offsets_short.h>
@@ -278,4 +278,4 @@ extern "C" {
 }
 #endif
 
-#endif /*  _SWAP_MACROS__H_ */
+#endif /*  ZEPHYR_ARCH_ARC_INCLUDE_SWAP_MACROS_H_ */
diff --git a/arch/arc/include/tracing_arch.h b/arch/arc/include/tracing_arch.h
index ec119598a6e..a1774500034 100644
--- a/arch/arc/include/tracing_arch.h
+++ b/arch/arc/include/tracing_arch.h
@@ -9,8 +9,8 @@
  * @brief Kernel event logger support for ARM
  */
 
-#ifndef __KERNEL_TRACING_H__
-#define __KERNEL_TRACING_H__
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_TRACING_ARCH_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_TRACING_ARCH_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,4 +33,4 @@ int _sys_current_irq_key_get(void)
 }
 #endif
 
-#endif /* __KERNEL_TRACING_H__ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_TRACING_ARCH_H_ */
diff --git a/arch/arc/include/v2/cache.h b/arch/arc/include/v2/cache.h
index a4c0357134f..e077dbe62c5 100644
--- a/arch/arc/include/v2/cache.h
+++ b/arch/arc/include/v2/cache.h
@@ -12,8 +12,8 @@
  * ARCv2 processor architecture.
  */
 
-#ifndef _ARCV2_CACHE__H_
-#define _ARCV2_CACHE__H_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_V2_CACHE_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_V2_CACHE_H_
 
 #include <arch/cpu.h>
 
@@ -56,4 +56,4 @@ static ALWAYS_INLINE void _icache_setup(void)
 }
 #endif
 
-#endif /* _ARCV2_CACHE__H_ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_V2_CACHE_H_ */
diff --git a/arch/arc/include/v2/irq.h b/arch/arc/include/v2/irq.h
index 5cbbce021a4..26c9f6c6226 100644
--- a/arch/arc/include/v2/irq.h
+++ b/arch/arc/include/v2/irq.h
@@ -12,8 +12,8 @@
  * other definitions for the ARCv2 processor architecture.
  */
 
-#ifndef _ARCV2_IRQ__H_
-#define _ARCV2_IRQ__H_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_V2_IRQ_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_V2_IRQ_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ static ALWAYS_INLINE void _irq_setup(void)
 }
 #endif
 
-#endif /* _ARCV2_IRQ__H_ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_V2_IRQ_H_ */
diff --git a/arch/arc/include/vector_table.h b/arch/arc/include/vector_table.h
index 02bac3bb243..c1e3b55e3ba 100644
--- a/arch/arc/include/vector_table.h
+++ b/arch/arc/include/vector_table.h
@@ -18,8 +18,8 @@
  * Refer to the ARCv2 manual for an explanation of the exceptions.
  */
 
-#ifndef _VECTOR_TABLE__H_
-#define _VECTOR_TABLE__H_
+#ifndef ZEPHYR_ARCH_ARC_INCLUDE_VECTOR_TABLE_H_
+#define ZEPHYR_ARCH_ARC_INCLUDE_VECTOR_TABLE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ extern void __ev_maligned(void);
 }
 #endif
 
-#endif /* _VECTOR_TABLE__H_ */
+#endif /* ZEPHYR_ARCH_ARC_INCLUDE_VECTOR_TABLE_H_ */
diff --git a/arch/arm/core/cortex_m/vector_table.h b/arch/arm/core/cortex_m/vector_table.h
index 3189f2ba9aa..02b612a07d7 100644
--- a/arch/arm/core/cortex_m/vector_table.h
+++ b/arch/arm/core/cortex_m/vector_table.h
@@ -18,8 +18,8 @@
  * No other symbol has the same format, so they are easy to spot.
  */
 
-#ifndef _VECTOR_TABLE__H_
-#define _VECTOR_TABLE__H_
+#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_
+#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,4 +68,4 @@ extern void *_vector_table[];
 }
 #endif
 
-#endif /* _VECTOR_TABLE__H_ */
+#endif /* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_ */
diff --git a/arch/arm/include/cortex_m/cmse.h b/arch/arm/include/cortex_m/cmse.h
index 8ae136d30cc..b4d010bafec 100644
--- a/arch/arm/include/cortex_m/cmse.h
+++ b/arch/arm/include/cortex_m/cmse.h
@@ -11,8 +11,8 @@
  * CMSE API for Cortex-M23/M33 CPUs.
  */
 
-#ifndef _ARM_CORTEXM_CMSE__H_
-#define _ARM_CORTEXM_CMSE__H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -449,4 +449,4 @@ int arm_cmse_addr_range_nonsecure_readwrite_ok(u32_t addr, u32_t size,
 }
 #endif
 
-#endif /* _ARM_CORTEXM_CMSE__H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ */
diff --git a/arch/arm/include/cortex_m/exc.h b/arch/arm/include/cortex_m/exc.h
index e4a4fc3b6ac..3bad549029b 100644
--- a/arch/arm/include/cortex_m/exc.h
+++ b/arch/arm/include/cortex_m/exc.h
@@ -11,8 +11,8 @@
  * Exception/interrupt context helpers.
  */
 
-#ifndef _ARM_CORTEXM_ISR__H_
-#define _ARM_CORTEXM_ISR__H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_
 
 #include <arch/cpu.h>
 
@@ -167,4 +167,4 @@ static ALWAYS_INLINE void _ClearFaults(void)
 #endif
 
 
-#endif /* _ARM_CORTEXM_ISR__H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ */
diff --git a/arch/arm/include/cortex_m/stack.h b/arch/arm/include/cortex_m/stack.h
index 43f939629bc..a8d0c3eaa75 100644
--- a/arch/arm/include/cortex_m/stack.h
+++ b/arch/arm/include/cortex_m/stack.h
@@ -11,8 +11,8 @@
  * Stack helper functions.
  */
 
-#ifndef _ARM_CORTEXM_STACK__H_
-#define _ARM_CORTEXM_STACK__H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -63,4 +63,4 @@ static ALWAYS_INLINE void _InterruptStackSetup(void)
 }
 #endif
 
-#endif /* _ARM_CORTEXM_STACK__H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ */
diff --git a/arch/arm/include/cortex_m/tz.h b/arch/arm/include/cortex_m/tz.h
index 5c6258da1da..08ce53a85ac 100644
--- a/arch/arm/include/cortex_m/tz.h
+++ b/arch/arm/include/cortex_m/tz.h
@@ -11,8 +11,8 @@
  * TrustZone API for Cortex-M23/M33 CPUs implementing the Security Extension.
  */
 
-#ifndef _ARM_CORTEXM_TZ__H_
-#define _ARM_CORTEXM_TZ__H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -326,4 +326,4 @@ typedef void __attribute__((cmse_nonsecure_call)) (*tz_ns_func_ptr_t) (void);
 }
 #endif
 
-#endif /* _ARM_CORTEXM_TZ__H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ */
diff --git a/arch/arm/include/kernel_arch_data.h b/arch/arm/include/kernel_arch_data.h
index 51f1a3cceed..0d952723afa 100644
--- a/arch/arm/include/kernel_arch_data.h
+++ b/arch/arm/include/kernel_arch_data.h
@@ -17,8 +17,8 @@
  * in the offsets.o module.
  */
 
-#ifndef _kernel_arch_data__h_
-#define _kernel_arch_data__h_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ typedef struct _kernel_arch _kernel_arch_t;
 }
 #endif
 
-#endif /* _kernel_arch_data__h_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/arm/include/kernel_arch_func.h b/arch/arm/include/kernel_arch_func.h
index b35d00775fc..d5557e45f46 100644
--- a/arch/arm/include/kernel_arch_func.h
+++ b/arch/arm/include/kernel_arch_func.h
@@ -19,8 +19,8 @@
 
 /* this file is only meant to be included by kernel_structs.h */
 
-#ifndef _kernel_arch_func__h_
-#define _kernel_arch_func__h_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -135,4 +135,4 @@ extern FUNC_NORETURN void _arm_userspace_enter(k_thread_entry_t user_entry,
 }
 #endif
 
-#endif /* _kernel_arch_func__h_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/arm/include/kernel_arch_thread.h b/arch/arm/include/kernel_arch_thread.h
index 86fffed027f..d83195785a1 100644
--- a/arch/arm/include/kernel_arch_thread.h
+++ b/arch/arm/include/kernel_arch_thread.h
@@ -17,8 +17,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef _kernel_arch_thread_h_
-#define _kernel_arch_thread_h_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_THREAD_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_KERNEL_ARCH_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
diff --git a/arch/arm/include/offsets_short_arch.h b/arch/arm/include/offsets_short_arch.h
index 14d86c6e2e9..8fd64776954 100644
--- a/arch/arm/include/offsets_short_arch.h
+++ b/arch/arm/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _offsets_short_arch__h_
-#define _offsets_short_arch__h_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -36,4 +36,4 @@
 
 /* end - threads */
 
-#endif /* _offsets_short_arch__h_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/arm/include/tracing_arch.h b/arch/arm/include/tracing_arch.h
index dd2a9dc0c16..8eaa73b4a01 100644
--- a/arch/arm/include/tracing_arch.h
+++ b/arch/arm/include/tracing_arch.h
@@ -9,8 +9,8 @@
  * @brief Kernel event logger support for ARM
  */
 
-#ifndef __KERNEL_TRACING_H__
-#define __KERNEL_TRACING_H__
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_TRACING_ARCH_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_TRACING_ARCH_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,4 +34,4 @@ int _sys_current_irq_key_get(void)
 }
 #endif
 
-#endif /* __KERNEL_TRACING_H__ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_TRACING_ARCH_H_ */
diff --git a/arch/nios2/include/kernel_arch_data.h b/arch/nios2/include/kernel_arch_data.h
index 13c7878de34..08be33ad463 100644
--- a/arch/nios2/include/kernel_arch_data.h
+++ b/arch/nios2/include/kernel_arch_data.h
@@ -18,8 +18,8 @@
  * symbols" in the offsets.o module.
  */
 
-#ifndef _kernel_arch_data__h_
-#define _kernel_arch_data__h_
+#ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,4 +61,4 @@ extern K_THREAD_STACK_DEFINE(_interrupt_stack, CONFIG_ISR_STACK_SIZE);
 }
 #endif
 
-#endif /* _kernel_arch_data__h_ */
+#endif /* ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/nios2/include/kernel_arch_func.h b/arch/nios2/include/kernel_arch_func.h
index 8dbdbfc019f..1ede6009a0a 100644
--- a/arch/nios2/include/kernel_arch_func.h
+++ b/arch/nios2/include/kernel_arch_func.h
@@ -17,8 +17,8 @@
  * symbols" in the offsets.o module.
  */
 
-#ifndef _kernel_arch_func__h_
-#define _kernel_arch_func__h_
+#ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,4 +72,4 @@ void _nios2_dcache_flush_no_writeback(void *start, u32_t len);
 }
 #endif
 
-#endif /* _kernel_arch_func__h_ */
+#endif /* ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/nios2/include/kernel_arch_thread.h b/arch/nios2/include/kernel_arch_thread.h
index 34747fbf18f..58409772894 100644
--- a/arch/nios2/include/kernel_arch_thread.h
+++ b/arch/nios2/include/kernel_arch_thread.h
@@ -17,8 +17,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef _kernel_arch_thread__h_
-#define _kernel_arch_thread__h_
+#ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_THREAD_H_
+#define ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
@@ -71,5 +71,5 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_thread__h_ */
+#endif /* ZEPHYR_ARCH_NIOS2_INCLUDE_KERNEL_ARCH_THREAD_H_ */
 
diff --git a/arch/nios2/include/offsets_short_arch.h b/arch/nios2/include/offsets_short_arch.h
index 1e9276eee28..b3f60972c3b 100644
--- a/arch/nios2/include/offsets_short_arch.h
+++ b/arch/nios2/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _offsets_short_arch__h_
-#define _offsets_short_arch__h_
+#ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_NIOS2_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -58,4 +58,4 @@
 
 /* end - threads */
 
-#endif /* _offsets_short_arch__h_ */
+#endif /* ZEPHYR_ARCH_NIOS2_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/nios2/include/tracing_arch.h b/arch/nios2/include/tracing_arch.h
index e013bee03a1..976ee509a69 100644
--- a/arch/nios2/include/tracing_arch.h
+++ b/arch/nios2/include/tracing_arch.h
@@ -9,8 +9,8 @@
  * @brief Kernel event logger support for Nios II
  */
 
-#ifndef __KERNEL_TRACING_H__
-#define __KERNEL_TRACING_H__
+#ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_TRACING_ARCH_H_
+#define ZEPHYR_ARCH_NIOS2_INCLUDE_TRACING_ARCH_H_
 
 #include <arch/cpu.h>
 
@@ -38,4 +38,4 @@ static inline int _sys_current_irq_key_get(void)
 }
 #endif
 
-#endif /* __KERNEL_TRACING_H__ */
+#endif /* ZEPHYR_ARCH_NIOS2_INCLUDE_TRACING_ARCH_H_ */
diff --git a/arch/posix/core/CMakeLists.txt b/arch/posix/core/CMakeLists.txt
index a436aa7ffbc..9e052a5ae9b 100644
--- a/arch/posix/core/CMakeLists.txt
+++ b/arch/posix/core/CMakeLists.txt
@@ -1,5 +1,5 @@
 zephyr_library()
-zephyr_library_compile_definitions(_POSIX_CHEATS_H)
+zephyr_library_compile_definitions(NO_POSIX_CHEATS)
 zephyr_library_sources(
 	cpuhalt.c
 	fatal.c
diff --git a/arch/posix/include/asm_inline.h b/arch/posix/include/asm_inline.h
index 5601d0ec126..306eb77cd3e 100644
--- a/arch/posix/include/asm_inline.h
+++ b/arch/posix/include/asm_inline.h
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_H
-#define _ASM_INLINE_H
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_ASM_INLINE_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_ASM_INLINE_H_
 
 #if !defined(CONFIG_ARCH_POSIX)
 #error The arch/posix/include/asm_inline.h is only for the POSIX architecture
@@ -21,4 +21,4 @@
 #include <asm_inline_other.h>
 #endif /* __GNUC__ */
 
-#endif /* _ASM_INLINE_H */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_ASM_INLINE_H_ */
diff --git a/arch/posix/include/kernel_arch_data.h b/arch/posix/include/kernel_arch_data.h
index e8a9fe50589..5f50adcc04f 100644
--- a/arch/posix/include/kernel_arch_data.h
+++ b/arch/posix/include/kernel_arch_data.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef _kernel_arch_data__h_
-#define _kernel_arch_data__h_
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,4 +39,4 @@ typedef struct _kernel_arch _kernel_arch_t;
 }
 #endif
 
-#endif /* _kernel_arch_data__h_ */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/posix/include/kernel_arch_func.h b/arch/posix/include/kernel_arch_func.h
index e3b0854b3c6..5e63876264b 100644
--- a/arch/posix/include/kernel_arch_func.h
+++ b/arch/posix/include/kernel_arch_func.h
@@ -7,8 +7,8 @@
 
 /* This file is only meant to be included by kernel_structs.h */
 
-#ifndef _kernel_arch_func__h_
-#define _kernel_arch_func__h_
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #include "kernel.h"
 #include <toolchain/common.h>
@@ -67,4 +67,4 @@ static inline void _IntLibInit(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_func__h_ */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/posix/include/kernel_arch_thread.h b/arch/posix/include/kernel_arch_thread.h
index c412c29c65b..01dd77aa492 100644
--- a/arch/posix/include/kernel_arch_thread.h
+++ b/arch/posix/include/kernel_arch_thread.h
@@ -18,8 +18,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef _kernel_arch_thread__h_
-#define _kernel_arch_thread__h_
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_THREAD_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
@@ -54,4 +54,4 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_thread__h_ */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_KERNEL_ARCH_THREAD_H_ */
diff --git a/arch/posix/include/offsets_short_arch.h b/arch/posix/include/offsets_short_arch.h
index a0cf3a62669..50295be148f 100644
--- a/arch/posix/include/offsets_short_arch.h
+++ b/arch/posix/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _offsets_short_arch__h_
-#define _offsets_short_arch__h_
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -32,4 +32,4 @@
 
 /* end - threads */
 
-#endif /* _offsets_short_arch__h_ */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/posix/include/posix_arch_internal.h b/arch/posix/include/posix_arch_internal.h
index d724c2d2e2a..5cd155c075d 100644
--- a/arch/posix/include/posix_arch_internal.h
+++ b/arch/posix/include/posix_arch_internal.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _POSIX_INTERNAL_H
-#define _POSIX_INTERNAL_H
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_ARCH_INTERNAL_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_ARCH_INTERNAL_H_
 
 #include "toolchain.h"
 
@@ -29,7 +29,7 @@ static inline void _safe_call(int test, const char *test_str)
 }
 #endif
 
-#endif /* _POSIX_INTERNAL_H */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_ARCH_INTERNAL_H_ */
 
 /*
  * Note 1:
diff --git a/arch/posix/include/posix_cheats.h b/arch/posix/include/posix_cheats.h
index 576db1635e8..818bb981a7d 100644
--- a/arch/posix/include/posix_cheats.h
+++ b/arch/posix/include/posix_cheats.h
@@ -9,8 +9,8 @@
  * Header to be able to compile the Zephyr kernel on top of a POSIX OS
  */
 
-#ifndef _POSIX_CHEATS_H
-#define _POSIX_CHEATS_H
+#if !defined(ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_CHEATS_H_) && !defined(NO_POSIX_CHEATS)
+#define ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_CHEATS_H_
 
 #ifdef CONFIG_ARCH_POSIX
 
@@ -193,4 +193,4 @@
 
 #endif /* CONFIG_ARCH_POSIX */
 
-#endif /* _POSIX_CHEATS_H */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_CHEATS_H_ */
diff --git a/arch/posix/include/posix_core.h b/arch/posix/include/posix_core.h
index 96a53fb10ac..8af76eb5b68 100644
--- a/arch/posix/include/posix_core.h
+++ b/arch/posix/include/posix_core.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _POSIX_CORE_H
-#define _POSIX_CORE_H
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_CORE_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_CORE_H_
 
 #include "kernel.h"
 
@@ -48,4 +48,4 @@ void posix_irq_check_idle_exit(void);
 }
 #endif
 
-#endif /* _POSIX_CORE_H */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_CORE_H_ */
diff --git a/arch/posix/include/posix_soc_if.h b/arch/posix/include/posix_soc_if.h
index 1e90693dc93..b3323ef260c 100644
--- a/arch/posix/include/posix_soc_if.h
+++ b/arch/posix/include/posix_soc_if.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _POSIX_CORE_SOC_PROVIDED_IF_H
-#define _POSIX_CORE_SOC_PROVIDED_IF_H
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_SOC_IF_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_SOC_IF_H_
 
 /*
  * This file lists the functions the POSIX architecture core expects the
@@ -41,4 +41,4 @@ int  posix_get_current_irq(void);
 }
 #endif
 
-#endif /* _POSIX_CORE_SOC_PROVIDED_IF_H */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_SOC_IF_H_ */
diff --git a/arch/posix/include/posix_trace.h b/arch/posix/include/posix_trace.h
index 1a71a1e7abf..f7d47bc3bb6 100644
--- a/arch/posix/include/posix_trace.h
+++ b/arch/posix/include/posix_trace.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _POSIX_TRACE_H
-#define _POSIX_TRACE_H
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_TRACE_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_POSIX_TRACE_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/arch/posix/include/tracing_arch.h b/arch/posix/include/tracing_arch.h
index 299e5151edb..5ff7af9f16f 100644
--- a/arch/posix/include/tracing_arch.h
+++ b/arch/posix/include/tracing_arch.h
@@ -10,8 +10,8 @@
  * @brief Kernel event logger support for ARM
  */
 
-#ifndef __KERNEL_TRACING_H__
-#define __KERNEL_TRACING_H__
+#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_TRACING_ARCH_H_
+#define ZEPHYR_ARCH_POSIX_INCLUDE_TRACING_ARCH_H_
 
 #include "posix_soc_if.h"
 
@@ -36,4 +36,4 @@ static inline int _sys_current_irq_key_get(void)
 }
 #endif
 
-#endif /* __KERNEL_TRACING_H__ */
+#endif /* ZEPHYR_ARCH_POSIX_INCLUDE_TRACING_ARCH_H_ */
diff --git a/arch/riscv32/include/kernel_arch_data.h b/arch/riscv32/include/kernel_arch_data.h
index 0d0d9b5962b..6f6b6a5b234 100644
--- a/arch/riscv32/include/kernel_arch_data.h
+++ b/arch/riscv32/include/kernel_arch_data.h
@@ -12,8 +12,8 @@
  * other definitions for the RISCV32 processor architecture.
  */
 
-#ifndef _kernel_arch_data_h_
-#define _kernel_arch_data_h_
+#ifndef ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,4 +41,4 @@ extern K_THREAD_STACK_DEFINE(_interrupt_stack, CONFIG_ISR_STACK_SIZE);
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_data_h_ */
+#endif /* ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/riscv32/include/kernel_arch_func.h b/arch/riscv32/include/kernel_arch_func.h
index 958a44f16b7..c1c98e263a0 100644
--- a/arch/riscv32/include/kernel_arch_func.h
+++ b/arch/riscv32/include/kernel_arch_func.h
@@ -12,8 +12,8 @@
  * other definitions for the RISCV32 processor architecture.
  */
 
-#ifndef _kernel_arch_func__h_
-#define _kernel_arch_func__h_
+#ifndef ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #include <soc.h>
 
@@ -60,4 +60,4 @@ int _irq_do_offload(void);
 }
 #endif
 
-#endif /* _kernel_arch_func__h_ */
+#endif /* ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/riscv32/include/kernel_arch_thread.h b/arch/riscv32/include/kernel_arch_thread.h
index 526a365b570..b57098f0c9e 100644
--- a/arch/riscv32/include/kernel_arch_thread.h
+++ b/arch/riscv32/include/kernel_arch_thread.h
@@ -17,8 +17,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef _kernel_arch_thread__h_
-#define _kernel_arch_thread__h_
+#ifndef ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_THREAD_H_
+#define ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
@@ -62,5 +62,5 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_thread__h_ */
+#endif /* ZEPHYR_ARCH_RISCV32_INCLUDE_KERNEL_ARCH_THREAD_H_ */
 
diff --git a/arch/riscv32/include/offsets_short_arch.h b/arch/riscv32/include/offsets_short_arch.h
index 8d890fe7c11..ed8b6f3c1a9 100644
--- a/arch/riscv32/include/offsets_short_arch.h
+++ b/arch/riscv32/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _offsets_short_arch__h_
-#define _offsets_short_arch__h_
+#ifndef ZEPHYR_ARCH_RISCV32_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_RISCV32_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -61,4 +61,4 @@
 
 /* end - threads */
 
-#endif /* _offsets_short_arch__h_ */
+#endif /* ZEPHYR_ARCH_RISCV32_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/riscv32/include/tracing_arch.h b/arch/riscv32/include/tracing_arch.h
index ec0a5bb2eab..db5230f6a16 100644
--- a/arch/riscv32/include/tracing_arch.h
+++ b/arch/riscv32/include/tracing_arch.h
@@ -9,8 +9,8 @@
  * @brief Kernel event logger support for RISCV32
  */
 
-#ifndef __KERNEL_TRACING_H__
-#define __KERNEL_TRACING_H__
+#ifndef ZEPHYR_ARCH_RISCV32_INCLUDE_TRACING_ARCH_H_
+#define ZEPHYR_ARCH_RISCV32_INCLUDE_TRACING_ARCH_H_
 
 #include <arch/cpu.h>
 
@@ -41,4 +41,4 @@ static inline int _sys_current_irq_key_get(void)
 }
 #endif
 
-#endif /* __KERNEL_TRACING_H__ */
+#endif /* ZEPHYR_ARCH_RISCV32_INCLUDE_TRACING_ARCH_H_ */
diff --git a/arch/x86/include/asm_inline.h b/arch/x86/include/asm_inline.h
index 4a7c9ee237b..fa3e6b752d4 100644
--- a/arch/x86/include/asm_inline.h
+++ b/arch/x86/include/asm_inline.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_H
-#define _ASM_INLINE_H
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_ASM_INLINE_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_ASM_INLINE_H_
 
 #if !defined(CONFIG_X86)
 #error The arch/x86/include/asm_inline.h is only for x86 architecture
@@ -19,4 +19,4 @@
 #include <asm_inline_other.h>
 #endif /* __GNUC__ */
 
-#endif /* _ASM_INLINE_H */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_ASM_INLINE_H_ */
diff --git a/arch/x86/include/asm_inline_gcc.h b/arch/x86/include/asm_inline_gcc.h
index 97393b69202..5293b5d3666 100644
--- a/arch/x86/include/asm_inline_gcc.h
+++ b/arch/x86/include/asm_inline_gcc.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_GCC_H
-#define _ASM_INLINE_GCC_H
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_ASM_INLINE_GCC_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_ASM_INLINE_GCC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -141,4 +141,4 @@ static inline void _do_sse_regs_init(void)
 }
 #endif
 
-#endif /* _ASM_INLINE_GCC_H */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_ASM_INLINE_GCC_H_ */
diff --git a/arch/x86/include/cache_private.h b/arch/x86/include/cache_private.h
index 2dbd18446bd..9eaa0c6f6c6 100644
--- a/arch/x86/include/cache_private.h
+++ b/arch/x86/include/cache_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _cache_private__h_
-#define _cache_private__h_
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_CACHE_PRIVATE_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_CACHE_PRIVATE_H_
 
 #include <cache.h>
 
@@ -21,4 +21,4 @@ extern size_t _cache_line_size_get(void);
 }
 #endif
 
-#endif /* _cache_private__h_ */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_CACHE_PRIVATE_H_ */
diff --git a/arch/x86/include/exception.h b/arch/x86/include/exception.h
index 3ee26332af8..6aca1b372ce 100644
--- a/arch/x86/include/exception.h
+++ b/arch/x86/include/exception.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef X86_EXCEPTION_H
-#define X86_EXCEPTION_H
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_EXCEPTION_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_EXCEPTION_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -83,4 +83,4 @@
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* X86_EXCEPTION_H */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_EXCEPTION_H_ */
diff --git a/arch/x86/include/kernel_arch_data.h b/arch/x86/include/kernel_arch_data.h
index 0d30088af8a..a2cef30f80e 100644
--- a/arch/x86/include/kernel_arch_data.h
+++ b/arch/x86/include/kernel_arch_data.h
@@ -23,8 +23,8 @@
 
 /* this file is only meant to be included by kernel_structs.h */
 
-#ifndef _kernel_arch_data__h_
-#define _kernel_arch_data__h_
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #include <toolchain.h>
 #include <linker/sections.h>
@@ -425,4 +425,4 @@ typedef struct _kernel_arch _kernel_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_data__h_ */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/x86/include/kernel_arch_func.h b/arch/x86/include/kernel_arch_func.h
index 4f688119b55..938e4681e09 100644
--- a/arch/x86/include/kernel_arch_func.h
+++ b/arch/x86/include/kernel_arch_func.h
@@ -7,8 +7,8 @@
 
 /* this file is only meant to be included by kernel_structs.h */
 
-#ifndef _kernel_arch_func__h_
-#define _kernel_arch_func__h_
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -146,4 +146,4 @@ extern FUNC_NORETURN void _x86_userspace_enter(k_thread_entry_t user_entry,
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_func__h_ */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/x86/include/kernel_arch_thread.h b/arch/x86/include/kernel_arch_thread.h
index 699f5369adc..efe849c2ce3 100644
--- a/arch/x86/include/kernel_arch_thread.h
+++ b/arch/x86/include/kernel_arch_thread.h
@@ -17,8 +17,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef _kernel_arch_thread__h_
-#define _kernel_arch_thread__h_
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_THREAD_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_THREAD_H_
 
 /**
  * Floating point register set alignment.
@@ -272,4 +272,4 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_thread__h_ */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_KERNEL_ARCH_THREAD_H_ */
diff --git a/arch/x86/include/mmustructs.h b/arch/x86/include/mmustructs.h
index 5c9a48b9963..93624170848 100644
--- a/arch/x86/include/mmustructs.h
+++ b/arch/x86/include/mmustructs.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _MMUSTRUCTS_H
-#define _MMUSTRUCTS_H
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_
 
 #define MMU_PAGE_SIZE 4096
 #define MMU_PAGE_MASK 0xfff
@@ -778,4 +778,4 @@ struct x86_mmu_page_table {
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _MMUSTRUCTS_H */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_ */
diff --git a/arch/x86/include/offsets_short_arch.h b/arch/x86/include/offsets_short_arch.h
index a0cf3a62669..980fc9e7cb6 100644
--- a/arch/x86/include/offsets_short_arch.h
+++ b/arch/x86/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _offsets_short_arch__h_
-#define _offsets_short_arch__h_
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -32,4 +32,4 @@
 
 /* end - threads */
 
-#endif /* _offsets_short_arch__h_ */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/x86/include/swapstk.h b/arch/x86/include/swapstk.h
index ffa48b21fab..a89c87acad0 100644
--- a/arch/x86/include/swapstk.h
+++ b/arch/x86/include/swapstk.h
@@ -17,8 +17,8 @@
  * stack frame is modified.
  */
 
-#ifndef _SWAPSTK_H
-#define _SWAPSTK_H
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_SWAPSTK_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_SWAPSTK_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,4 +43,4 @@ typedef struct s_SwapStk {
 }
 #endif
 
-#endif /* _SWAPSTK_H */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_SWAPSTK_H_ */
diff --git a/arch/x86/include/tracing_arch.h b/arch/x86/include/tracing_arch.h
index fcc8bb96bf2..1e22ceb6517 100644
--- a/arch/x86/include/tracing_arch.h
+++ b/arch/x86/include/tracing_arch.h
@@ -9,8 +9,8 @@
  * @brief Kernel event logger support for x86
  */
 
-#ifndef __KERNEL_TRACING_H__
-#define __KERNEL_TRACING_H__
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_TRACING_ARCH_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_TRACING_ARCH_H_
 
 #include <arch/x86/irq_controller.h>
 
@@ -35,4 +35,4 @@ static inline int _sys_current_irq_key_get(void)
 }
 #endif
 
-#endif /* __KERNEL_TRACING_H__ */
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_TRACING_ARCH_H_ */
diff --git a/arch/xtensa/include/kernel_arch_data.h b/arch/xtensa/include/kernel_arch_data.h
index 6575de205a0..1e06a625e55 100644
--- a/arch/xtensa/include/kernel_arch_data.h
+++ b/arch/xtensa/include/kernel_arch_data.h
@@ -17,8 +17,8 @@
  * in the offsets.o module.
  */
 
-#ifndef _kernel_arch_data__h_
-#define _kernel_arch_data__h_
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_DATA_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,5 +67,5 @@ void xtensa_switch(void *switch_to, void **switched_from);
 }
 #endif
 
-#endif /* _kernel_arch_data__h_ */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_DATA_H_ */
 
diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h
index d3afc0431ad..eca7cb82473 100644
--- a/arch/xtensa/include/kernel_arch_func.h
+++ b/arch/xtensa/include/kernel_arch_func.h
@@ -6,8 +6,8 @@
 
 /* this file is only meant to be included by kernel_structs.h */
 
-#ifndef _kernel_arch_func__h_
-#define _kernel_arch_func__h_
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_FUNC_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_FUNC_H_
 
 #ifndef _ASMLANGUAGE
 #include <string.h>
@@ -126,4 +126,4 @@ static inline void _IntLibInit(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_func__h_ */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_FUNC_H_ */
diff --git a/arch/xtensa/include/kernel_arch_thread.h b/arch/xtensa/include/kernel_arch_thread.h
index 79cebc4f78d..455d0b26bc1 100644
--- a/arch/xtensa/include/kernel_arch_thread.h
+++ b/arch/xtensa/include/kernel_arch_thread.h
@@ -17,8 +17,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef _kernel_arch_thread__h_
-#define _kernel_arch_thread__h_
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_THREAD_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
@@ -138,5 +138,5 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* _kernel_arch_thread__h_ */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_KERNEL_ARCH_THREAD_H_ */
 
diff --git a/arch/xtensa/include/offsets_short_arch.h b/arch/xtensa/include/offsets_short_arch.h
index c410343f2ed..41bab37923d 100644
--- a/arch/xtensa/include/offsets_short_arch.h
+++ b/arch/xtensa/include/offsets_short_arch.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _offsets_short_arch__h_
-#define _offsets_short_arch__h_
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_OFFSETS_SHORT_ARCH_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
 #include <offsets.h>
 
@@ -40,4 +40,4 @@
 
 /* end - threads */
 
-#endif /* _offsets_short_arch__h_ */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_OFFSETS_SHORT_ARCH_H_ */
diff --git a/arch/xtensa/include/tracing_arch.h b/arch/xtensa/include/tracing_arch.h
index b6755e0716d..c766df55e5f 100644
--- a/arch/xtensa/include/tracing_arch.h
+++ b/arch/xtensa/include/tracing_arch.h
@@ -8,8 +8,8 @@
  * @brief Kernel event logger support for Xtensa
  */
 
-#ifndef __KERNEL_TRACING_H__
-#define __KERNEL_TRACING_H__
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_TRACING_ARCH_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_TRACING_ARCH_H_
 
 
 #ifdef __cplusplus
@@ -33,4 +33,4 @@ static inline int _sys_current_irq_key_get(void)
 }
 #endif
 
-#endif /* __KERNEL_TRACING_H__ */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_TRACING_ARCH_H_ */
diff --git a/arch/xtensa/include/xtensa-asm2-context.h b/arch/xtensa/include/xtensa-asm2-context.h
index 53fe99b0ba0..2860b7198c7 100644
--- a/arch/xtensa/include/xtensa-asm2-context.h
+++ b/arch/xtensa/include/xtensa-asm2-context.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _XTENSA_ASM2_CONTEXT_H
-#define _XTENSA_ASM2_CONTEXT_H
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_CONTEXT_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_CONTEXT_H_
 
 #include <xtensa/corebits.h>
 #include <xtensa/config/core-isa.h>
@@ -79,4 +79,4 @@
 #define BSA_LEND_OFF	(BASE_SAVE_AREA_SIZE - 52)
 #define BSA_LCOUNT_OFF	(BASE_SAVE_AREA_SIZE - 56)
 
-#endif /* _XTENSA_ASM2_CONTEXT_H */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_CONTEXT_H_ */
diff --git a/arch/xtensa/include/xtensa-asm2-s.h b/arch/xtensa/include/xtensa-asm2-s.h
index 60857bae632..c532cf1c0b3 100644
--- a/arch/xtensa/include/xtensa-asm2-s.h
+++ b/arch/xtensa/include/xtensa-asm2-s.h
@@ -4,6 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H
+
 #include "xtensa-asm2-context.h"
 
 /* Assembler header!  This file contains macros designed to be included
@@ -397,3 +400,5 @@ _after_imms\LVL:
 	jx a0
 .popsection
 .endm
+
+#endif	/* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H */
diff --git a/arch/xtensa/include/xtensa_api.h b/arch/xtensa/include/xtensa_api.h
index 6285867cd49..fbe16c5b386 100644
--- a/arch/xtensa/include/xtensa_api.h
+++ b/arch/xtensa/include/xtensa_api.h
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __XTENSA_API_H__
-#define __XTENSA_API_H__
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_API_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_API_H_
 
 #include <xtensa/hal.h>
 #include "xtensa_rtos.h"
@@ -64,5 +64,5 @@ static inline void _xt_set_intclear(unsigned int arg)
 	xthal_set_intclear(arg);
 }
 
-#endif /* __XTENSA_API_H__ */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_API_H_ */
 
diff --git a/arch/xtensa/include/xtensa_config.h b/arch/xtensa/include/xtensa_config.h
index 9c52cfaf584..b5600640dae 100644
--- a/arch/xtensa/include/xtensa_config.h
+++ b/arch/xtensa/include/xtensa_config.h
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef XTENSA_CONFIG_H
-#define XTENSA_CONFIG_H
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_CONFIG_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_CONFIG_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -137,5 +137,5 @@ extern "C" {
 }
 #endif
 
-#endif /* XTENSA_CONFIG_H */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_CONFIG_H_ */
 
diff --git a/arch/xtensa/include/xtensa_context.h b/arch/xtensa/include/xtensa_context.h
index db62526c824..2750180fc53 100644
--- a/arch/xtensa/include/xtensa_context.h
+++ b/arch/xtensa/include/xtensa_context.h
@@ -16,8 +16,8 @@
  * NOTE: The Xtensa architecture requires stack pointer alignment to 16 bytes.
  */
 
-#ifndef XTENSA_CONTEXT_H
-#define XTENSA_CONTEXT_H
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_CONTEXT_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_CONTEXT_H_
 
 #ifdef __ASSEMBLER__
 #include    <xtensa/coreasm.h>
@@ -313,5 +313,5 @@ ret
 #endif /* __ASSEMBLER__ */
 
 
-#endif /* XTENSA_CONTEXT_H */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_CONTEXT_H_ */
 
diff --git a/arch/xtensa/include/xtensa_rtos.h b/arch/xtensa/include/xtensa_rtos.h
index c23ca6ceb98..0ebd0f34610 100644
--- a/arch/xtensa/include/xtensa_rtos.h
+++ b/arch/xtensa/include/xtensa_rtos.h
@@ -21,8 +21,8 @@
  * Should be included by all Xtensa generic and RTOS port-specific sources.
  */
 
-#ifndef XTENSA_RTOS_H
-#define XTENSA_RTOS_H
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_RTOS_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_RTOS_H_
 
 #ifdef __ASSEMBLER__
 #include    <xtensa/coreasm.h>
@@ -203,4 +203,4 @@ extern  volatile XT_INTEXC_HOOK _xt_intexc_hooks[XT_INTEXC_HOOK_NUM];
 #include    "xtensa_timer.h"
 #endif
 
-#endif /* XTENSA_RTOS_H */
+#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_RTOS_H_ */
diff --git a/arch/xtensa/include/xtensa_timer.h b/arch/xtensa/include/xtensa_timer.h
index fa13d99d65b..c89ffcb0e73 100644
--- a/arch/xtensa/include/xtensa_timer.h
+++ b/arch/xtensa/include/xtensa_timer.h
@@ -19,8 +19,8 @@
  * and the Xtensa core configuration need not have a timer.
  */
 
-#ifndef XTENSA_TIMER_H
-#define XTENSA_TIMER_H
+#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_TIMER_H_
+#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_TIMER_H_
 
 #ifdef __ASSEMBLER__
 #include    <xtensa/coreasm.h>
@@ -149,5 +149,5 @@ extern void _xt_tick_divisor_init(void);
 
 #endif // Internal/External timer
 
-#endif  /* XTENSA_TIMER_H */
+#endif  /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_TIMER_H_ */
 
diff --git a/boards/posix/native_posix/CMakeLists.txt b/boards/posix/native_posix/CMakeLists.txt
index 7abb749f4c4..4aeb04859b5 100644
--- a/boards/posix/native_posix/CMakeLists.txt
+++ b/boards/posix/native_posix/CMakeLists.txt
@@ -1,5 +1,5 @@
 zephyr_library()
-zephyr_library_compile_definitions(_POSIX_CHEATS_H)
+zephyr_library_compile_definitions(NO_POSIX_CHEATS)
 zephyr_library_sources(
 	hw_models_top.c
 	timer_model.c
diff --git a/drivers/adc/adc_context.h b/drivers/adc/adc_context.h
index bb775175925..e3daebb3aaf 100644
--- a/drivers/adc/adc_context.h
+++ b/drivers/adc/adc_context.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ADC_CONTEXT_H__
-#define __ADC_CONTEXT_H__
+#ifndef ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_
+#define ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_
 
 #include <adc.h>
 #include <atomic.h>
@@ -265,4 +265,4 @@ static inline void adc_context_on_sampling_done(struct adc_context *ctx,
 }
 #endif
 
-#endif /* __ADC_CONTEXT_H__ */
+#endif /* ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_ */
diff --git a/drivers/adc/adc_dw.h b/drivers/adc/adc_dw.h
index 797755da73d..2830b46c27a 100644
--- a/drivers/adc/adc_dw.h
+++ b/drivers/adc/adc_dw.h
@@ -33,8 +33,8 @@
  * @brief Designware ADC header file
  */
 
-#ifndef DW_ADC_H_
-#define DW_ADC_H_
+#ifndef ZEPHYR_DRIVERS_ADC_ADC_DW_H_
+#define ZEPHYR_DRIVERS_ADC_ADC_DW_H_
 
 #include <zephyr/types.h>
 #include <adc.h>
@@ -234,4 +234,4 @@ int adc_dw_init(struct device *dev);
 }
 #endif
 
-#endif  /*  DW_ADC_H_ */
+#endif  /*  ZEPHYR_DRIVERS_ADC_ADC_DW_H_ */
diff --git a/drivers/adc/adc_ti_adc108s102.h b/drivers/adc/adc_ti_adc108s102.h
index 7fb9d64e5df..31700765e16 100644
--- a/drivers/adc/adc_ti_adc108s102.h
+++ b/drivers/adc/adc_ti_adc108s102.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __ADC108S102_PRIV_H__
-#define __ADC108S102_PRIV_H__
+#ifndef ZEPHYR_DRIVERS_ADC_ADC_TI_ADC108S102_H_
+#define ZEPHYR_DRIVERS_ADC_ADC_TI_ADC108S102_H_
 
 #include <spi.h>
 #include <adc.h>
@@ -53,4 +53,4 @@ struct ti_adc108s102_data {
 }
 #endif
 
-#endif /* __ADC108S102_PRIV_H__ */
+#endif /* ZEPHYR_DRIVERS_ADC_ADC_TI_ADC108S102_H_ */
diff --git a/drivers/audio/tlv320dac310x.h b/drivers/audio/tlv320dac310x.h
index 4ca18bebf20..2a2f2959ee9 100644
--- a/drivers/audio/tlv320dac310x.h
+++ b/drivers/audio/tlv320dac310x.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __TLV320DAC3101_H__
-#define __TLV320DAC3101_H__
+#ifndef ZEPHYR_DRIVERS_AUDIO_TLV320DAC310X_H_
+#define ZEPHYR_DRIVERS_AUDIO_TLV320DAC310X_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -158,4 +158,4 @@ enum cm_voltage {
 }
 #endif
 
-#endif /* __TLV320DAC3101_H__ */
+#endif /* ZEPHYR_DRIVERS_AUDIO_TLV320DAC310X_H_ */
diff --git a/drivers/can/stm32_can.h b/drivers/can/stm32_can.h
index 08bdcff47fb..f4ee807dafb 100644
--- a/drivers/can/stm32_can.h
+++ b/drivers/can/stm32_can.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef _STM32_CAN_H_
-#define _STM32_CAN_H_
+#ifndef ZEPHYR_DRIVERS_CAN_STM32_CAN_H_
+#define ZEPHYR_DRIVERS_CAN_STM32_CAN_H_
 
 #include <can.h>
 
@@ -74,4 +74,4 @@ struct can_stm32_config {
 	void (*config_irq)(CAN_TypeDef *can);
 };
 
-#endif /*_STM32_CAN_H_*/
+#endif /*ZEPHYR_DRIVERS_CAN_STM32_CAN_H_*/
diff --git a/drivers/clock_control/stm32_ll_clock.h b/drivers/clock_control/stm32_ll_clock.h
index 73f98e53333..da8bd24fac7 100644
--- a/drivers/clock_control/stm32_ll_clock.h
+++ b/drivers/clock_control/stm32_ll_clock.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32_LL_CLOCK_H_
-#define _STM32_LL_CLOCK_H_
+#ifndef ZEPHYR_DRIVERS_CLOCK_CONTROL_STM32_LL_CLOCK_H_
+#define ZEPHYR_DRIVERS_CLOCK_CONTROL_STM32_LL_CLOCK_H_
 
 void config_pll_init(LL_UTILS_PLLInitTypeDef *pllinit);
 void config_enable_default_clocks(void);
@@ -14,4 +14,4 @@ void config_enable_default_clocks(void);
 /* Section for functions not available in every Cube packages */
 void LL_RCC_MSI_Disable(void);
 
-#endif /* _STM32_LL_CLOCK_H_ */
+#endif /* ZEPHYR_DRIVERS_CLOCK_CONTROL_STM32_LL_CLOCK_H_ */
diff --git a/drivers/console/telnet_protocol.h b/drivers/console/telnet_protocol.h
index b29a78500eb..3cbbf590e65 100644
--- a/drivers/console/telnet_protocol.h
+++ b/drivers/console/telnet_protocol.h
@@ -13,8 +13,8 @@
  * (NVT: Network Virtual Terminal, see rfc854)
  */
 
-#ifndef __TELNET_PROTOCOL_H__
-#define __TELNET_PROTOCOL_H__
+#ifndef ZEPHYR_DRIVERS_CONSOLE_TELNET_PROTOCOL_H_
+#define ZEPHYR_DRIVERS_CONSOLE_TELNET_PROTOCOL_H_
 
 /** Printer/Keyboard codes */
 
@@ -122,4 +122,4 @@ static inline void telnet_command_cpy(struct telnet_simple_command *dst,
 	dst->opt = src->opt;
 }
 
-#endif /* __TELNET_PROTOCOL_H__ */
+#endif /* ZEPHYR_DRIVERS_CONSOLE_TELNET_PROTOCOL_H_ */
diff --git a/drivers/counter/dualtimer_cmsdk_apb.h b/drivers/counter/dualtimer_cmsdk_apb.h
index 1f17f7de2f2..3350ca2394c 100644
--- a/drivers/counter/dualtimer_cmsdk_apb.h
+++ b/drivers/counter/dualtimer_cmsdk_apb.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _DRIVERS_DUALTIMER_CMSDK_AHB_
-#define _DRIVERS_DUALTIMER_CMSDK_AHB_
+#ifndef ZEPHYR_DRIVERS_COUNTER_DUALTIMER_CMSDK_APB_H_
+#define ZEPHYR_DRIVERS_COUNTER_DUALTIMER_CMSDK_APB_H_
 
 #include <counter.h>
 
@@ -65,4 +65,4 @@ struct dualtimer_cmsdk_apb {
 }
 #endif
 
-#endif /* _DRIVERS_DUALTIMER_CMSDK_AHB_ */
+#endif /* ZEPHYR_DRIVERS_COUNTER_DUALTIMER_CMSDK_APB_H_ */
diff --git a/drivers/counter/timer_cmsdk_apb.h b/drivers/counter/timer_cmsdk_apb.h
index 4a94fcc2b79..e7e7e56c449 100644
--- a/drivers/counter/timer_cmsdk_apb.h
+++ b/drivers/counter/timer_cmsdk_apb.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _DRIVERS_TIMER_CMSDK_AHB_
-#define _DRIVERS_TIMER_CMSDK_AHB_
+#ifndef ZEPHYR_DRIVERS_COUNTER_TIMER_CMSDK_APB_H_
+#define ZEPHYR_DRIVERS_COUNTER_TIMER_CMSDK_APB_H_
 
 #include <counter.h>
 
@@ -37,4 +37,4 @@ struct timer_cmsdk_apb {
 }
 #endif
 
-#endif /* _DRIVERS_TIMER_CMSDK_AHB_ */
+#endif /* ZEPHYR_DRIVERS_COUNTER_TIMER_CMSDK_APB_H_ */
diff --git a/drivers/crypto/crypto_ataes132a_priv.h b/drivers/crypto/crypto_ataes132a_priv.h
index f5a5d03573e..6f352ca215c 100644
--- a/drivers/crypto/crypto_ataes132a_priv.h
+++ b/drivers/crypto/crypto_ataes132a_priv.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef _ATAES132A_PRIV_
-#define _ATAES132A_PRIV_
+#ifndef ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_
+#define ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_
 
 #include <i2c.h>
 #include <kernel.h>
@@ -391,4 +391,4 @@ int ataes132a_aes_ecb_block(struct device *i2c_dev,
 			    u8_t key_id,
 			    struct cipher_pkt *pkt);
 
-#endif /* _ATAES132A_PRIV_ */
+#endif /* ZEPHYR_DRIVERS_CRYPTO_CRYPTO_ATAES132A_PRIV_H_ */
diff --git a/drivers/crypto/crypto_tc_shim_priv.h b/drivers/crypto/crypto_tc_shim_priv.h
index c0e3b2f90bd..9ca0958e68d 100644
--- a/drivers/crypto/crypto_tc_shim_priv.h
+++ b/drivers/crypto/crypto_tc_shim_priv.h
@@ -14,8 +14,8 @@
  * from dynamic memory allocation.
  */
 
-#ifndef __TC_SHIM_PRIV_H__
-#define __TC_SHIM_PRIV_H__
+#ifndef ZEPHYR_DRIVERS_CRYPTO_CRYPTO_TC_SHIM_PRIV_H_
+#define ZEPHYR_DRIVERS_CRYPTO_CRYPTO_TC_SHIM_PRIV_H_
 
 #include <tinycrypt/aes.h>
 
@@ -24,4 +24,4 @@ struct tc_shim_drv_state {
 	struct tc_aes_key_sched_struct session_key;
 };
 
-#endif  /* __TC_SHIM_PRIV_H__ */
+#endif  /* ZEPHYR_DRIVERS_CRYPTO_CRYPTO_TC_SHIM_PRIV_H_ */
diff --git a/drivers/display/display_ili9340.h b/drivers/display/display_ili9340.h
index 0f02e33dbc3..9182d0b7c67 100644
--- a/drivers/display/display_ili9340.h
+++ b/drivers/display/display_ili9340.h
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef DISPLAY_ILI9340_H
-#define DISPLAY_ILI9340_H
+#ifndef ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9340_H_
+#define ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9340_H_
 
 #include <zephyr.h>
 
@@ -60,4 +60,4 @@ void ili9340_transmit(struct ili9340_data *data, u8_t cmd, void *tx_data,
  */
 void ili9340_lcd_init(struct ili9340_data *data);
 
-#endif /* DISPLAY_ILI9340_H */
+#endif /* ZEPHYR_DRIVERS_DISPLAY_DISPLAY_ILI9340_H_ */
diff --git a/drivers/dma/dma_cavs.h b/drivers/dma/dma_cavs.h
index 119c8b35f24..b4cb4fd6163 100644
--- a/drivers/dma/dma_cavs.h
+++ b/drivers/dma/dma_cavs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _DMA_CAVS_H_
-#define _DMA_CAVS_H_
+#ifndef ZEPHYR_DRIVERS_DMA_DMA_CAVS_H_
+#define ZEPHYR_DRIVERS_DMA_DMA_CAVS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -130,4 +130,4 @@ struct dw_dma_dev_cfg {
 }
 #endif
 
-#endif /* _DMA_CAVS_H_ */
+#endif /* ZEPHYR_DRIVERS_DMA_DMA_CAVS_H_ */
diff --git a/drivers/dma/dma_sam_xdmac.h b/drivers/dma/dma_sam_xdmac.h
index ef78b1bcd08..9562f0c7525 100644
--- a/drivers/dma/dma_sam_xdmac.h
+++ b/drivers/dma/dma_sam_xdmac.h
@@ -8,8 +8,8 @@
  * @brief Atmel SAM MCU family Direct Memory Access (XDMAC) driver.
  */
 
-#ifndef _DMA_SAM_XDMAC_H_
-#define _DMA_SAM_XDMAC_H_
+#ifndef ZEPHYR_DRIVERS_DMA_DMA_SAM_XDMAC_H_
+#define ZEPHYR_DRIVERS_DMA_DMA_SAM_XDMAC_H_
 
 #include <stdint.h>
 
@@ -129,4 +129,4 @@ struct sam_xdmac_linked_list_desc_view3 {
 }
 #endif
 
-#endif /* _DMA_SAM_XDMAC_H_ */
+#endif /* ZEPHYR_DRIVERS_DMA_DMA_SAM_XDMAC_H_ */
diff --git a/drivers/ethernet/eth_dw_priv.h b/drivers/ethernet/eth_dw_priv.h
index c71d8e949be..7986b0bd003 100644
--- a/drivers/ethernet/eth_dw_priv.h
+++ b/drivers/ethernet/eth_dw_priv.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef DRIVERS_ETHERNET_ETH_DW_PRIV_H_
-#define DRIVERS_ETHERNET_ETH_DW_PRIV_H_
+#ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_DW_PRIV_H_
+#define ZEPHYR_DRIVERS_ETHERNET_ETH_DW_PRIV_H_
 
 #ifdef CONFIG_PCI
 #include <pci/pci.h>
@@ -207,4 +207,4 @@ struct eth_runtime {
 }
 #endif
 
-#endif /* DRIVERS_ETHERNET_ETH_DW_PRIV_H_ */
+#endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_DW_PRIV_H_ */
diff --git a/drivers/ethernet/eth_native_posix_priv.h b/drivers/ethernet/eth_native_posix_priv.h
index cebcc88b28a..929feeb9d62 100644
--- a/drivers/ethernet/eth_native_posix_priv.h
+++ b/drivers/ethernet/eth_native_posix_priv.h
@@ -8,8 +8,8 @@
  * @brief Private functions for native posix ethernet driver.
  */
 
-#ifndef _ETH_NATIVE_POSIX_PRIV_H
-#define _ETH_NATIVE_POSIX_PRIV_H
+#ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_POSIX_PRIV_H_
+#define ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_POSIX_PRIV_H_
 
 int eth_iface_create(const char *if_name, bool tun_only);
 int eth_iface_remove(int fd);
@@ -37,4 +37,4 @@ static inline int eth_promisc_mode(const char *if_name, bool enable)
 }
 #endif
 
-#endif /* _ETH_NATIVE_POSIX_PRIV_H */
+#endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_NATIVE_POSIX_PRIV_H_ */
diff --git a/drivers/ethernet/eth_sam_gmac_priv.h b/drivers/ethernet/eth_sam_gmac_priv.h
index f6025701aff..f3c538d70b2 100644
--- a/drivers/ethernet/eth_sam_gmac_priv.h
+++ b/drivers/ethernet/eth_sam_gmac_priv.h
@@ -7,8 +7,8 @@
  * @brief Atmel SAM MCU family Ethernet MAC (GMAC) driver.
  */
 
-#ifndef _ETH_SAM_GMAC_PRIV_H_
-#define _ETH_SAM_GMAC_PRIV_H_
+#ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_SAM_GMAC_PRIV_H_
+#define ZEPHYR_DRIVERS_ETHERNET_ETH_SAM_GMAC_PRIV_H_
 
 #include <zephyr/types.h>
 
@@ -209,4 +209,4 @@ struct eth_sam_dev_data {
 #define DEV_DATA(dev) \
 	((struct eth_sam_dev_data *const)(dev)->driver_data)
 
-#endif /* _ETH_SAM_GMAC_PRIV_H_ */
+#endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_SAM_GMAC_PRIV_H_ */
diff --git a/drivers/ethernet/eth_stm32_hal_priv.h b/drivers/ethernet/eth_stm32_hal_priv.h
index 806380f4b0f..24f6f26a59e 100644
--- a/drivers/ethernet/eth_stm32_hal_priv.h
+++ b/drivers/ethernet/eth_stm32_hal_priv.h
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ETH_STM32_HAL_PRIV_H_
-#define _ETH_STM32_HAL_PRIV_H_
+#ifndef ZEPHYR_DRIVERS_ETHERNET_ETH_STM32_HAL_PRIV_H_
+#define ZEPHYR_DRIVERS_ETHERNET_ETH_STM32_HAL_PRIV_H_
 
 #include <kernel.h>
 #include <zephyr/types.h>
@@ -44,5 +44,5 @@ struct eth_stm32_hal_dev_data {
 #define DEV_DATA(dev) \
 	((struct eth_stm32_hal_dev_data *)(dev)->driver_data)
 
-#endif /* _ETH_STM32_HAL_PRIV_H_ */
+#endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_STM32_HAL_PRIV_H_ */
 
diff --git a/drivers/ethernet/phy_sam_gmac.h b/drivers/ethernet/phy_sam_gmac.h
index 640edb54b0f..2ed7be9df8d 100644
--- a/drivers/ethernet/phy_sam_gmac.h
+++ b/drivers/ethernet/phy_sam_gmac.h
@@ -7,8 +7,8 @@
  * @brief Atmel SAM MCU family Ethernet PHY (GMAC) driver.
  */
 
-#ifndef _PHY_SAM_GMAC_H_
-#define _PHY_SAM_GMAC_H_
+#ifndef ZEPHYR_DRIVERS_ETHERNET_PHY_SAM_GMAC_H_
+#define ZEPHYR_DRIVERS_ETHERNET_PHY_SAM_GMAC_H_
 
 #include <zephyr/types.h>
 #include <soc.h>
@@ -57,4 +57,4 @@ u32_t phy_sam_gmac_id_get(const struct phy_sam_gmac_dev *phy);
 }
 #endif
 
-#endif /* _PHY_SAM_GMAC_H_ */
+#endif /* ZEPHYR_DRIVERS_ETHERNET_PHY_SAM_GMAC_H_ */
diff --git a/drivers/flash/flash_priv.h b/drivers/flash/flash_priv.h
index a925db4b5f2..c6b66312875 100644
--- a/drivers/flash/flash_priv.h
+++ b/drivers/flash/flash_priv.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __FLASH_PRIV_H__
-#define __FLASH_PRIV_H__
+#ifndef ZEPHYR_DRIVERS_FLASH_FLASH_PRIV_H_
+#define ZEPHYR_DRIVERS_FLASH_FLASH_PRIV_H_
 
 #if defined(CONFIG_FLASH_PAGE_LAYOUT)
 static inline void flash_page_layout_not_implemented(void)
diff --git a/drivers/flash/flash_stm32.h b/drivers/flash/flash_stm32.h
index 458782a5bff..4f7cb45bc00 100644
--- a/drivers/flash/flash_stm32.h
+++ b/drivers/flash/flash_stm32.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef DRIVERS_FLASH_STM32_H
-#define DRIVERS_FLASH_STM32_H
+#ifndef ZEPHYR_DRIVERS_FLASH_FLASH_STM32_H_
+#define ZEPHYR_DRIVERS_FLASH_FLASH_STM32_H_
 
 #include <flash_registers.h>
 
@@ -63,4 +63,4 @@ void flash_stm32_page_layout(struct device *dev,
 			     size_t *layout_size);
 #endif
 
-#endif /* DRIVERS_FLASH_STM32_H */
+#endif /* ZEPHYR_DRIVERS_FLASH_FLASH_STM32_H_ */
diff --git a/drivers/flash/flash_stm32f3x.h b/drivers/flash/flash_stm32f3x.h
index 496773ce51a..e5a17884f3f 100644
--- a/drivers/flash/flash_stm32f3x.h
+++ b/drivers/flash/flash_stm32f3x.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef DRIVERS_FLASH_FLASH_STM32_H_
-#define DRIVERS_FLASH_FLASH_STM32_H_
+#ifndef ZEPHYR_DRIVERS_FLASH_FLASH_STM32F3X_H_
+#define ZEPHYR_DRIVERS_FLASH_FLASH_STM32F3X_H_
 
 #include <soc.h>
 #include <flash.h>
@@ -63,4 +63,4 @@ u8_t flash_stm32_erase_page(struct device *flash,
 
 u8_t flash_stm32_erase_all_pages(struct device *flash);
 
-#endif /* DRIVERS_FLASH_FLASH_STM32_H_ */
+#endif /* ZEPHYR_DRIVERS_FLASH_FLASH_STM32F3X_H_ */
diff --git a/drivers/flash/spi_flash_w25qxxdv.h b/drivers/flash/spi_flash_w25qxxdv.h
index 411c777ebe2..e8485b5af40 100644
--- a/drivers/flash/spi_flash_w25qxxdv.h
+++ b/drivers/flash/spi_flash_w25qxxdv.h
@@ -10,8 +10,8 @@
  * @brief This file defines the private data structures for spi flash driver
  */
 
-#ifndef __SPI_FLASH_W25QXXDV_H__
-#define __SPI_FLASH_W25QXXDV_H__
+#ifndef ZEPHYR_DRIVERS_FLASH_SPI_FLASH_W25QXXDV_H_
+#define ZEPHYR_DRIVERS_FLASH_SPI_FLASH_W25QXXDV_H_
 
 
 struct spi_flash_data {
@@ -26,4 +26,4 @@ struct spi_flash_data {
 };
 
 
-#endif /* __SPI_FLASH_W25QXXDV_H__ */
+#endif /* ZEPHYR_DRIVERS_FLASH_SPI_FLASH_W25QXXDV_H_ */
diff --git a/drivers/flash/spi_flash_w25qxxdv_defs.h b/drivers/flash/spi_flash_w25qxxdv_defs.h
index 436c3bec931..3c25e474df1 100644
--- a/drivers/flash/spi_flash_w25qxxdv_defs.h
+++ b/drivers/flash/spi_flash_w25qxxdv_defs.h
@@ -10,8 +10,8 @@
  * @brief This file has the WinBond SPI flash private definitions
  */
 
-#ifndef __SPI_FLASH_W25QXXDV_DEFS_H__
-#define __SPI_FLASH_W25QXXDV_DEFS_H__
+#ifndef ZEPHYR_DRIVERS_FLASH_SPI_FLASH_W25QXXDV_DEFS_H_
+#define ZEPHYR_DRIVERS_FLASH_SPI_FLASH_W25QXXDV_DEFS_H_
 
 /* Status Registers
  *    S7     S6     S5     S4     S3     S2     S1     S0
@@ -115,4 +115,4 @@
 
 #define W25QXXDV_CMD_NOP         0x00
 
-#endif /*__SPI_FLASH_W25QXXDV_DEFS_H__*/
+#endif /*ZEPHYR_DRIVERS_FLASH_SPI_FLASH_W25QXXDV_DEFS_H_*/
diff --git a/drivers/gpio/gpio_cmsdk_ahb.h b/drivers/gpio/gpio_cmsdk_ahb.h
index be0fb1fa874..a3177c52d6c 100644
--- a/drivers/gpio/gpio_cmsdk_ahb.h
+++ b/drivers/gpio/gpio_cmsdk_ahb.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _DRIVERS_GPIO_CMSDK_AHB_
-#define _DRIVERS_GPIO_CMSDK_AHB_
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
 
 #include <gpio.h>
 
@@ -56,4 +56,4 @@ struct gpio_cmsdk_ahb {
 }
 #endif
 
-#endif /* _DRIVERS_GPIO_CMSDK_AHB_ */
+#endif /* ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_ */
diff --git a/drivers/gpio/gpio_dw.h b/drivers/gpio/gpio_dw.h
index 51c004bd49f..0ec622f5447 100644
--- a/drivers/gpio/gpio_dw.h
+++ b/drivers/gpio/gpio_dw.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _GPIO_DW_H_
-#define _GPIO_DW_H_
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_DW_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_DW_H_
 
 #include <zephyr/types.h>
 #include <gpio.h>
@@ -55,4 +55,4 @@ struct gpio_dw_runtime {
 }
 #endif
 
-#endif /* _GPIO_DW_H_ */
+#endif /* ZEPHYR_DRIVERS_GPIO_GPIO_DW_H_ */
diff --git a/drivers/gpio/gpio_dw_registers.h b/drivers/gpio/gpio_dw_registers.h
index 0a2a6d40493..4eb6c79ccf1 100644
--- a/drivers/gpio/gpio_dw_registers.h
+++ b/drivers/gpio/gpio_dw_registers.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _GPIO_DW_REGISTERS_H_
-#define _GPIO_DW_REGISTERS_H_
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_DW_REGISTERS_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_DW_REGISTERS_H_
 
 #ifdef CONFIG_SOC_QUARK_SE_C1000_SS
 #define SWPORTA_DR     0x00
@@ -61,4 +61,4 @@
 
 #define LS_SYNC_POS	(0)
 
-#endif /* _GPIO_DW_REGISTERS_H_ */
+#endif /* ZEPHYR_DRIVERS_GPIO_GPIO_DW_REGISTERS_H_ */
diff --git a/drivers/gpio/gpio_pcal9535a.h b/drivers/gpio/gpio_pcal9535a.h
index 30c36a0d5fd..7c37e737f13 100644
--- a/drivers/gpio/gpio_pcal9535a.h
+++ b/drivers/gpio/gpio_pcal9535a.h
@@ -8,8 +8,8 @@
  * @file Header file for the PCAL9535A driver.
  */
 
-#ifndef _GPIO_PCAL9535A_H_
-#define _GPIO_PCAL9535A_H_
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_PCAL9535A_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_PCAL9535A_H_
 
 #include <kernel.h>
 
@@ -64,4 +64,4 @@ struct gpio_pcal9535a_drv_data {
 }
 #endif
 
-#endif /* _GPIO_PCAL9535A_H_ */
+#endif /* ZEPHYR_DRIVERS_GPIO_GPIO_PCAL9535A_H_ */
diff --git a/drivers/gpio/gpio_sch.h b/drivers/gpio/gpio_sch.h
index 602084050ca..c516e3371ca 100644
--- a/drivers/gpio/gpio_sch.h
+++ b/drivers/gpio/gpio_sch.h
@@ -7,8 +7,8 @@
  */
 
 
-#ifndef __GPIO_SCH_H__
-#define __GPIO_SCH_H__
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_SCH_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_SCH_H_
 
 #include <zephyr/types.h>
 #include <kernel.h>
@@ -48,4 +48,4 @@ struct gpio_sch_data {
 	u8_t stride[3];
 };
 
-#endif /* __GPIO_SCH_H__ */
+#endif /* ZEPHYR_DRIVERS_GPIO_GPIO_SCH_H_ */
diff --git a/drivers/gpio/gpio_stm32.h b/drivers/gpio/gpio_stm32.h
index 8180abf105a..d82ed16a313 100644
--- a/drivers/gpio/gpio_stm32.h
+++ b/drivers/gpio/gpio_stm32.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32_GPIO_H_
-#define _STM32_GPIO_H_
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_STM32_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_STM32_H_
 
 /**
  * @file header for STM32 GPIO
@@ -170,5 +170,5 @@ int stm32_gpio_get(u32_t *base, int pin);
  */
 int stm32_gpio_enable_int(int port, int pin);
 
-#endif /* _STM32_GPIO_H_ */
+#endif /* ZEPHYR_DRIVERS_GPIO_GPIO_STM32_H_ */
 
diff --git a/drivers/gpio/gpio_utils.h b/drivers/gpio/gpio_utils.h
index a2521471a47..5671c361994 100644
--- a/drivers/gpio/gpio_utils.h
+++ b/drivers/gpio/gpio_utils.h
@@ -8,8 +8,8 @@
  * @file Header where utility code can be found for GPIO drivers
  */
 
-#ifndef __GPIO_UTILS_H__
-#define __GPIO_UTILS_H__
+#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_UTILS_H_
+#define ZEPHYR_DRIVERS_GPIO_GPIO_UTILS_H_
 
 
 /**
@@ -54,4 +54,4 @@ static inline void _gpio_fire_callbacks(sys_slist_t *list,
 	}
 }
 
-#endif /* __GPIO_UTILS_H__ */
+#endif /* ZEPHYR_DRIVERS_GPIO_GPIO_UTILS_H_ */
diff --git a/drivers/i2c/i2c-priv.h b/drivers/i2c/i2c-priv.h
index b306907aad2..a05db45212a 100644
--- a/drivers/i2c/i2c-priv.h
+++ b/drivers/i2c/i2c-priv.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _I2C_PRIV_H_
-#define _I2C_PRIV_H_
+#ifndef ZEPHYR_DRIVERS_I2C_I2C_PRIV_H_
+#define ZEPHYR_DRIVERS_I2C_I2C_PRIV_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,4 +43,4 @@ static inline u32_t _i2c_map_dt_bitrate(u32_t bitrate)
 }
 #endif
 
-#endif /* _I2C_PRIV_H_ */
+#endif /* ZEPHYR_DRIVERS_I2C_I2C_PRIV_H_ */
diff --git a/drivers/i2c/i2c_dw.h b/drivers/i2c/i2c_dw.h
index ae3a8412316..48fd7ab335a 100644
--- a/drivers/i2c/i2c_dw.h
+++ b/drivers/i2c/i2c_dw.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __DRIVERS_I2C_DW_H
-#define __DRIVERS_I2C_DW_H
+#ifndef ZEPHYR_DRIVERS_I2C_I2C_DW_H_
+#define ZEPHYR_DRIVERS_I2C_I2C_DW_H_
 
 #include <i2c.h>
 #include <stdbool.h>
@@ -121,4 +121,4 @@ struct i2c_dw_dev_config {
 }
 #endif
 
-#endif /* __DRIVERS_I2C_DW_H */
+#endif /* ZEPHYR_DRIVERS_I2C_I2C_DW_H_ */
diff --git a/drivers/i2c/i2c_dw_registers.h b/drivers/i2c/i2c_dw_registers.h
index 8a34fb99685..0e537d169a7 100644
--- a/drivers/i2c/i2c_dw_registers.h
+++ b/drivers/i2c/i2c_dw_registers.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __DRIVERS_I2C_DW_REGISTERS_H
-#define __DRIVERS_I2C_DW_REGISTERS_H
+#ifndef ZEPHYR_DRIVERS_I2C_I2C_DW_REGISTERS_H_
+#define ZEPHYR_DRIVERS_I2C_I2C_DW_REGISTERS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -257,4 +257,4 @@ struct i2c_dw_registers {
 }
 #endif
 
-#endif /* __DRIVERS_I2C_DW_REGISTERS_H */
+#endif /* ZEPHYR_DRIVERS_I2C_I2C_DW_REGISTERS_H_ */
diff --git a/drivers/i2c/i2c_ll_stm32.h b/drivers/i2c/i2c_ll_stm32.h
index 2a184d9ab55..528064f56d9 100644
--- a/drivers/i2c/i2c_ll_stm32.h
+++ b/drivers/i2c/i2c_ll_stm32.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef _STM32_I2C_H_
-#define _STM32_I2C_H_
+#ifndef ZEPHYR_DRIVERS_I2C_I2C_LL_STM32_H_
+#define ZEPHYR_DRIVERS_I2C_I2C_LL_STM32_H_
 
 typedef void (*irq_config_func_t)(struct device *port);
 
@@ -72,4 +72,4 @@ int i2c_stm32_slave_unregister(struct device *dev,
 #define DEV_CFG(dev)	\
 ((const struct i2c_stm32_config * const)(dev)->config->config_info)
 
-#endif	/* _STM32_I2C_H_ */
+#endif	/* ZEPHYR_DRIVERS_I2C_I2C_LL_STM32_H_ */
diff --git a/drivers/i2s/i2s_cavs.h b/drivers/i2s/i2s_cavs.h
index f8b5898e541..1a93d8264db 100644
--- a/drivers/i2s/i2s_cavs.h
+++ b/drivers/i2s/i2s_cavs.h
@@ -12,8 +12,8 @@
  *   enabled) and "interrupt on full transfer completion" mode.
  */
 
-#ifndef _I2S_CAVS_H_
-#define _I2S_CAVS_H_
+#ifndef ZEPHYR_DRIVERS_I2S_I2S_CAVS_H_
+#define ZEPHYR_DRIVERS_I2S_I2S_CAVS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -143,4 +143,4 @@ struct i2s_cavs_mn_div {
 }
 #endif
 
-#endif /* _I2S_CAVS_H_ */
+#endif /* ZEPHYR_DRIVERS_I2S_I2S_CAVS_H_ */
diff --git a/drivers/ieee802154/ieee802154_cc1200.h b/drivers/ieee802154/ieee802154_cc1200.h
index 8b799f5d102..4360aa81485 100644
--- a/drivers/ieee802154/ieee802154_cc1200.h
+++ b/drivers/ieee802154/ieee802154_cc1200.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IEEE802154_CC1200_H__
-#define __IEEE802154_CC1200_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_H_
 
 #include <linker/sections.h>
 #include <atomic.h>
@@ -128,4 +128,4 @@ DEFINE_STROBE_INSTRUCTION(sftx, CC1200_INS_SFTX)
 DEFINE_STROBE_INSTRUCTION(sworrst, CC1200_INS_SWORRST)
 DEFINE_STROBE_INSTRUCTION(snop, CC1200_INS_SNOP)
 
-#endif /* __IEEE802154_CC1200_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_H_ */
diff --git a/drivers/ieee802154/ieee802154_cc1200_regs.h b/drivers/ieee802154/ieee802154_cc1200_regs.h
index 61636827ced..8dba939ca43 100644
--- a/drivers/ieee802154/ieee802154_cc1200_regs.h
+++ b/drivers/ieee802154/ieee802154_cc1200_regs.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IEEE802154_CC1200_REGS_H__
-#define __IEEE802154_CC1200_REGS_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_REGS_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_REGS_H_
 
 /* Access types (see Section 3.2) */
 
@@ -521,4 +521,4 @@
 /* ToDo: supporting 802.15.4g will make this header of a different size */
 #define CC1200_PHY_HDR_LEN			(1)
 
-#endif /* __IEEE802154_CC1200_REGS_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_REGS_H_ */
diff --git a/drivers/ieee802154/ieee802154_cc1200_rf.h b/drivers/ieee802154/ieee802154_cc1200_rf.h
index 69758f81e7f..ded906f66f6 100644
--- a/drivers/ieee802154/ieee802154_cc1200_rf.h
+++ b/drivers/ieee802154/ieee802154_cc1200_rf.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IEEE802154_CC1200_RF_H__
-#define __IEEE802154_CC1200_RF_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_RF_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_RF_H_
 
 #include <ieee802154/cc1200.h>
 
@@ -355,4 +355,4 @@ const struct cc1200_rf_registers_set cc1200_rf_settings = {
 
 #endif /* CONFIG_IEEE802154_CC1200_RF_PRESET */
 
-#endif /* __IEEE802154_CC1200_RF_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC1200_RF_H_ */
diff --git a/drivers/ieee802154/ieee802154_cc2520.h b/drivers/ieee802154/ieee802154_cc2520.h
index 69ab871b202..14f128472f2 100644
--- a/drivers/ieee802154/ieee802154_cc2520.h
+++ b/drivers/ieee802154/ieee802154_cc2520.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IEEE802154_CC2520_H__
-#define __IEEE802154_CC2520_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_H_
 
 #include <linker/sections.h>
 #include <atomic.h>
@@ -189,4 +189,4 @@ DEFINE_STROBE_INSTRUCTION(sxoscoff, CC2520_INS_SXOSCOFF)
 
 DEFINE_STROBE_SNOP_INSTRUCTION(sxoscon, CC2520_INS_SXOSCON)
 
-#endif /* __IEEE802154_CC2520_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_H_ */
diff --git a/drivers/ieee802154/ieee802154_cc2520_regs.h b/drivers/ieee802154/ieee802154_cc2520_regs.h
index 6a67bde73f4..bd269582ad7 100644
--- a/drivers/ieee802154/ieee802154_cc2520_regs.h
+++ b/drivers/ieee802154/ieee802154_cc2520_regs.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IEEE802154_CC2520_REGS_H__
-#define __IEEE802154_CC2520_REGS_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_REGS_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_REGS_H_
 
 /* Instructions (see chapter 13) */
 #define CC2520_INS_SNOP				(0x00)
@@ -349,4 +349,4 @@
 #define CC2520_FCS_CRC_OK			(0x80)
 #define CC2520_FCS_CORRELATION			(0x7f)
 
-#endif /* __IEEE802154_CC2520_REGS_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_CC2520_REGS_H_ */
diff --git a/drivers/ieee802154/ieee802154_mcr20a.h b/drivers/ieee802154/ieee802154_mcr20a.h
index 6801b4fd5d4..d0c19c2f79a 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.h
+++ b/drivers/ieee802154/ieee802154_mcr20a.h
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IEEE802154_MCR20A_H__
-#define __IEEE802154_MCR20A_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_H_
 
 #include <linker/sections.h>
 #include <atomic.h>
@@ -179,4 +179,4 @@ DEFINE_BURST_WRITE(ext_addr, MCR20A_MACLONGADDRS0_0, 8, false)
 DEFINE_BURST_READ(event_timer, MCR20A_EVENT_TIMER_LSB, 3, true)
 DEFINE_BURST_READ(irqsts1_ctrl4, MCR20A_IRQSTS1, 8, true)
 
-#endif /* __IEEE802154_MCR20A_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_H_ */
diff --git a/drivers/ieee802154/ieee802154_mcr20a_regs.h b/drivers/ieee802154/ieee802154_mcr20a_regs.h
index 2e5b5197b25..a3e68dbf9d2 100644
--- a/drivers/ieee802154/ieee802154_mcr20a_regs.h
+++ b/drivers/ieee802154/ieee802154_mcr20a_regs.h
@@ -41,8 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __IEEE802154_MCR20A_REGS_H__
-#define __IEEE802154_MCR20A_REGS_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_REGS_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_REGS_H_
 
 #define MCR20A_REG_READ			(BIT(7))
 #define MCR20A_BUF_READ			(BIT(7) | BIT(6))
@@ -587,4 +587,4 @@
 #define MCR20A_TX_MODE_CTRL_DTS0			BIT(0)
 #define MCR20A_TX_MODE_CTRL_DTS_MASK			(7)
 
-#endif /* __IEEE802154_MCR20A_REGS_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_MCR20A_REGS_H_ */
diff --git a/drivers/ieee802154/ieee802154_nrf5.h b/drivers/ieee802154/ieee802154_nrf5.h
index 7ce661047b2..e0f4f54011c 100644
--- a/drivers/ieee802154/ieee802154_nrf5.h
+++ b/drivers/ieee802154/ieee802154_nrf5.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __IEEE802154_NRF5_H__
-#define __IEEE802154_NRF5_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_NRF5_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_NRF5_H_
 
 #include <linker/sections.h>
 #include <atomic.h>
@@ -58,4 +58,4 @@ struct nrf5_802154_data {
 	s8_t rssi;
 };
 
-#endif /* __IEEE802154_NRF5_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_NRF5_H_ */
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.h b/drivers/ieee802154/ieee802154_uart_pipe.h
index f1eaa17751a..be9b7932d8a 100644
--- a/drivers/ieee802154/ieee802154_uart_pipe.h
+++ b/drivers/ieee802154/ieee802154_uart_pipe.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IEEE802154_UART_PIPE_H__
-#define __IEEE802154_UART_PIPE_H__
+#ifndef ZEPHYR_DRIVERS_IEEE802154_IEEE802154_UART_PIPE_H_
+#define ZEPHYR_DRIVERS_IEEE802154_IEEE802154_UART_PIPE_H_
 
 #define UART_PIPE_RADIO_15_4_FRAME_TYPE		0xF0
 
@@ -23,4 +23,4 @@ struct upipe_context {
 	u8_t rx_buf[127];
 };
 
-#endif /* __IEEE802154_UART_PIPE_H__ */
+#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_UART_PIPE_H_ */
diff --git a/drivers/interrupt_controller/cavs_ictl.h b/drivers/interrupt_controller/cavs_ictl.h
index 4913c612d98..d41b1f05a61 100644
--- a/drivers/interrupt_controller/cavs_ictl.h
+++ b/drivers/interrupt_controller/cavs_ictl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _CAVS_ICTL_H_
-#define _CAVS_ICTL_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_CAVS_ICTL_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_CAVS_ICTL_H_
 
 #include <zephyr/types.h>
 
@@ -36,4 +36,4 @@ struct cavs_registers {
 }
 #endif
 
-#endif /* _CAVS_ICTL_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_CAVS_ICTL_H_ */
diff --git a/drivers/interrupt_controller/dw_ictl.h b/drivers/interrupt_controller/dw_ictl.h
index b7ef6f420f0..0155c08e49e 100644
--- a/drivers/interrupt_controller/dw_ictl.h
+++ b/drivers/interrupt_controller/dw_ictl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _DW_ICTL_H_
-#define _DW_ICTL_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_DW_ICTL_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_DW_ICTL_H_
 
 #include <zephyr/types.h>
 
@@ -91,4 +91,4 @@ struct dw_ictl_registers {
 }
 #endif
 
-#endif /* _DW_ICTL_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_DW_ICTL_H_ */
diff --git a/drivers/interrupt_controller/exti_stm32.h b/drivers/interrupt_controller/exti_stm32.h
index f176965aba8..48bc3283fe7 100644
--- a/drivers/interrupt_controller/exti_stm32.h
+++ b/drivers/interrupt_controller/exti_stm32.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef _STM32_EXTI_H_
-#define _STM32_EXTI_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_EXTI_STM32_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_EXTI_STM32_H_
 
 #include <zephyr/types.h>
 
@@ -77,4 +77,4 @@ void stm32_exti_set_callback(int line, stm32_exti_callback_t cb, void *data);
  */
 void stm32_exti_unset_callback(int line);
 
-#endif /* _STM32_EXTI_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_EXTI_STM32_H_ */
diff --git a/drivers/interrupt_controller/ioapic_priv.h b/drivers/interrupt_controller/ioapic_priv.h
index 24ab2b0b858..0b5456edb4e 100644
--- a/drivers/interrupt_controller/ioapic_priv.h
+++ b/drivers/interrupt_controller/ioapic_priv.h
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INCioapic_privh
-#define __INCioapic_privh
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_IOAPIC_PRIV_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_IOAPIC_PRIV_H_
 
 /* IO APIC direct register offsets */
 
diff --git a/drivers/interrupt_controller/plic.h b/drivers/interrupt_controller/plic.h
index 27b210e7262..7ac1d43ca67 100644
--- a/drivers/interrupt_controller/plic.h
+++ b/drivers/interrupt_controller/plic.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __PLIC_H_
-#define __PLIC_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_PLIC_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_PLIC_H_
 
 #include <soc.h>
 
diff --git a/drivers/ipm/ipm_quark_se.h b/drivers/ipm/ipm_quark_se.h
index 132cf4d9a2a..dfeef167ef7 100644
--- a/drivers/ipm/ipm_quark_se.h
+++ b/drivers/ipm/ipm_quark_se.h
@@ -7,8 +7,8 @@
  */
 
 
-#ifndef __INCquark_se_mailboxh
-#define __INCquark_se_mailboxh
+#ifndef ZEPHYR_DRIVERS_IPM_IPM_QUARK_SE_H_
+#define ZEPHYR_DRIVERS_IPM_IPM_QUARK_SE_H_
 
 #include <kernel.h>
 #include <board.h> /* for SCSS_REGISTER_BASE */
@@ -128,4 +128,4 @@ int quark_se_ipm_controller_initialize(struct device *d);
 }
 #endif
 
-#endif /* __INCquark_se_mailboxh */
+#endif /* ZEPHYR_DRIVERS_IPM_IPM_QUARK_SE_H_ */
diff --git a/drivers/led/led_context.h b/drivers/led/led_context.h
index f1256abf695..77800ab47d0 100644
--- a/drivers/led/led_context.h
+++ b/drivers/led/led_context.h
@@ -9,8 +9,8 @@
  * @brief Private LED driver APIs
  */
 
-#ifndef __LED_CONTEXT_H__
-#define __LED_CONTEXT_H__
+#ifndef ZEPHYR_DRIVERS_LED_LED_CONTEXT_H_
+#define ZEPHYR_DRIVERS_LED_LED_CONTEXT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,4 +35,4 @@ struct led_data {
 }
 #endif
 
-#endif /* __LED_CONTEXT_H__ */
+#endif /* ZEPHYR_DRIVERS_LED_LED_CONTEXT_H_ */
diff --git a/drivers/pinmux/pinmux.h b/drivers/pinmux/pinmux.h
index 6be38909a26..f0f79f59fd7 100644
--- a/drivers/pinmux/pinmux.h
+++ b/drivers/pinmux/pinmux.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __DRIVERS_PINMUX_H
-#define __DRIVERS_PINMUX_H
+#ifndef ZEPHYR_DRIVERS_PINMUX_PINMUX_H_
+#define ZEPHYR_DRIVERS_PINMUX_PINMUX_H_
 
 #include <zephyr/types.h>
 #include <device.h>
@@ -28,4 +28,4 @@ struct pinmux_config {
 }
 #endif
 
-#endif /* __DRIVERS_PINMUX_H */
+#endif /* ZEPHYR_DRIVERS_PINMUX_PINMUX_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32.h b/drivers/pinmux/stm32/pinmux_stm32.h
index 737a9301937..1d2d78c9fff 100644
--- a/drivers/pinmux/stm32/pinmux_stm32.h
+++ b/drivers/pinmux/stm32/pinmux_stm32.h
@@ -8,8 +8,8 @@
  * @file header for STM32 pin multiplexing
  */
 
-#ifndef _STM32_PINMUX_H_
-#define _STM32_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32_H_
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -117,4 +117,4 @@ void stm32_setup_pins(const struct pin_config *pinconf,
 #include "pinmux_stm32l4x.h"
 #endif
 
-#endif	/* _STM32_PINMUX_H_ */
+#endif	/* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32f0.h b/drivers/pinmux/stm32/pinmux_stm32f0.h
index b0cfb3c4e9b..4d40c58c939 100644
--- a/drivers/pinmux/stm32/pinmux_stm32f0.h
+++ b/drivers/pinmux/stm32/pinmux_stm32f0.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32F0_PINMUX_H_
-#define _STM32F0_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F0_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F0_H_
 
 /**
  * @file Header for STM32F0 pin multiplexing helper
@@ -97,4 +97,4 @@
 #define STM32F0_PINMUX_FUNC_PD1_CAN_TX \
 	(STM32_PINMUX_ALT_FUNC_0 | STM32_PUSHPULL_NOPULL)
 
-#endif /* _STM32F0_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F0_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32f1.h b/drivers/pinmux/stm32/pinmux_stm32f1.h
index 7afaad1c18e..24d6932507c 100644
--- a/drivers/pinmux/stm32/pinmux_stm32f1.h
+++ b/drivers/pinmux/stm32/pinmux_stm32f1.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32F1_PINMUX_H_
-#define _STM32F1_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F1_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F1_H_
 
 /**
  * @file Header for STM32F1 pin multiplexing helper
@@ -59,4 +59,4 @@
 
 #define STM32F1_PINMUX_FUNC_PA8_PWM1_CH1	     STM32_PIN_PWM
 
-#endif /* _STM32F1_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F1_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32f2.h b/drivers/pinmux/stm32/pinmux_stm32f2.h
index 331ea417626..39b5864ec42 100644
--- a/drivers/pinmux/stm32/pinmux_stm32f2.h
+++ b/drivers/pinmux/stm32/pinmux_stm32f2.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32F2_PINMUX_H_
-#define _STM32F2_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F2_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F2_H_
 
 /**
  * @file Header for STM32F2 pin multiplexing helper
@@ -145,4 +145,4 @@
 
 /* Port H */
 
-#endif /* _STM32F2_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F2_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32f3.h b/drivers/pinmux/stm32/pinmux_stm32f3.h
index 3248ea68fa0..d4ba20b7864 100644
--- a/drivers/pinmux/stm32/pinmux_stm32f3.h
+++ b/drivers/pinmux/stm32/pinmux_stm32f3.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32F3_PINMUX_H_
-#define _STM32F3_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F3_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F3_H_
 
 /**
  * @file Header for STM32F3 pin multiplexing helper
@@ -97,4 +97,4 @@
 #define STM32F3_PINMUX_FUNC_PB15_SPI2_MOSI  \
 	(STM32_PINMUX_ALT_FUNC_5 | STM32_PUSHPULL_NOPULL)
 
-#endif /* _STM32F3_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F3_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32f4.h b/drivers/pinmux/stm32/pinmux_stm32f4.h
index 4e617d105d3..b8e3707d8b4 100644
--- a/drivers/pinmux/stm32/pinmux_stm32f4.h
+++ b/drivers/pinmux/stm32/pinmux_stm32f4.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32F4_PINMUX_H_
-#define _STM32F4_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F4_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F4_H_
 
 /**
  * @file Header for STM32F4 pin multiplexing helper
@@ -353,4 +353,4 @@
 #define STM32F4_PINMUX_FUNC_PH8_I2C3_SDA    \
 	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
 
-#endif /* _STM32F4_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F4_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32f7.h b/drivers/pinmux/stm32/pinmux_stm32f7.h
index b983121df6d..89f979ce216 100644
--- a/drivers/pinmux/stm32/pinmux_stm32f7.h
+++ b/drivers/pinmux/stm32/pinmux_stm32f7.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32F7_PINMUX_H_
-#define _STM32F7_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F7_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F7_H_
 
 /**
  * @file Header for STM32F7 pin multiplexing helper
@@ -262,4 +262,4 @@
 #define STM32F7_PINMUX_FUNC_PH8_I2C3_SDA   \
 	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
 
-#endif /* _STM32F7_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32F7_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32l0.h b/drivers/pinmux/stm32/pinmux_stm32l0.h
index 6012c424f1a..91de352e408 100644
--- a/drivers/pinmux/stm32/pinmux_stm32l0.h
+++ b/drivers/pinmux/stm32/pinmux_stm32l0.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32L0_PINMUX_H_
-#define _STM32L0_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32L0_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32L0_H_
 
 /**
  * @file Header for STM32L0 pin multiplexing helper
@@ -101,4 +101,4 @@
 #define STM32L0_PINMUX_FUNC_PC3_SPI2_MOSI \
 	(STM32_PINMUX_ALT_FUNC_2 | STM32_PUSHPULL_NOPULL)
 
-#endif /* _STM32L0_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32L0_H_ */
diff --git a/drivers/pinmux/stm32/pinmux_stm32l4x.h b/drivers/pinmux/stm32/pinmux_stm32l4x.h
index dae51dfc9fe..30cbc885729 100644
--- a/drivers/pinmux/stm32/pinmux_stm32l4x.h
+++ b/drivers/pinmux/stm32/pinmux_stm32l4x.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32L4X_PINMUX_H_
-#define _STM32L4X_PINMUX_H_
+#ifndef ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32L4X_H_
+#define ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32L4X_H_
 
 /**
  * @file Header for STM32L4X pin multiplexing helper
@@ -134,4 +134,4 @@
 #define STM32L4X_PINMUX_FUNC_PG13_I2C1_SDA  \
 	(STM32_PINMUX_ALT_FUNC_4 | STM32_OPENDRAIN_PULLUP)
 
-#endif /* _STM32L4X_PINMUX_H_ */
+#endif /* ZEPHYR_DRIVERS_PINMUX_STM32_PINMUX_STM32L4X_H_ */
diff --git a/drivers/pwm/pwm_pca9685.h b/drivers/pwm/pwm_pca9685.h
index 03b41fc25a6..540fbde402f 100644
--- a/drivers/pwm/pwm_pca9685.h
+++ b/drivers/pwm/pwm_pca9685.h
@@ -8,8 +8,8 @@
  * @file Header file for the PCA9685 PWM driver.
  */
 
-#ifndef __PWM_PCA9685_H__
-#define __PWM_PCA9685_H__
+#ifndef ZEPHYR_DRIVERS_PWM_PWM_PCA9685_H_
+#define ZEPHYR_DRIVERS_PWM_PWM_PCA9685_H_
 
 #include <gpio.h>
 #include <i2c.h>
@@ -46,4 +46,4 @@ struct pwm_pca9685_drv_data {
 }
 #endif
 
-#endif /* __PWM_PCA9685_H__ */
+#endif /* ZEPHYR_DRIVERS_PWM_PWM_PCA9685_H_ */
diff --git a/drivers/pwm/pwm_stm32.h b/drivers/pwm/pwm_stm32.h
index 6991bba8e88..7d66685a80b 100644
--- a/drivers/pwm/pwm_stm32.h
+++ b/drivers/pwm/pwm_stm32.h
@@ -8,8 +8,8 @@
  * @file Header file for the STM32 PWM driver.
  */
 
-#ifndef __PWM_STM32_H__
-#define __PWM_STM32_H__
+#ifndef ZEPHYR_DRIVERS_PWM_PWM_STM32_H_
+#define ZEPHYR_DRIVERS_PWM_PWM_STM32_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,4 +39,4 @@ struct pwm_stm32_data {
 }
 #endif
 
-#endif /* __PWM_STM32_H__ */
+#endif /* ZEPHYR_DRIVERS_PWM_PWM_STM32_H_ */
diff --git a/drivers/sensor/adt7420/adt7420.h b/drivers/sensor/adt7420/adt7420.h
index d6b24e60c67..d31f6c78927 100644
--- a/drivers/sensor/adt7420/adt7420.h
+++ b/drivers/sensor/adt7420/adt7420.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_ADT7420_H__
-#define __SENSOR_ADT7420_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_ADT7420_ADT7420_H_
+#define ZEPHYR_DRIVERS_SENSOR_ADT7420_ADT7420_H_
 
 #include <zephyr/types.h>
 #include <device.h>
@@ -101,4 +101,4 @@ int adt7420_init_interrupt(struct device *dev);
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
 
-#endif /* __SENSOR_ADT7420_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_ADT7420_ADT7420_H_ */
diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h
index 8cff6a7fd4f..db4e0a02d78 100644
--- a/drivers/sensor/adxl362/adxl362.h
+++ b/drivers/sensor/adxl362/adxl362.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_ADXL362_H__
-#define __SENSOR_ADXL362_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_ADXL362_ADXL362_H_
+#define ZEPHYR_DRIVERS_SENSOR_ADXL362_ADXL362_H_
 
 #include <zephyr/types.h>
 #include <device.h>
@@ -191,4 +191,4 @@ struct adxl362_data {
 #define SYS_LOG_DOMAIN "ADXL362"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_ADXL362_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_ADXL362_ADXL362_H_ */
diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h
index 09cde71c040..668619d918b 100644
--- a/drivers/sensor/adxl372/adxl372.h
+++ b/drivers/sensor/adxl372/adxl372.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_ADXL372_H__
-#define __SENSOR_ADXL372_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_ADXL372_ADXL372_H_
+#define ZEPHYR_DRIVERS_SENSOR_ADXL372_ADXL372_H_
 
 #include <zephyr/types.h>
 #include <device.h>
@@ -371,4 +371,4 @@ int adxl372_init_interrupt(struct device *dev);
 #define SYS_LOG_DOMAIN "ADXL372"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_ADXL372_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_ADXL372_ADXL372_H_ */
diff --git a/drivers/sensor/ak8975/ak8975.h b/drivers/sensor/ak8975/ak8975.h
index fba8d8dfa12..61dc86c56ce 100644
--- a/drivers/sensor/ak8975/ak8975.h
+++ b/drivers/sensor/ak8975/ak8975.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_AK8975__
-#define __SENSOR_AK8975__
+#ifndef ZEPHYR_DRIVERS_SENSOR_AK8975_AK8975_H_
+#define ZEPHYR_DRIVERS_SENSOR_AK8975_AK8975_H_
 
 #include <device.h>
 
@@ -59,4 +59,4 @@ struct ak8975_data {
 	u8_t z_adj;
 };
 
-#endif /* __SENSOR_AK8975__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_AK8975_AK8975_H_ */
diff --git a/drivers/sensor/amg88xx/amg88xx.h b/drivers/sensor/amg88xx/amg88xx.h
index 5c89f722310..a28c10b959a 100644
--- a/drivers/sensor/amg88xx/amg88xx.h
+++ b/drivers/sensor/amg88xx/amg88xx.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_AMG88XX
-#define _SENSOR_AMG88XX
+#ifndef ZEPHYR_DRIVERS_SENSOR_AMG88XX_AMG88XX_H_
+#define ZEPHYR_DRIVERS_SENSOR_AMG88XX_AMG88XX_H_
 
 #include <device.h>
 #include <gpio.h>
diff --git a/drivers/sensor/apds9960/apds9960.h b/drivers/sensor/apds9960/apds9960.h
index 60030d73ac9..95dc0c38dee 100644
--- a/drivers/sensor/apds9960/apds9960.h
+++ b/drivers/sensor/apds9960/apds9960.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_APDS9960_H_
-#define _SENSOR_APDS9960_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_
+#define ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_
 
 #define APDS9960_I2C_ADDRESS		0x39
 
@@ -275,4 +275,4 @@ struct apds9960_data {
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
 
-#endif /* _SENSOR_APDS9960_H_*/
+#endif /* ZEPHYR_DRIVERS_SENSOR_APDS9960_APDS9960_H_*/
diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h
index c6bccaccf7f..3e84717b0c0 100644
--- a/drivers/sensor/bma280/bma280.h
+++ b/drivers/sensor/bma280/bma280.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_BMA280_H__
-#define __SENSOR_BMA280_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMA280_BMA280_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMA280_BMA280_H_
 
 #include <device.h>
 #include <misc/util.h>
@@ -158,4 +158,4 @@ int bma280_init_interrupt(struct device *dev);
 #define SYS_LOG_DOMAIN "BMA280"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_BMA280_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMA280_BMA280_H_ */
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h
index 769f99deb30..248e6699d6c 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.h
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.h
@@ -6,8 +6,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
-#ifndef __SENSOR_BMC150_MAGN_H__
-#define __SENSOR_BMC150_MAGN_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMC150_MAGN_BMC150_MAGN_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMC150_MAGN_BMC150_MAGN_H_
 
 #include <zephyr/types.h>
 #include <i2c.h>
@@ -178,4 +178,4 @@ int bmc150_magn_init_interrupt(struct device *dev);
 #define SYS_LOG_DOMAIN "BMC150_MAGN"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_BMC150_MAGN_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMC150_MAGN_BMC150_MAGN_H_ */
diff --git a/drivers/sensor/bme280/bme280.h b/drivers/sensor/bme280/bme280.h
index df0fcd78cf8..a025c6f3455 100644
--- a/drivers/sensor/bme280/bme280.h
+++ b/drivers/sensor/bme280/bme280.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_BME280_H__
-#define __SENSOR_BME280_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_BME280_BME280_H_
+#define ZEPHYR_DRIVERS_SENSOR_BME280_BME280_H_
 
 #include <zephyr/types.h>
 #include <device.h>
@@ -146,4 +146,4 @@ struct bme280_data {
 #define SYS_LOG_DOMAIN "BME280"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_BME280_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_BME280_BME280_H_ */
diff --git a/drivers/sensor/bmg160/bmg160.h b/drivers/sensor/bmg160/bmg160.h
index 1baad0e6e6e..324024840dd 100644
--- a/drivers/sensor/bmg160/bmg160.h
+++ b/drivers/sensor/bmg160/bmg160.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _BMG160_H_
-#define _BMG160_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_
 
 #include <i2c.h>
 #include <gpio.h>
@@ -230,4 +230,4 @@ int bmg160_slope_config(struct device *dev, enum sensor_attribute attr,
 #define SYS_LOG_DOMAIN "BMG160"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* _BMG160_H_ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMG160_BMG160_H_ */
diff --git a/drivers/sensor/bmi160/bmi160.h b/drivers/sensor/bmi160/bmi160.h
index 9e2ffc41295..f5346ac78aa 100644
--- a/drivers/sensor/bmi160/bmi160.h
+++ b/drivers/sensor/bmi160/bmi160.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _BMI160_H_
-#define _BMI160_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMI160_BMI160_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMI160_BMI160_H_
 
 #include <gpio.h>
 #include <spi.h>
@@ -481,4 +481,4 @@ s32_t bmi160_gyr_reg_val_to_range(u8_t reg_val);
 #define SYS_LOG_DOMAIN "BMI160"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* _BMI160_H_ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_BMI160_BMI160_H_ */
diff --git a/drivers/sensor/bmm150/bmm150.h b/drivers/sensor/bmm150/bmm150.h
index 216d4cdbe68..320288b9e9d 100644
--- a/drivers/sensor/bmm150/bmm150.h
+++ b/drivers/sensor/bmm150/bmm150.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_BMM150_H_
-#define _SENSOR_BMM150_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_BMM150_BMM150_H_
+#define ZEPHYR_DRIVERS_SENSOR_BMM150_BMM150_H_
 
 
 #include <zephyr/types.h>
diff --git a/drivers/sensor/ccs811/ccs811.h b/drivers/sensor/ccs811/ccs811.h
index 09edbe365cf..9d79bd209ea 100644
--- a/drivers/sensor/ccs811/ccs811.h
+++ b/drivers/sensor/ccs811/ccs811.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_CCS811
-#define _SENSOR_CCS811
+#ifndef ZEPHYR_DRIVERS_SENSOR_CCS811_CCS811_H_
+#define ZEPHYR_DRIVERS_SENSOR_CCS811_CCS811_H_
 
 #include <device.h>
 #include <gpio.h>
diff --git a/drivers/sensor/dht/dht.h b/drivers/sensor/dht/dht.h
index 5ca35bbe5e8..a172b9098e8 100644
--- a/drivers/sensor/dht/dht.h
+++ b/drivers/sensor/dht/dht.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_DHT
-#define _SENSOR_DHT
+#ifndef ZEPHYR_DRIVERS_SENSOR_DHT_DHT_H_
+#define ZEPHYR_DRIVERS_SENSOR_DHT_DHT_H_
 
 #include <device.h>
 
diff --git a/drivers/sensor/hdc1008/hdc1008.h b/drivers/sensor/hdc1008/hdc1008.h
index 47cac3b5264..ef2cf164627 100644
--- a/drivers/sensor/hdc1008/hdc1008.h
+++ b/drivers/sensor/hdc1008/hdc1008.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_HDC1008
-#define _SENSOR_HDC1008
+#ifndef ZEPHYR_DRIVERS_SENSOR_HDC1008_HDC1008_H_
+#define ZEPHYR_DRIVERS_SENSOR_HDC1008_HDC1008_H_
 
 #include <kernel.h>
 
diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h
index 8d36e698ac5..faa4cb11047 100644
--- a/drivers/sensor/hmc5883l/hmc5883l.h
+++ b/drivers/sensor/hmc5883l/hmc5883l.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_HMC5883L_H__
-#define __SENSOR_HMC5883L_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_HMC5883L_HMC5883L_H_
+#define ZEPHYR_DRIVERS_SENSOR_HMC5883L_HMC5883L_H_
 
 #include <device.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/hp206c/hp206c.h b/drivers/sensor/hp206c/hp206c.h
index 06a0d0a82bc..4568a4fc63b 100644
--- a/drivers/sensor/hp206c/hp206c.h
+++ b/drivers/sensor/hp206c/hp206c.h
@@ -6,8 +6,8 @@
  *
  */
 
-#ifndef _SENSOR_HP206C_H_
-#define _SENSOR_HP206C_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_HP206C_HP206C_H_
+#define ZEPHYR_DRIVERS_SENSOR_HP206C_HP206C_H_
 
 #include <misc/util.h>
 
@@ -84,4 +84,4 @@ struct hp206c_device_data {
 #define SYS_LOG_DOMAIN "HP206C"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* _SENSOR_HP206C_H_ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_HP206C_HP206C_H_ */
diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h
index 84426d8ae85..b95e6c8aebb 100644
--- a/drivers/sensor/hts221/hts221.h
+++ b/drivers/sensor/hts221/hts221.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_HTS221_H__
-#define __SENSOR_HTS221_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_HTS221_HTS221_H_
+#define ZEPHYR_DRIVERS_SENSOR_HTS221_HTS221_H_
 
 #include <device.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/isl29035/isl29035.h b/drivers/sensor/isl29035/isl29035.h
index 662573f9a2a..25c9c30498a 100644
--- a/drivers/sensor/isl29035/isl29035.h
+++ b/drivers/sensor/isl29035/isl29035.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_ISL29035_H_
-#define _SENSOR_ISL29035_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_ISL29035_ISL29035_H_
+#define ZEPHYR_DRIVERS_SENSOR_ISL29035_ISL29035_H_
 
 #include <device.h>
 #include <kernel.h>
@@ -149,4 +149,4 @@ int isl29035_init_interrupt(struct device *dev);
 #define SYS_LOG_DOMAIN "ISL29035"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* _SENSOR_ISL29035_H_ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_ISL29035_ISL29035_H_ */
diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h
index 91ae36cf8f8..6488beec26f 100644
--- a/drivers/sensor/lis2dh/lis2dh.h
+++ b/drivers/sensor/lis2dh/lis2dh.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LIS2DH_H__
-#define __SENSOR_LIS2DH_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LIS2DH_LIS2DH_H_
+#define ZEPHYR_DRIVERS_SENSOR_LIS2DH_LIS2DH_H_
 
 #include <kernel.h>
 #include <device.h>
diff --git a/drivers/sensor/lis3dh/lis3dh.h b/drivers/sensor/lis3dh/lis3dh.h
index 29c6d77804a..8ef4509ce83 100644
--- a/drivers/sensor/lis3dh/lis3dh.h
+++ b/drivers/sensor/lis3dh/lis3dh.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LIS3DH_H__
-#define __SENSOR_LIS3DH_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LIS3DH_LIS3DH_H_
+#define ZEPHYR_DRIVERS_SENSOR_LIS3DH_LIS3DH_H_
 
 #include <device.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h
index ed609631be2..667a499c6d1 100644
--- a/drivers/sensor/lis3mdl/lis3mdl.h
+++ b/drivers/sensor/lis3mdl/lis3mdl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LIS3MDL_H__
-#define __SENSOR_LIS3MDL_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LIS3MDL_LIS3MDL_H_
+#define ZEPHYR_DRIVERS_SENSOR_LIS3MDL_LIS3MDL_H_
 
 #include <device.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/lps22hb/lps22hb.h b/drivers/sensor/lps22hb/lps22hb.h
index 6ad987231c4..2cc25c81412 100644
--- a/drivers/sensor/lps22hb/lps22hb.h
+++ b/drivers/sensor/lps22hb/lps22hb.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LPS22HB_H__
-#define __SENSOR_LPS22HB_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LPS22HB_LPS22HB_H_
+#define ZEPHYR_DRIVERS_SENSOR_LPS22HB_LPS22HB_H_
 
 #include <stdint.h>
 #include <i2c.h>
@@ -167,4 +167,4 @@ struct lps22hb_data {
 #define SYS_LOG_DOMAIN "LPS22HB"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_LPS22HB_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_LPS22HB_LPS22HB_H_ */
diff --git a/drivers/sensor/lps25hb/lps25hb.h b/drivers/sensor/lps25hb/lps25hb.h
index 61412bde5da..dbc6e89dfce 100644
--- a/drivers/sensor/lps25hb/lps25hb.h
+++ b/drivers/sensor/lps25hb/lps25hb.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LPS25HB_H__
-#define __SENSOR_LPS25HB_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LPS25HB_LPS25HB_H_
+#define ZEPHYR_DRIVERS_SENSOR_LPS25HB_LPS25HB_H_
 
 #include <zephyr/types.h>
 #include <i2c.h>
@@ -161,4 +161,4 @@ struct lps25hb_data {
 #define SYS_LOG_DOMAIN "LPS25HB"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_LPS25HB_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_LPS25HB_LPS25HB_H_ */
diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.h b/drivers/sensor/lsm6ds0/lsm6ds0.h
index e71bb55d391..70cc87c8fd5 100644
--- a/drivers/sensor/lsm6ds0/lsm6ds0.h
+++ b/drivers/sensor/lsm6ds0/lsm6ds0.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LSM6DS0_H__
-#define __SENSOR_LSM6DS0_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LSM6DS0_LSM6DS0_H_
+#define ZEPHYR_DRIVERS_SENSOR_LSM6DS0_LSM6DS0_H_
 
 #include <zephyr/types.h>
 #include <i2c.h>
@@ -495,4 +495,4 @@ struct lsm6ds0_data {
 #define SYS_LOG_DOMAIN "LSM6DS0"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_LSM6DS0_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_LSM6DS0_LSM6DS0_H_ */
diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.h b/drivers/sensor/lsm6dsl/lsm6dsl.h
index 27ed0728485..378dbafd461 100644
--- a/drivers/sensor/lsm6dsl/lsm6dsl.h
+++ b/drivers/sensor/lsm6dsl/lsm6dsl.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LSM6DSL_H__
-#define __SENSOR_LSM6DSL_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LSM6DSL_LSM6DSL_H_
+#define ZEPHYR_DRIVERS_SENSOR_LSM6DSL_LSM6DSL_H_
 
 #include <sensor.h>
 #include <zephyr/types.h>
@@ -687,4 +687,4 @@ int lsm6dsl_init_interrupt(struct device *dev);
 #define SYS_LOG_DOMAIN "LSM6DSL"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_LSM6DSL_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_LSM6DSL_LSM6DSL_H_ */
diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
index ef84e27de9b..a29a4e13b59 100644
--- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
+++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h
@@ -6,8 +6,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
-#ifndef __SENSOR_LSM9DS0_GYRO_H__
-#define __SENSOR_LSM9DS0_GYRO_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LSM9DS0_GYRO_LSM9DS0_GYRO_H_
+#define ZEPHYR_DRIVERS_SENSOR_LSM9DS0_GYRO_LSM9DS0_GYRO_H_
 
 #include <zephyr/types.h>
 #include <i2c.h>
@@ -258,4 +258,4 @@ int lsm9ds0_gyro_init_interrupt(struct device *dev);
 #define SYS_LOG_DOMAIN "LSM9DS0_GYRO"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_LSM9DS0_GYRO_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_LSM9DS0_GYRO_LSM9DS0_GYRO_H_ */
diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
index 2e117a589de..b0f1350fd67 100644
--- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
+++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_LSM9DS0_MFD_H__
-#define __SENSOR_LSM9DS0_MFD_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_LSM9DS0_MFD_LSM9DS0_MFD_H_
+#define ZEPHYR_DRIVERS_SENSOR_LSM9DS0_MFD_LSM9DS0_MFD_H_
 
 #include <zephyr/types.h>
 #include <misc/util.h>
@@ -560,4 +560,4 @@ struct lsm9ds0_mfd_data {
 #define SYS_LOG_DOMAIN "LSM9DS0_MFD"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_LSM9DS0_MFD_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_LSM9DS0_MFD_LSM9DS0_MFD_H_ */
diff --git a/drivers/sensor/max44009/max44009.h b/drivers/sensor/max44009/max44009.h
index 6f75775641c..3deb713cef6 100644
--- a/drivers/sensor/max44009/max44009.h
+++ b/drivers/sensor/max44009/max44009.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_MAX44009
-#define _SENSOR_MAX44009
+#ifndef ZEPHYR_DRIVERS_SENSOR_MAX44009_MAX44009_H_
+#define ZEPHYR_DRIVERS_SENSOR_MAX44009_MAX44009_H_
 
 #include <misc/util.h>
 
diff --git a/drivers/sensor/mcp9808/mcp9808.h b/drivers/sensor/mcp9808/mcp9808.h
index 18fb17ad3c0..4c4d578b99f 100644
--- a/drivers/sensor/mcp9808/mcp9808.h
+++ b/drivers/sensor/mcp9808/mcp9808.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_MCP9808_H__
-#define __SENSOR_MCP9808_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_MCP9808_MCP9808_H_
+#define ZEPHYR_DRIVERS_SENSOR_MCP9808_MCP9808_H_
 
 #include <errno.h>
 
@@ -89,4 +89,4 @@ static void mcp9808_setup_interrupt(struct device *dev)
 #define SYS_LOG_DOMAIN "MCP9808"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_MCP9808_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_MCP9808_MCP9808_H_ */
diff --git a/drivers/sensor/mma8451q/mma8451q.h b/drivers/sensor/mma8451q/mma8451q.h
index 96b98fd218f..e2cd97e1c1c 100644
--- a/drivers/sensor/mma8451q/mma8451q.h
+++ b/drivers/sensor/mma8451q/mma8451q.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_MMA8451Q
-#define _SENSOR_MMA8451Q
+#ifndef ZEPHYR_DRIVERS_SENSOR_MMA8451Q_MMA8451Q_H_
+#define ZEPHYR_DRIVERS_SENSOR_MMA8451Q_MMA8451Q_H_
 
 #include <device.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h
index 36fbd4bd1f8..94bbecb13e5 100644
--- a/drivers/sensor/mpu6050/mpu6050.h
+++ b/drivers/sensor/mpu6050/mpu6050.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_MPU6050_H__
-#define __SENSOR_MPU6050_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_MPU6050_MPU6050_H_
+#define ZEPHYR_DRIVERS_SENSOR_MPU6050_MPU6050_H_
 
 #include <device.h>
 #include <gpio.h>
diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h
index aa7af12ba60..de95e77156e 100644
--- a/drivers/sensor/sht3xd/sht3xd.h
+++ b/drivers/sensor/sht3xd/sht3xd.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_SHT3XD_
-#define _SENSOR_SHT3XD_
+#ifndef ZEPHYR_DRIVERS_SENSOR_SHT3XD_SHT3XD_H_
+#define ZEPHYR_DRIVERS_SENSOR_SHT3XD_SHT3XD_H_
 
 #include <device.h>
 #include <kernel.h>
@@ -107,4 +107,4 @@ int sht3xd_init_interrupt(struct device *dev);
 #define SYS_LOG_DOMAIN "SHT3XD"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* _SENSOR_SHT3XD_ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_SHT3XD_SHT3XD_H_ */
diff --git a/drivers/sensor/sx9500/sx9500.h b/drivers/sensor/sx9500/sx9500.h
index a190a60d6cb..a1a2819dc2d 100644
--- a/drivers/sensor/sx9500/sx9500.h
+++ b/drivers/sensor/sx9500/sx9500.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SENSOR_SX9500_H__
-#define __SENSOR_SX9500_H__
+#ifndef ZEPHYR_DRIVERS_SENSOR_SX9500_SX9500_H_
+#define ZEPHYR_DRIVERS_SENSOR_SX9500_SX9500_H_
 
 #include <zephyr/types.h>
 #include <device.h>
@@ -64,4 +64,4 @@ static inline int sx9500_setup_interrupt(struct device *dev)
 #define SYS_LOG_DOMAIN "SX9500"
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_SENSOR_LEVEL
 #include <logging/sys_log.h>
-#endif /* __SENSOR_SX9500_H__ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_SX9500_SX9500_H_ */
diff --git a/drivers/sensor/th02/th02.h b/drivers/sensor/th02/th02.h
index 304a1478fb6..5916aebfe2a 100644
--- a/drivers/sensor/th02/th02.h
+++ b/drivers/sensor/th02/th02.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_TH02
-#define _SENSOR_TH02
+#ifndef ZEPHYR_DRIVERS_SENSOR_TH02_TH02_H_
+#define ZEPHYR_DRIVERS_SENSOR_TH02_TH02_H_
 
 #include <device.h>
 #include <misc/util.h>
diff --git a/drivers/sensor/tmp007/tmp007.h b/drivers/sensor/tmp007/tmp007.h
index d3a80805243..9234c0c648b 100644
--- a/drivers/sensor/tmp007/tmp007.h
+++ b/drivers/sensor/tmp007/tmp007.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SENSOR_TMP007
-#define _SENSOR_TMP007
+#ifndef ZEPHYR_DRIVERS_SENSOR_TMP007_TMP007_H_
+#define ZEPHYR_DRIVERS_SENSOR_TMP007_TMP007_H_
 
 #include <device.h>
 #include <gpio.h>
diff --git a/drivers/sensor/vl53l0x/vl53l0x_platform.h b/drivers/sensor/vl53l0x/vl53l0x_platform.h
index aae1bd33a65..4d05c22ebe6 100644
--- a/drivers/sensor/vl53l0x/vl53l0x_platform.h
+++ b/drivers/sensor/vl53l0x/vl53l0x_platform.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _VL53L0X_PLATFORM_H_
-#define _VL53L0X_PLATFORM_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_PLATFORM_H_
+#define ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_PLATFORM_H_
 
 #include "vl53l0x_def.h"
 #include "vl53l0x_platform_log.h"
@@ -192,7 +192,7 @@ VL53L0X_Error VL53L0X_PollingDelay(VL53L0X_DEV Dev);
 }
 #endif
 
-#endif  /* _VL53L0X_PLATFORM_H_ */
+#endif  /* ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_PLATFORM_H_ */
 
 
 
diff --git a/drivers/sensor/vl53l0x/vl53l0x_platform_log.h b/drivers/sensor/vl53l0x/vl53l0x_platform_log.h
index fac898df562..b14cd401c32 100644
--- a/drivers/sensor/vl53l0x/vl53l0x_platform_log.h
+++ b/drivers/sensor/vl53l0x/vl53l0x_platform_log.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef _VL53L0X_PLATFORM_LOG_H_
-#define _VL53L0X_PLATFORM_LOG_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_PLATFORM_LOG_H_
+#define ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_PLATFORM_LOG_H_
 
 #include <stdio.h>
 #include <string.h>
@@ -53,7 +53,7 @@ enum {
 }
 #endif
 
-#endif  /* _VL53L0X_PLATFORM_LOG_H_ */
+#endif  /* ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_PLATFORM_LOG_H_ */
 
 
 
diff --git a/drivers/sensor/vl53l0x/vl53l0x_types.h b/drivers/sensor/vl53l0x/vl53l0x_types.h
index cb478e58b0b..d02d251fcf7 100644
--- a/drivers/sensor/vl53l0x/vl53l0x_types.h
+++ b/drivers/sensor/vl53l0x/vl53l0x_types.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef VL53L0X_TYPES_H_
-#define VL53L0X_TYPES_H_
+#ifndef ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_TYPES_H_
+#define ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_TYPES_H_
 
 
 /* Zephyr provides stdint.h and stddef.h, so this is enough to include it.
@@ -35,4 +35,4 @@
  */
 typedef uint32_t FixPoint1616_t;
 
-#endif /* VL53L0X_TYPES_H_ */
+#endif /* ZEPHYR_DRIVERS_SENSOR_VL53L0X_VL53L0X_TYPES_H_ */
diff --git a/drivers/serial/uart_ns16550.h b/drivers/serial/uart_ns16550.h
index cb9441ae4fa..e71267e6156 100644
--- a/drivers/serial/uart_ns16550.h
+++ b/drivers/serial/uart_ns16550.h
@@ -8,9 +8,9 @@
  * @file Header file for the NS16550 UART
  */
 
-#ifndef _UART_NS16550_H_
-#define _UART_NS16550_H_
+#ifndef ZEPHYR_DRIVERS_SERIAL_UART_NS16550_H_
+#define ZEPHYR_DRIVERS_SERIAL_UART_NS16550_H_
 
 #define CMD_SET_DLF	0x01
 
-#endif /* _UART_NS16550_H_ */
+#endif /* ZEPHYR_DRIVERS_SERIAL_UART_NS16550_H_ */
diff --git a/drivers/serial/uart_stm32.h b/drivers/serial/uart_stm32.h
index f6042193f37..03bd0c4836f 100644
--- a/drivers/serial/uart_stm32.h
+++ b/drivers/serial/uart_stm32.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef _STM32_UART_H_
-#define _STM32_UART_H_
+#ifndef ZEPHYR_DRIVERS_SERIAL_UART_STM32_H_
+#define ZEPHYR_DRIVERS_SERIAL_UART_STM32_H_
 
 /* device config */
 struct uart_stm32_config {
@@ -31,4 +31,4 @@ struct uart_stm32_data {
 #endif
 };
 
-#endif	/* _STM32_UART_H_ */
+#endif	/* ZEPHYR_DRIVERS_SERIAL_UART_STM32_H_ */
diff --git a/drivers/spi/spi_context.h b/drivers/spi/spi_context.h
index e184bff5602..dc36d4f35b6 100644
--- a/drivers/spi/spi_context.h
+++ b/drivers/spi/spi_context.h
@@ -9,8 +9,8 @@
  * @brief Private API for SPI drivers
  */
 
-#ifndef __SPI_DRIVER_COMMON_H__
-#define __SPI_DRIVER_COMMON_H__
+#ifndef ZEPHYR_DRIVERS_SPI_SPI_CONTEXT_H_
+#define ZEPHYR_DRIVERS_SPI_SPI_CONTEXT_H_
 
 #include <gpio.h>
 #include <spi.h>
@@ -357,4 +357,4 @@ static inline size_t spi_context_longest_current_buf(struct spi_context *ctx)
 }
 #endif
 
-#endif /* __SPI_DRIVER_COMMON_H__ */
+#endif /* ZEPHYR_DRIVERS_SPI_SPI_CONTEXT_H_ */
diff --git a/drivers/spi/spi_dw.h b/drivers/spi/spi_dw.h
index a1fbf7e3cef..7acb96c8b88 100644
--- a/drivers/spi/spi_dw.h
+++ b/drivers/spi/spi_dw.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SPI_DW_H__
-#define __SPI_DW_H__
+#ifndef ZEPHYR_DRIVERS_SPI_SPI_DW_H_
+#define ZEPHYR_DRIVERS_SPI_SPI_DW_H_
 
 #include <spi.h>
 
@@ -291,4 +291,4 @@ static inline void _clock_off(struct device *dev)
 #ifdef __cplusplus
 }
 #endif
-#endif /* __SPI_DW_H__ */
+#endif /* ZEPHYR_DRIVERS_SPI_SPI_DW_H_ */
diff --git a/drivers/spi/spi_dw_quark_se_ss_regs.h b/drivers/spi/spi_dw_quark_se_ss_regs.h
index ae3b8155910..271f77c7e10 100644
--- a/drivers/spi/spi_dw_quark_se_ss_regs.h
+++ b/drivers/spi/spi_dw_quark_se_ss_regs.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SPI_DW_QUARK_SE_SS_H__
-#define __SPI_DW_QUARK_SE_SS_H__
+#ifndef ZEPHYR_DRIVERS_SPI_SPI_DW_QUARK_SE_SS_REGS_H_
+#define ZEPHYR_DRIVERS_SPI_SPI_DW_QUARK_SE_SS_REGS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -150,4 +150,4 @@ static inline void _extra_clock_off(struct device *dev)
 }
 #endif
 
-#endif /* __SPI_DW_QUARK_SE_SS_H__ */
+#endif /* ZEPHYR_DRIVERS_SPI_SPI_DW_QUARK_SE_SS_REGS_H_ */
diff --git a/drivers/spi/spi_dw_regs.h b/drivers/spi/spi_dw_regs.h
index 600f78fd593..1cc347f053a 100644
--- a/drivers/spi/spi_dw_regs.h
+++ b/drivers/spi/spi_dw_regs.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SPI_DW_REGS_H__
-#define __SPI_DW_REGS_H__
+#ifndef ZEPHYR_DRIVERS_SPI_SPI_DW_REGS_H_
+#define ZEPHYR_DRIVERS_SPI_SPI_DW_REGS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,4 +62,4 @@ DEFINE_TEST_BIT_OP(icr, DW_SPI_REG_ICR, DW_SPI_SR_ICR_BIT)
 }
 #endif
 
-#endif /* __SPI_DW_REGS_H__ */
+#endif /* ZEPHYR_DRIVERS_SPI_SPI_DW_REGS_H_ */
diff --git a/drivers/spi/spi_intel.h b/drivers/spi/spi_intel.h
index b10679ebdb9..ad74dc618ce 100644
--- a/drivers/spi/spi_intel.h
+++ b/drivers/spi/spi_intel.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SPI_INTEL_H__
-#define __SPI_INTEL_H__
+#ifndef ZEPHYR_DRIVERS_SPI_SPI_INTEL_H_
+#define ZEPHYR_DRIVERS_SPI_SPI_INTEL_H_
 
 #include "spi_intel_regs.h"
 #include "spi_context.h"
@@ -99,4 +99,4 @@ DEFINE_CLEAR_BIT_OP(sssr_ror, INTEL_SPI_REG_SSSR, INTEL_SPI_SSSR_ROR_BIT)
 }
 #endif
 
-#endif /* __SPI_INTEL_H__ */
+#endif /* ZEPHYR_DRIVERS_SPI_SPI_INTEL_H_ */
diff --git a/drivers/spi/spi_intel_regs.h b/drivers/spi/spi_intel_regs.h
index 5c07f64b34c..83345565620 100644
--- a/drivers/spi/spi_intel_regs.h
+++ b/drivers/spi/spi_intel_regs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SPI_INTEL_REGS_H__
-#define __SPI_INTEL_REGS_H__
+#ifndef ZEPHYR_DRIVERS_SPI_SPI_INTEL_REGS_H_
+#define ZEPHYR_DRIVERS_SPI_SPI_INTEL_REGS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __SPI_INTEL_REGS_H__ */
+#endif /* ZEPHYR_DRIVERS_SPI_SPI_INTEL_REGS_H_ */
diff --git a/drivers/spi/spi_ll_stm32.h b/drivers/spi/spi_ll_stm32.h
index 2cf7d9e9a0c..d809dc1c1fe 100644
--- a/drivers/spi/spi_ll_stm32.h
+++ b/drivers/spi/spi_ll_stm32.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32_SPI_H_
-#define _STM32_SPI_H_
+#ifndef ZEPHYR_DRIVERS_SPI_SPI_LL_STM32_H_
+#define ZEPHYR_DRIVERS_SPI_SPI_LL_STM32_H_
 
 #include "spi_context.h"
 
@@ -23,4 +23,4 @@ struct spi_stm32_data {
 	struct spi_context ctx;
 };
 
-#endif	/* _STM32_SPI_H_ */
+#endif	/* ZEPHYR_DRIVERS_SPI_SPI_LL_STM32_H_ */
diff --git a/drivers/usb/device/usb_dw_registers.h b/drivers/usb/device/usb_dw_registers.h
index aa855651664..c58965de59a 100644
--- a/drivers/usb/device/usb_dw_registers.h
+++ b/drivers/usb/device/usb_dw_registers.h
@@ -12,8 +12,8 @@
  * definitions.
  */
 
-#ifndef __USB_DW_REGISTERS_H__
-#define __USB_DW_REGISTERS_H__
+#ifndef ZEPHYR_DRIVERS_USB_DEVICE_USB_DW_REGISTERS_H_
+#define ZEPHYR_DRIVERS_USB_DEVICE_USB_DW_REGISTERS_H_
 
 #include <misc/util.h>
 #include <board.h>
@@ -214,4 +214,4 @@ struct usb_dw_reg {
 }
 #endif
 
-#endif /* __USB_DW_REGISTERS_H__ */
+#endif /* ZEPHYR_DRIVERS_USB_DEVICE_USB_DW_REGISTERS_H_ */
diff --git a/drivers/watchdog/iwdg_stm32.h b/drivers/watchdog/iwdg_stm32.h
index b21d58b6ec7..1a620c62fff 100644
--- a/drivers/watchdog/iwdg_stm32.h
+++ b/drivers/watchdog/iwdg_stm32.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32_IWDG_H_
-#define _STM32_IWDG_H_
+#ifndef ZEPHYR_DRIVERS_WATCHDOG_IWDG_STM32_H_
+#define ZEPHYR_DRIVERS_WATCHDOG_IWDG_STM32_H_
 
 #include <zephyr/types.h>
 
@@ -32,4 +32,4 @@ struct iwdg_stm32_data {
 #define IWDG_STM32_STRUCT(dev)					\
 	((IWDG_TypeDef *)(IWDG_STM32_DATA(dev))->Instance)
 
-#endif	/* _STM32_IWDG_H_ */
+#endif	/* ZEPHYR_DRIVERS_WATCHDOG_IWDG_STM32_H_ */
diff --git a/drivers/wifi/simplelink/simplelink_sockets.h b/drivers/wifi/simplelink/simplelink_sockets.h
index aac8d019095..2ce04688704 100644
--- a/drivers/wifi/simplelink/simplelink_sockets.h
+++ b/drivers/wifi/simplelink/simplelink_sockets.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SIMPLELINK_SOCKETS_H
-#define __SIMPLELINK_SOCKETS_H
+#ifndef ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SOCKETS_H_
+#define ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SOCKETS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,4 +17,4 @@ extern const struct socket_offload simplelink_ops;
 }
 #endif
 
-#endif /* __SIMPLELINK_SOCKETS_H */
+#endif /* ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SOCKETS_H_ */
diff --git a/drivers/wifi/simplelink/simplelink_support.h b/drivers/wifi/simplelink/simplelink_support.h
index 0bf03c4a399..9631f125d9d 100644
--- a/drivers/wifi/simplelink/simplelink_support.h
+++ b/drivers/wifi/simplelink/simplelink_support.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __SIMPLELINK_SUPPORT_H__
-#define __SIMPLELINK_SUPPORT_H__
+#ifndef ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SUPPORT_H_
+#define ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SUPPORT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,4 +51,4 @@ extern int _simplelink_disconnect(void);
  * @}
  */
 
-#endif /* __SIMPLELINK_SUPPORT_H__ */
+#endif /* ZEPHYR_DRIVERS_WIFI_SIMPLELINK_SIMPLELINK_SUPPORT_H_ */
diff --git a/drivers/wifi/winc1500/wifi_winc1500_config.h b/drivers/wifi/winc1500/wifi_winc1500_config.h
index 2b986c4a4fd..8c8cd6b4c59 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_config.h
+++ b/drivers/wifi/winc1500/wifi_winc1500_config.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef CONF_WINC_H_INCLUDED
-#define CONF_WINC_H_INCLUDED
+#ifndef ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_CONFIG_H_
+#define ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_CONFIG_H_
 
 /*
    ---------------------------------
@@ -63,4 +63,4 @@
 #define CONF_WINC_DEBUG				(0)
 #define CONF_WINC_PRINTF			printf
 
-#endif /* CONF_WINC_H_INCLUDED */
+#endif /* ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_CONFIG_H_ */
diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
index 9fc4e25b84d..1dbf9ee4deb 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __WIFI_WINC1500_NM_BSP_INTERNAL_H__
-#define __WIFI_WINC1500_NM_BSP_INTERNAL_H__
+#ifndef ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_NM_BSP_INTERNAL_H_
+#define ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_NM_BSP_INTERNAL_H_
 
 #include <device.h>
 #include <gpio.h>
@@ -32,4 +32,4 @@ struct winc1500_device {
 
 extern struct winc1500_device winc1500;
 
-#endif /* __WIFI_WINC1500_NM_BSP_INTERNAL_H__ */
+#endif /* ZEPHYR_DRIVERS_WIFI_WINC1500_WIFI_WINC1500_NM_BSP_INTERNAL_H_ */
diff --git a/include/adc.h b/include/adc.h
index 4da12f82182..d5e76ca9f9b 100644
--- a/include/adc.h
+++ b/include/adc.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INCLUDE_ADC_H__
-#define __INCLUDE_ADC_H__
+#ifndef ZEPHYR_INCLUDE_ADC_H_
+#define ZEPHYR_INCLUDE_ADC_H_
 
 #include <device.h>
 
@@ -374,4 +374,4 @@ static inline int adc_read_async(struct device *dev,
 }
 #endif
 
-#endif  /* __INCLUDE_ADC_H__ */
+#endif  /* ZEPHYR_INCLUDE_ADC_H_ */
diff --git a/include/aio_comparator.h b/include/aio_comparator.h
index 8cb0ca00da4..0493be81c4d 100644
--- a/include/aio_comparator.h
+++ b/include/aio_comparator.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _AIO_COMPARATOR_H_
-#define _AIO_COMPARATOR_H_
+#ifndef ZEPHYR_INCLUDE_AIO_COMPARATOR_H_
+#define ZEPHYR_INCLUDE_AIO_COMPARATOR_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -109,4 +109,4 @@ static inline int _impl_aio_cmp_get_pending_int(struct device *dev)
 
 #include <syscalls/aio_comparator.h>
 
-#endif /* _AIO_COMPARATOR_H_ */
+#endif /* ZEPHYR_INCLUDE_AIO_COMPARATOR_H_ */
diff --git a/include/app_memory/app_memdomain.h b/include/app_memory/app_memdomain.h
index 3ca3b75ba52..bea1527843d 100644
--- a/include/app_memory/app_memdomain.h
+++ b/include/app_memory/app_memdomain.h
@@ -1,5 +1,5 @@
-#ifndef _APP_MEMDOMAIN__H_
-#define _APP_MEMDOMAIN__H_
+#ifndef ZEPHYR_INCLUDE_APP_MEMORY_APP_MEMDOMAIN_H_
+#define ZEPHYR_INCLUDE_APP_MEMORY_APP_MEMDOMAIN_H_
 
 #include <linker/linker-defs.h>
 #include <misc/dlist.h>
@@ -131,4 +131,4 @@ extern void app_calc_size(void);
 
 extern void appmem_init_app_memory(void);
 
-#endif /* _APP_MEMDOMAIN__H_ */
+#endif /* ZEPHYR_INCLUDE_APP_MEMORY_APP_MEMDOMAIN_H_ */
diff --git a/include/arch/arc/arch.h b/include/arch/arc/arch.h
index 19f898a2a41..e6e4e8706a8 100644
--- a/include/arch/arc/arch.h
+++ b/include/arch/arc/arch.h
@@ -13,8 +13,8 @@
  * include/arch/cpu.h)
  */
 
-#ifndef _ARC_ARCH__H_
-#define _ARC_ARCH__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_
 
 #include <generated_dts_board.h>
 #include <sw_isr_table.h>
@@ -227,4 +227,4 @@ typedef u32_t k_mem_partition_attr_t;
 #ifdef __cplusplus
 }
 #endif
-#endif /* _ARC_ARCH__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_ */
diff --git a/include/arch/arc/syscall.h b/include/arch/arc/syscall.h
index 72d2a51a0ab..a9e6c4d0a38 100644
--- a/include/arch/arc/syscall.h
+++ b/include/arch/arc/syscall.h
@@ -13,8 +13,8 @@
  * (include/arch/syscall.h)
  */
 
-#ifndef _ARC_SYSCALL__H_
-#define _ARC_SYSCALL__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_SYSCALL_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_SYSCALL_H_
 
 #define _TRAP_S_SCALL_IRQ_OFFLOAD		1
 #define _TRAP_S_CALL_RUNTIME_EXCEPT		2
@@ -191,4 +191,4 @@ static inline int _arch_is_user_context(void)
 
 #endif /* _ASMLANGUAGE */
 #endif /* CONFIG_USERSPACE */
-#endif /* _ARC_SYSCALL__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_SYSCALL_H_ */
diff --git a/include/arch/arc/v2/addr_types.h b/include/arch/arc/v2/addr_types.h
index eedc1f2d542..59fb0939704 100644
--- a/include/arch/arc/v2/addr_types.h
+++ b/include/arch/arc/v2/addr_types.h
@@ -6,12 +6,12 @@
 
 /* @file ARC-v2 address types (virtual, physical, etc) definitions */
 
-#ifndef _arc_v2_addr_types__h_
-#define _arc_v2_addr_types__h_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_
 
 #ifndef _ASMLANGUAGE
 	typedef unsigned int paddr_t;
 	typedef unsigned int vaddr_t;
 #endif
 
-#endif /* _arc_v2_addr_types__h_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_ */
diff --git a/include/arch/arc/v2/arcv2_irq_unit.h b/include/arch/arc/v2/arcv2_irq_unit.h
index 4625faaed16..1eef2e76017 100644
--- a/include/arch/arc/v2/arcv2_irq_unit.h
+++ b/include/arch/arc/v2/arcv2_irq_unit.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ARC_V2_IRQ_UNIT__H
-#define _ARC_V2_IRQ_UNIT__H
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ARCV2_IRQ_UNIT_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ARCV2_IRQ_UNIT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -188,4 +188,4 @@ void _arc_v2_irq_unit_int_eoi(int irq);
 }
 #endif
 
-#endif /* _ARC_V2_IRQ_UNIT__H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_ARCV2_IRQ_UNIT_H_ */
diff --git a/include/arch/arc/v2/asm_inline.h b/include/arch/arc/v2/asm_inline.h
index bc42d7d1509..d146257455f 100644
--- a/include/arch/arc/v2/asm_inline.h
+++ b/include/arch/arc/v2/asm_inline.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ASM_INLINE_H__
-#define __ASM_INLINE_H__
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -20,4 +20,4 @@
 #erro "you need to provide an asm_inline.h for your compiler"
 #endif
 
-#endif /* __ASM_INLINE_H__ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_ASM_INLINE_H_ */
diff --git a/include/arch/arc/v2/asm_inline_gcc.h b/include/arch/arc/v2/asm_inline_gcc.h
index 94f760a33eb..4db2f1c41a8 100644
--- a/include/arch/arc/v2/asm_inline_gcc.h
+++ b/include/arch/arc/v2/asm_inline_gcc.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ASM_INLINE_GCC_H__
-#define __ASM_INLINE_GCC_H__
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ASM_INLINE_GCC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -315,4 +315,4 @@ static ALWAYS_INLINE
 }
 #endif
 
-#endif /* __ASM_INLINE_GCC_H__ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/arc/v2/aux_regs.h b/include/arch/arc/v2/aux_regs.h
index 0b05e489e97..24b279e3e2f 100644
--- a/include/arch/arc/v2/aux_regs.h
+++ b/include/arch/arc/v2/aux_regs.h
@@ -12,8 +12,8 @@
  * Definitions for auxiliary registers.
  */
 
-#ifndef _ARC_V2_AUX_REGS__H_
-#define _ARC_V2_AUX_REGS__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_AUX_REGS_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_AUX_REGS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -181,4 +181,4 @@ extern "C" {
 }
 #endif
 
-#endif /* _ARC_V2_AUX_REGS__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_AUX_REGS_H_ */
diff --git a/include/arch/arc/v2/error.h b/include/arch/arc/v2/error.h
index cfda73670f2..57356040b51 100644
--- a/include/arch/arc/v2/error.h
+++ b/include/arch/arc/v2/error.h
@@ -11,8 +11,8 @@
  * ARC-specific kernel error handling interface. Included by arc/arch.h.
  */
 
-#ifndef _ARCH_ARC_V2_ERROR_H_
-#define _ARCH_ARC_V2_ERROR_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ERROR_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ERROR_H_
 
 #include <arch/arc/syscall.h>
 #include <arch/arc/v2/exc.h>
@@ -61,4 +61,4 @@ extern void _SysFatalErrorHandler(unsigned int cause, const NANO_ESF *esf);
 #endif
 
 
-#endif /* _ARCH_ARC_V2_ERROR_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_ERROR_H_ */
diff --git a/include/arch/arc/v2/exc.h b/include/arch/arc/v2/exc.h
index b63a1762f6e..fe1f0c71030 100644
--- a/include/arch/arc/v2/exc.h
+++ b/include/arch/arc/v2/exc.h
@@ -11,8 +11,8 @@
  * ARC-specific kernel exception handling interface. Included by arc/arch.h.
  */
 
-#ifndef _ARCH_ARC_V2_EXC_H_
-#define _ARCH_ARC_V2_EXC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_EXC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_EXC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,4 +28,4 @@ typedef struct  _irq_stack_frame NANO_ESF;
 #endif
 
 
-#endif /* _ARCH_ARC_V2_EXC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_EXC_H_ */
diff --git a/include/arch/arc/v2/ffs.h b/include/arch/arc/v2/ffs.h
index c57e77f6364..23607aa5e3a 100644
--- a/include/arch/arc/v2/ffs.h
+++ b/include/arch/arc/v2/ffs.h
@@ -11,8 +11,8 @@
  * ARC-specific kernel ffs interface. Included by arc/arch.h.
  */
 
-#ifndef _ARCH_ARC_V2_FFS_H_
-#define _ARCH_ARC_V2_FFS_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_FFS_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_FFS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,4 +87,4 @@ static ALWAYS_INLINE unsigned int find_lsb_set(u32_t op)
 }
 #endif
 
-#endif /* _ARCH_ARC_V2_FFS_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_FFS_H_ */
diff --git a/include/arch/arc/v2/irq.h b/include/arch/arc/v2/irq.h
index 87571a04ff8..b4f755527e4 100644
--- a/include/arch/arc/v2/irq.h
+++ b/include/arch/arc/v2/irq.h
@@ -11,8 +11,8 @@
  * ARCv2 kernel interrupt handling interface. Included by arc/arch.h.
  */
 
-#ifndef _ARCH_ARC_V2_IRQ__H_
-#define _ARCH_ARC_V2_IRQ__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_IRQ_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_IRQ_H_
 
 #include <arch/arc/v2/aux_regs.h>
 #include <toolchain/common.h>
@@ -133,4 +133,4 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
 }
 #endif
 
-#endif /* _ARCH_ARC_V2_IRQ__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_IRQ_H_ */
diff --git a/include/arch/arc/v2/misc.h b/include/arch/arc/v2/misc.h
index e5e1028d705..8aee8aca86f 100644
--- a/include/arch/arc/v2/misc.h
+++ b/include/arch/arc/v2/misc.h
@@ -11,8 +11,8 @@
  * ARC-specific kernel miscellaneous interface. Included by arc/arch.h.
  */
 
-#ifndef _ARCH_ARC_V2_MISC_H_
-#define _ARCH_ARC_V2_MISC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_MISC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_MISC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,4 +31,4 @@ extern u32_t _timer_cycle_get_32(void);
 }
 #endif
 
-#endif /* _ARCH_ARC_V2_MISC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_MISC_H_ */
diff --git a/include/arch/arc/v2/mpu/arc_core_mpu.h b/include/arch/arc/v2/mpu/arc_core_mpu.h
index 89479e2717c..ea0eaf78a2a 100644
--- a/include/arch/arc/v2/mpu/arc_core_mpu.h
+++ b/include/arch/arc/v2/mpu/arc_core_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _ARC_CORE_MPU_H_
-#define _ARC_CORE_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_MPU_ARC_CORE_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_MPU_ARC_CORE_MPU_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -124,4 +124,4 @@ void configure_mpu_thread(struct k_thread *thread);
 }
 #endif
 
-#endif /* _ARC_CORE_MPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_MPU_ARC_CORE_MPU_H_ */
diff --git a/include/arch/arc/v2/mpu/arc_mpu.h b/include/arch/arc/v2/mpu/arc_mpu.h
index 83f823cf03f..1eb477cbe5f 100644
--- a/include/arch/arc/v2/mpu/arc_mpu.h
+++ b/include/arch/arc/v2/mpu/arc_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _ARC_MPU_H_
-#define _ARC_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_MPU_ARC_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARC_V2_MPU_ARC_MPU_H_
 
 
 
diff --git a/include/arch/arm/arch.h b/include/arch/arm/arch.h
index 132b4598275..a7f5d78c698 100644
--- a/include/arch/arm/arch.h
+++ b/include/arch/arm/arch.h
@@ -13,8 +13,8 @@
  * (include/arc/cpu.h)
  */
 
-#ifndef _ARM_ARCH__H_
-#define _ARM_ARCH__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
@@ -330,4 +330,4 @@ typedef u32_t k_mem_partition_attr_t;
 }
 #endif
 
-#endif /* _ARM_ARCH__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ */
diff --git a/include/arch/arm/cortex_m/addr_types.h b/include/arch/arm/cortex_m/addr_types.h
index 547ca61fd3d..4e3da6fde4e 100644
--- a/include/arch/arm/cortex_m/addr_types.h
+++ b/include/arch/arm/cortex_m/addr_types.h
@@ -6,12 +6,12 @@
 
 /* @file Cortex-M address types (virtual, physical, etc) definitions */
 
-#ifndef _arm_cortex_m_addr_types__h_
-#define _arm_cortex_m_addr_types__h_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_
 
 #ifndef _ASMLANGUAGE
 	typedef unsigned int paddr_t;
 	typedef unsigned int vaddr_t;
 #endif
 
-#endif /* _arm_cortex_m_addr_types__h_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_ */
diff --git a/include/arch/arm/cortex_m/asm_inline.h b/include/arch/arm/cortex_m/asm_inline.h
index 905d872c835..ce7f34c60d4 100644
--- a/include/arch/arm/cortex_m/asm_inline.h
+++ b/include/arch/arm/cortex_m/asm_inline.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_PUBLIC_H
-#define _ASM_INLINE_PUBLIC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -20,4 +20,4 @@
 #include <arch/arm/cortex_m/asm_inline_other.h>
 #endif
 
-#endif /* _ASM_INLINE_PUBLIC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ASM_INLINE_H_ */
diff --git a/include/arch/arm/cortex_m/asm_inline_gcc.h b/include/arch/arm/cortex_m/asm_inline_gcc.h
index d64bf7902b2..d5209f8554c 100644
--- a/include/arch/arm/cortex_m/asm_inline_gcc.h
+++ b/include/arch/arm/cortex_m/asm_inline_gcc.h
@@ -8,8 +8,8 @@
 
 /* Either public functions or macros or invoked by public functions */
 
-#ifndef _ASM_INLINE_GCC_PUBLIC_GCC_H
-#define _ASM_INLINE_GCC_PUBLIC_GCC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ASM_INLINE_GCC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -182,4 +182,4 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
 }
 #endif
 
-#endif /* _ASM_INLINE_GCC_PUBLIC_GCC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/arm/cortex_m/cmsis.h b/include/arch/arm/cortex_m/cmsis.h
index 6cdaa73cbc7..67c835d4e95 100644
--- a/include/arch/arm/cortex_m/cmsis.h
+++ b/include/arch/arm/cortex_m/cmsis.h
@@ -11,8 +11,8 @@
  * This header contains the interface to the ARM CMSIS Core headers.
  */
 
-#ifndef _CMSIS__H_
-#define _CMSIS__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -112,4 +112,4 @@ typedef enum {
 }
 #endif
 
-#endif /* _CMSIS__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ */
diff --git a/include/arch/arm/cortex_m/error.h b/include/arch/arm/cortex_m/error.h
index 94d1ec628ef..eede90d0261 100644
--- a/include/arch/arm/cortex_m/error.h
+++ b/include/arch/arm/cortex_m/error.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel error handling interface. Included by arm/arch.h.
  */
 
-#ifndef _ARCH_ARM_CORTEXM_ERROR_H_
-#define _ARCH_ARM_CORTEXM_ERROR_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ERROR_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ERROR_H_
 
 #include <arch/arm/syscall.h>
 #include <arch/arm/cortex_m/exc.h>
@@ -72,4 +72,4 @@ extern void _SysFatalErrorHandler(unsigned int reason, const NANO_ESF *esf);
 }
 #endif
 
-#endif /* _ARCH_ARM_CORTEXM_ERROR_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ERROR_H_ */
diff --git a/include/arch/arm/cortex_m/exc.h b/include/arch/arm/cortex_m/exc.h
index 36700f161a5..adde516add7 100644
--- a/include/arch/arm/cortex_m/exc.h
+++ b/include/arch/arm/cortex_m/exc.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel exception handling interface. Included by arm/arch.h.
  */
 
-#ifndef _ARCH_ARM_CORTEXM_EXC_H_
-#define _ARCH_ARM_CORTEXM_EXC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_EXC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_EXC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -78,4 +78,4 @@ extern void sys_exc_esf_dump(NANO_ESF *esf);
 }
 #endif
 
-#endif /* _ARCH_ARM_CORTEXM_EXC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_EXC_H_ */
diff --git a/include/arch/arm/cortex_m/irq.h b/include/arch/arm/cortex_m/irq.h
index 0c0197ef6f1..18fd6818ef6 100644
--- a/include/arch/arm/cortex_m/irq.h
+++ b/include/arch/arm/cortex_m/irq.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel interrupt handling interface. Included by arm/arch.h.
  */
 
-#ifndef _ARCH_ARM_CORTEXM_IRQ_H_
-#define _ARCH_ARM_CORTEXM_IRQ_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_IRQ_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_IRQ_H_
 
 #include <irq.h>
 #include <sw_isr_table.h>
@@ -158,4 +158,4 @@ extern void _isr_wrapper(void);
 }
 #endif
 
-#endif /* _ARCH_ARM_CORTEXM_IRQ_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_IRQ_H_ */
diff --git a/include/arch/arm/cortex_m/memory_map.h b/include/arch/arm/cortex_m/memory_map.h
index 70a903a711d..4427dd150bd 100644
--- a/include/arch/arm/cortex_m/memory_map.h
+++ b/include/arch/arm/cortex_m/memory_map.h
@@ -12,8 +12,8 @@
  * processors.
  */
 
-#ifndef _CORTEXM_MEMORY_MAP__H_
-#define _CORTEXM_MEMORY_MAP__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
 
 #include <misc/util.h>
 
@@ -107,4 +107,4 @@
 #define _VENDOR_BASE_ADDR         0xE0100000
 #define _VENDOR_END_ADDR          0xFFFFFFFF
 
-#endif /* _CORTEXM_MEMORY_MAP__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ */
diff --git a/include/arch/arm/cortex_m/misc.h b/include/arch/arm/cortex_m/misc.h
index 9e7730ef61f..5e592364533 100644
--- a/include/arch/arm/cortex_m/misc.h
+++ b/include/arch/arm/cortex_m/misc.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel miscellaneous interface. Included by arm/arch.h.
  */
 
-#ifndef _ARCH_ARM_CORTEXM_MISC_H_
-#define _ARCH_ARM_CORTEXM_MISC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MISC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MISC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,4 +29,4 @@ extern u32_t _timer_cycle_get_32(void);
 }
 #endif
 
-#endif /* _ARCH_ARM_CORTEXM_MISC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MISC_H_ */
diff --git a/include/arch/arm/cortex_m/mpu/arm_core_mpu.h b/include/arch/arm/cortex_m/mpu/arm_core_mpu.h
index 64ed35d6465..fa5ba31c89d 100644
--- a/include/arch/arm/cortex_m/mpu/arm_core_mpu.h
+++ b/include/arch/arm/cortex_m/mpu/arm_core_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _ARM_CORE_MPU_H_
-#define _ARM_CORE_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_H_
 
 #include <kernel_structs.h>
 
@@ -59,4 +59,4 @@ void configure_mpu_user_context(struct k_thread *thread);
 }
 #endif
 
-#endif /* _ARM_CORE_MPU_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_H_ */
diff --git a/include/arch/arm/cortex_m/mpu/arm_core_mpu_dev.h b/include/arch/arm/cortex_m/mpu/arm_core_mpu_dev.h
index 6c2a48c24a2..1998b586209 100644
--- a/include/arch/arm/cortex_m/mpu/arm_core_mpu_dev.h
+++ b/include/arch/arm/cortex_m/mpu/arm_core_mpu_dev.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _ARM_CORE_MPU_DEV_H_
-#define _ARM_CORE_MPU_DEV_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
 
 #include <zephyr/types.h>
 
@@ -123,4 +123,4 @@ int arm_core_mpu_buffer_validate(void *addr, size_t size, int write);
 }
 #endif
 
-#endif /* _ARM_CORE_MPU_DEV_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ */
diff --git a/include/arch/arm/cortex_m/mpu/arm_mpu.h b/include/arch/arm/cortex_m/mpu/arm_mpu.h
index 688bec10992..729e414d5ef 100644
--- a/include/arch/arm/cortex_m/mpu/arm_mpu.h
+++ b/include/arch/arm/cortex_m/mpu/arm_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _ARM_MPU_H_
-#define _ARM_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_
 
 #include <arch/arm/cortex_m/mpu/arm_core_mpu_dev.h>
 #include <arch/arm/cortex_m/cmsis.h>
@@ -83,4 +83,4 @@ struct arm_mpu_config {
 /* Reference to the MPU configuration */
 extern struct arm_mpu_config mpu_config;
 
-#endif /* _ARM_MPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ */
diff --git a/include/arch/arm/cortex_m/mpu/nxp_mpu.h b/include/arch/arm/cortex_m/mpu/nxp_mpu.h
index 06ff373f21d..2c54e023207 100644
--- a/include/arch/arm/cortex_m/mpu/nxp_mpu.h
+++ b/include/arch/arm/cortex_m/mpu/nxp_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _NXP_MPU_H_
-#define _NXP_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_
 
 #include <fsl_common.h>
 #include <arch/arm/cortex_m/mpu/arm_core_mpu_dev.h>
@@ -154,4 +154,4 @@ struct nxp_mpu_config {
 /* Reference to the MPU configuration */
 extern struct nxp_mpu_config mpu_config;
 
-#endif /* _NXP_MPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ */
diff --git a/include/arch/arm/cortex_m/nmi.h b/include/arch/arm/cortex_m/nmi.h
index 74a1c2fe7c3..696deba0ba9 100644
--- a/include/arch/arm/cortex_m/nmi.h
+++ b/include/arch/arm/cortex_m/nmi.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __CORTEX_M_NMI_H
-#define __CORTEX_M_NMI_H
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_NMI_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_NMI_H_
 
 #ifndef _ASMLANGUAGE
 #ifdef CONFIG_RUNTIME_NMI
@@ -22,4 +22,4 @@ extern void _NmiInit(void);
 #endif
 #endif
 
-#endif /* __CORTEX_M_NMI_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_NMI_H_ */
diff --git a/include/arch/arm/cortex_m/sys_io.h b/include/arch/arm/cortex_m/sys_io.h
index 4bd840630d6..2b10294564b 100644
--- a/include/arch/arm/cortex_m/sys_io.h
+++ b/include/arch/arm/cortex_m/sys_io.h
@@ -8,8 +8,8 @@
  * @brief ARM CORTEX-M Series memory mapped register I/O operations
  */
 
-#ifndef _CORTEX_M_SYS_IO_H_
-#define _CORTEX_M_SYS_IO_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_SYS_IO_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_SYS_IO_H_
 
 #if !defined(_ASMLANGUAGE)
 
@@ -94,4 +94,4 @@ static ALWAYS_INLINE
 
 #endif /* !_ASMLANGUAGE */
 
-#endif /* _CORTEX_M_SYS_IO_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_SYS_IO_H_ */
diff --git a/include/arch/arm/syscall.h b/include/arch/arm/syscall.h
index 11ad287ba01..ebb1f6b2e11 100644
--- a/include/arch/arm/syscall.h
+++ b/include/arch/arm/syscall.h
@@ -13,8 +13,8 @@
  * (include/arch/syscall.h)
  */
 
-#ifndef _ARM_SYSCALL__H_
-#define _ARM_SYSCALL__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_
 
 #define _SVC_CALL_IRQ_OFFLOAD		1
 #define _SVC_CALL_RUNTIME_EXCEPT	2
@@ -174,4 +174,4 @@ static inline int _arch_is_user_context(void)
 
 #endif /* _ASMLANGUAGE */
 #endif /* CONFIG_USERSPACE */
-#endif /* _ARM_SYSCALL__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ */
diff --git a/include/arch/cpu.h b/include/arch/cpu.h
index b03f81f959e..5c12d9c1d34 100644
--- a/include/arch/cpu.h
+++ b/include/arch/cpu.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ARCHCPU_H__
-#define __ARCHCPU_H__
+#ifndef ZEPHYR_INCLUDE_ARCH_CPU_H_
+#define ZEPHYR_INCLUDE_ARCH_CPU_H_
 
 #if defined(CONFIG_X86)
 #include <arch/x86/arch.h>
@@ -27,4 +27,4 @@
 #error "Unknown Architecture"
 #endif
 
-#endif /* __ARCHCPU_H__ */
+#endif /* ZEPHYR_INCLUDE_ARCH_CPU_H_ */
diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h
index a24edbea955..2449b24f398 100644
--- a/include/arch/nios2/arch.h
+++ b/include/arch/nios2/arch.h
@@ -11,8 +11,8 @@
  * included by the generic kernel interface header (include/arch/cpu.h)
  */
 
-#ifndef _ARCH_IFACE_H
-#define _ARCH_IFACE_H
+#ifndef ZEPHYR_INCLUDE_ARCH_NIOS2_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_NIOS2_ARCH_H_
 
 #include <system.h>
 #include <arch/nios2/asm_inline.h>
diff --git a/include/arch/nios2/asm.h b/include/arch/nios2/asm.h
index 1f1c320f0c8..a805f5dd26a 100644
--- a/include/arch/nios2/asm.h
+++ b/include/arch/nios2/asm.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _NIOS2_ASM_H
-#define _NIOS2_ASM_H
+#ifndef ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_H_
+#define ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_H_
 
 #include <toolchain.h>
 #include <linker/sections.h>
diff --git a/include/arch/nios2/asm_inline.h b/include/arch/nios2/asm_inline.h
index 8b8b9d3bf70..54f78ac47f4 100644
--- a/include/arch/nios2/asm_inline.h
+++ b/include/arch/nios2/asm_inline.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_PUBLIC_H
-#define _ASM_INLINE_PUBLIC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -18,4 +18,4 @@
 #include <arch/nios2/asm_inline_other.h>
 #endif
 
-#endif /* _ASM_INLINE_PUBLIC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_H_ */
diff --git a/include/arch/nios2/asm_inline_gcc.h b/include/arch/nios2/asm_inline_gcc.h
index b8d7022d31e..252dffce900 100644
--- a/include/arch/nios2/asm_inline_gcc.h
+++ b/include/arch/nios2/asm_inline_gcc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_GCC_H
-#define _ASM_INLINE_GCC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_NIOS2_ASM_INLINE_GCC_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/arch/nios2/nios2.h b/include/arch/nios2/nios2.h
index e8ac18052d7..037d93e110a 100644
--- a/include/arch/nios2/nios2.h
+++ b/include/arch/nios2/nios2.h
@@ -1,5 +1,5 @@
-#ifndef __NIOS2_H__
-#define __NIOS2_H__
+#ifndef ZEPHYR_INCLUDE_ARCH_NIOS2_NIOS2_H_
+#define ZEPHYR_INCLUDE_ARCH_NIOS2_NIOS2_H_
 
 /******************************************************************************
 *                                                                             *
@@ -322,4 +322,4 @@ static inline u32_t _nios2_reg_read(void *base, int regnum)
 }
 #endif /* __cplusplus */
 
-#endif /* __NIOS2_H__ */
+#endif /* ZEPHYR_INCLUDE_ARCH_NIOS2_NIOS2_H_ */
diff --git a/include/arch/posix/arch.h b/include/arch/posix/arch.h
index ebd4cfef617..f0c9b2fd70b 100644
--- a/include/arch/posix/arch.h
+++ b/include/arch/posix/arch.h
@@ -14,8 +14,8 @@
  */
 
 
-#ifndef _ARCH_IFACE_H
-#define _ARCH_IFACE_H
+#ifndef ZEPHYR_INCLUDE_ARCH_POSIX_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_POSIX_ARCH_H_
 
 #include <toolchain.h>
 #include <irq.h>
@@ -58,4 +58,4 @@ FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
 }
 #endif
 
-#endif /* _ARCH_IFACE_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_POSIX_ARCH_H_ */
diff --git a/include/arch/posix/asm_inline.h b/include/arch/posix/asm_inline.h
index 2f2da775896..540ff13f778 100644
--- a/include/arch/posix/asm_inline.h
+++ b/include/arch/posix/asm_inline.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_PUBLIC_H
-#define _ASM_INLINE_PUBLIC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_POSIX_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_POSIX_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -20,4 +20,4 @@
 #error "Only a compiler with GNU C extensions is supported for the POSIX arch"
 #endif
 
-#endif /* _ASM_INLINE_PUBLIC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_POSIX_ASM_INLINE_H_ */
diff --git a/include/arch/posix/asm_inline_gcc.h b/include/arch/posix/asm_inline_gcc.h
index e4ac227bbd1..4e0e5ad4f73 100644
--- a/include/arch/posix/asm_inline_gcc.h
+++ b/include/arch/posix/asm_inline_gcc.h
@@ -11,8 +11,8 @@
 
 /* Either public functions or macros or invoked by public functions */
 
-#ifndef _ASM_INLINE_GCC_PUBLIC_GCC_H_INCLUDE_ARCH_POSIX
-#define _ASM_INLINE_GCC_PUBLIC_GCC_H_INCLUDE_ARCH_POSIX
+#ifndef ZEPHYR_INCLUDE_ARCH_POSIX_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_POSIX_ASM_INLINE_GCC_H_
 
 /*
  * The file must not be included directly
@@ -195,4 +195,4 @@ static ALWAYS_INLINE
 }
 #endif
 
-#endif /* _ASM_INLINE_GCC_PUBLIC_GCC_H_INCLUDE_ARCH_POSIX */
+#endif /* ZEPHYR_INCLUDE_ARCH_POSIX_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/riscv32/arch.h b/include/arch/riscv32/arch.h
index 3d821ee4310..7f06e5b6b8a 100644
--- a/include/arch/riscv32/arch.h
+++ b/include/arch/riscv32/arch.h
@@ -12,8 +12,8 @@
  * included by the generic kernel interface header (arch/cpu.h)
  */
 
-#ifndef _RISCV32_ARCH_H_
-#define _RISCV32_ARCH_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_ARCH_H_
 
 #include "exp.h"
 #include "sys_io.h"
diff --git a/include/arch/riscv32/exp.h b/include/arch/riscv32/exp.h
index 33a0612e1fc..ec91ce59425 100644
--- a/include/arch/riscv32/exp.h
+++ b/include/arch/riscv32/exp.h
@@ -11,8 +11,8 @@
  * RISCV32-specific kernel exception handling interface.
  */
 
-#ifndef _ARCH_RISCV32_EXP_H_
-#define _ARCH_RISCV32_EXP_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_EXP_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_EXP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -79,4 +79,4 @@ extern void _SysFatalErrorHandler(unsigned int reason,
 }
 #endif
 
-#endif /* _ARCH_RISCV32_EXP_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_RISCV32_EXP_H_ */
diff --git a/include/arch/riscv32/pulpino/asm_inline.h b/include/arch/riscv32/pulpino/asm_inline.h
index 74a653befd1..a24ff4d3467 100644
--- a/include/arch/riscv32/pulpino/asm_inline.h
+++ b/include/arch/riscv32/pulpino/asm_inline.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_PUBLIC_H
-#define _ASM_INLINE_PUBLIC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_PULPINO_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_PULPINO_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -18,4 +18,4 @@
 #error "Supports only GNU C compiler"
 #endif
 
-#endif /* _ASM_INLINE_PUBLIC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_RISCV32_PULPINO_ASM_INLINE_H_ */
diff --git a/include/arch/riscv32/pulpino/asm_inline_gcc.h b/include/arch/riscv32/pulpino/asm_inline_gcc.h
index 2c9a18593c0..f791cb55f97 100644
--- a/include/arch/riscv32/pulpino/asm_inline_gcc.h
+++ b/include/arch/riscv32/pulpino/asm_inline_gcc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_GCC_H
-#define _ASM_INLINE_GCC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_PULPINO_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_PULPINO_ASM_INLINE_GCC_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/arch/riscv32/riscv-privilege/asm_inline.h b/include/arch/riscv32/riscv-privilege/asm_inline.h
index 0e908520346..54dadf0b57c 100644
--- a/include/arch/riscv32/riscv-privilege/asm_inline.h
+++ b/include/arch/riscv32/riscv-privilege/asm_inline.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_PUBLIC_H
-#define _ASM_INLINE_PUBLIC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV_PRIVILEGE_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV_PRIVILEGE_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -19,4 +19,4 @@
 #error "Supports only GNU C compiler"
 #endif
 
-#endif /* _ASM_INLINE_PUBLIC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV_PRIVILEGE_ASM_INLINE_H_ */
diff --git a/include/arch/riscv32/riscv-privilege/asm_inline_gcc.h b/include/arch/riscv32/riscv-privilege/asm_inline_gcc.h
index a20cfc020b6..2ea060ec769 100644
--- a/include/arch/riscv32/riscv-privilege/asm_inline_gcc.h
+++ b/include/arch/riscv32/riscv-privilege/asm_inline_gcc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_GCC_H
-#define _ASM_INLINE_GCC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV_PRIVILEGE_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV_PRIVILEGE_ASM_INLINE_GCC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,4 +62,4 @@ static ALWAYS_INLINE unsigned int find_msb_set(u32_t op)
 }
 #endif
 
-#endif /* _ASM_INLINE_GCC_PUBLIC_GCC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV_PRIVILEGE_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/riscv32/riscv32-qemu/asm_inline.h b/include/arch/riscv32/riscv32-qemu/asm_inline.h
index 7f9d1eb0a26..14dd9a918a5 100644
--- a/include/arch/riscv32/riscv32-qemu/asm_inline.h
+++ b/include/arch/riscv32/riscv32-qemu/asm_inline.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_PUBLIC_H
-#define _ASM_INLINE_PUBLIC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV32_QEMU_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV32_QEMU_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -18,4 +18,4 @@
 #error "Supports only GNU C compiler"
 #endif
 
-#endif /* _ASM_INLINE_PUBLIC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV32_QEMU_ASM_INLINE_H_ */
diff --git a/include/arch/riscv32/riscv32-qemu/asm_inline_gcc.h b/include/arch/riscv32/riscv32-qemu/asm_inline_gcc.h
index 0149b1c3ad4..229336b4dc1 100644
--- a/include/arch/riscv32/riscv32-qemu/asm_inline_gcc.h
+++ b/include/arch/riscv32/riscv32-qemu/asm_inline_gcc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_GCC_H
-#define _ASM_INLINE_GCC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV32_QEMU_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV32_QEMU_ASM_INLINE_GCC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -63,4 +63,4 @@ static ALWAYS_INLINE unsigned int find_msb_set(u32_t op)
 }
 #endif
 
-#endif /* _ASM_INLINE_GCC_PUBLIC_GCC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_RISCV32_RISCV32_QEMU_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/riscv32/sys_io.h b/include/arch/riscv32/sys_io.h
index 91513ba6602..1131aa1b1cd 100644
--- a/include/arch/riscv32/sys_io.h
+++ b/include/arch/riscv32/sys_io.h
@@ -8,8 +8,8 @@
  * @brief RISCV32 memory mapped register I/O operations
  */
 
-#ifndef _RISCV32_SYS_IO_H_
-#define _RISCV32_SYS_IO_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_RISCV32_SYS_IO_H_
+#define ZEPHYR_INCLUDE_ARCH_RISCV32_SYS_IO_H_
 
 #if !defined(_ASMLANGUAGE)
 
@@ -130,4 +130,4 @@ static ALWAYS_INLINE
 
 #endif /* !_ASMLANGUAGE */
 
-#endif /* _RISCV32_SYS_IO_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_RISCV32_SYS_IO_H_ */
diff --git a/include/arch/syscall.h b/include/arch/syscall.h
index 6872ce3ce32..bf45512b04c 100644
--- a/include/arch/syscall.h
+++ b/include/arch/syscall.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ARCHSYSCALL_H__
-#define __ARCHSYSCALL_H__
+#ifndef ZEPHYR_INCLUDE_ARCH_SYSCALL_H_
+#define ZEPHYR_INCLUDE_ARCH_SYSCALL_H_
 
 #if defined(CONFIG_X86)
 #include <arch/x86/syscall.h>
@@ -17,4 +17,4 @@
 #include <arch/arc/syscall.h>
 #endif
 
-#endif /* __ARCHSYSCALL_H__ */
+#endif /* ZEPHYR_INCLUDE_ARCH_SYSCALL_H_ */
diff --git a/include/arch/x86/addr_types.h b/include/arch/x86/addr_types.h
index 7b874bfb169..b8e295e5005 100644
--- a/include/arch/x86/addr_types.h
+++ b/include/arch/x86/addr_types.h
@@ -6,10 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _x86_addr_types__h_
-#define _x86_addr_types__h_
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_
 
 typedef unsigned int paddr_t;
 typedef unsigned int vaddr_t;
 
-#endif /* _x86_addr_types__h_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ */
diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h
index 01bb41b4e55..dac31e37a77 100644
--- a/include/arch/x86/arch.h
+++ b/include/arch/x86/arch.h
@@ -11,8 +11,8 @@
  * by the generic kernel interface header (include/arch/cpu.h)
  */
 
-#ifndef _ARCH_IFACE_H
-#define _ARCH_IFACE_H
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_
 
 #include <irq.h>
 #include <arch/x86/irq_controller.h>
@@ -693,4 +693,4 @@ void _x86_mmu_set_flags(void *ptr,
 }
 #endif
 
-#endif /* _ARCH_IFACE_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_ */
diff --git a/include/arch/x86/asm.h b/include/arch/x86/asm.h
index ed8c4c6d119..830c6a0763a 100644
--- a/include/arch/x86/asm.h
+++ b/include/arch/x86/asm.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INCsysX86Asmh
-#define __INCsysX86Asmh
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_ASM_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_ASM_H_
 
 
 #include <toolchain.h>
@@ -76,4 +76,4 @@
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* __INCsysX86Asmh */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_ASM_H_ */
diff --git a/include/arch/x86/asm_inline.h b/include/arch/x86/asm_inline.h
index f89e87f689a..375ad003341 100644
--- a/include/arch/x86/asm_inline.h
+++ b/include/arch/x86/asm_inline.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ASM_INLINE_PUBLIC_H
-#define _ASM_INLINE_PUBLIC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -20,4 +20,4 @@
 #include <arch/x86/asm_inline_other.h>
 #endif
 
-#endif /* _ASM_INLINE_PUBLIC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_ASM_INLINE_H_ */
diff --git a/include/arch/x86/asm_inline_gcc.h b/include/arch/x86/asm_inline_gcc.h
index 383a6c9142e..3420dbe837d 100644
--- a/include/arch/x86/asm_inline_gcc.h
+++ b/include/arch/x86/asm_inline_gcc.h
@@ -8,8 +8,8 @@
 
 /* Either public functions or macros or invoked by public functions */
 
-#ifndef _ASM_INLINE_GCC_PUBLIC_GCC_H
-#define _ASM_INLINE_GCC_PUBLIC_GCC_H
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_ASM_INLINE_GCC_H_
 
 /*
  * The file must not be included directly
@@ -486,4 +486,4 @@ static ALWAYS_INLINE
 }
 #endif
 
-#endif /* _ASM_INLINE_GCC_PUBLIC_GCC_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/x86/irq_controller.h b/include/arch/x86/irq_controller.h
index 83ffcac8a83..80edca6d38b 100644
--- a/include/arch/x86/irq_controller.h
+++ b/include/arch/x86/irq_controller.h
@@ -14,8 +14,8 @@
  * and the interrupt controller implementation for x86
  */
 
-#ifndef IRQ_CONTROLLER_H
-#define IRQ_CONTROLLER_H
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_
 
 #ifdef CONFIG_MVIC
 #include <drivers/mvic.h>
@@ -110,4 +110,4 @@ static inline void _irq_controller_eoi(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* IRQ_CONTROLLER_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_IRQ_CONTROLLER_H_ */
diff --git a/include/arch/x86/segmentation.h b/include/arch/x86/segmentation.h
index 23b3dcbd018..325ea897d72 100644
--- a/include/arch/x86/segmentation.h
+++ b/include/arch/x86/segmentation.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SEGMENTATION_H
-#define _SEGMENTATION_H
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_
 
 #include <zephyr/types.h>
 
@@ -559,4 +559,4 @@ static inline u16_t _get_ds(void)
 }
 #endif
 
-#endif /* _SEGMENTATION_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_ */
diff --git a/include/arch/x86/syscall.h b/include/arch/x86/syscall.h
index db99fd10efc..6531f98d7e5 100644
--- a/include/arch/x86/syscall.h
+++ b/include/arch/x86/syscall.h
@@ -13,8 +13,8 @@
  * (include/arch/syscall.h)
  */
 
-#ifndef _X86_SYSCALL__H_
-#define _X86_SYSCALL__H_
+#ifndef ZEPHYR_INCLUDE_ARCH_X86_SYSCALL_H_
+#define ZEPHYR_INCLUDE_ARCH_X86_SYSCALL_H_
 
 #define USER_CODE_SEG	0x2b /* at dpl=3 */
 #define USER_DATA_SEG	0x33 /* at dpl=3 */
@@ -168,4 +168,4 @@ static inline int _arch_is_user_context(void)
 
 #endif /* _ASMLANGUAGE */
 #endif /* CONFIG_USERSPACE */
-#endif /* _X86_SYSCALL__H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_X86_SYSCALL_H_ */
diff --git a/include/arch/xtensa/addr_types.h b/include/arch/xtensa/addr_types.h
index 0ecabdce4d5..4363da1cab6 100644
--- a/include/arch/xtensa/addr_types.h
+++ b/include/arch/xtensa/addr_types.h
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef XTENSA_ADDR_TYPES_H
-#define XTENSA_ADDR_TYPES_H
+#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_
+#define ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_
 
 #ifndef _ASMLANGUAGE
 typedef unsigned int paddr_t;
 typedef unsigned int vaddr_t;
 #endif
 
-#endif /* XTENSA_ADDR_TYPES_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_ */
 
diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h
index 45fcc813bd6..b6efd9301a3 100644
--- a/include/arch/xtensa/arch.h
+++ b/include/arch/xtensa/arch.h
@@ -10,8 +10,8 @@
  * by the generic kernel interface header (include/arch/cpu.h)
  */
 
-#ifndef _ARCH_IFACE_H
-#define _ARCH_IFACE_H
+#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_XTENSA_ARCH_H_
 
 #include <irq.h>
 
@@ -139,4 +139,4 @@ extern u32_t _timer_cycle_get_32(void);
 }
 #endif
 
-#endif /* _ARCH_IFACE_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_ARCH_H_ */
diff --git a/include/arch/xtensa/exc.h b/include/arch/xtensa/exc.h
index c8f22146ae5..e7ed410d092 100644
--- a/include/arch/xtensa/exc.h
+++ b/include/arch/xtensa/exc.h
@@ -12,8 +12,8 @@
  * arch/xtensa/arch.h.
  */
 
-#ifndef _ARCH_XTENSA_EXC_H_
-#define _ARCH_XTENSA_EXC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_EXC_H_
+#define ZEPHYR_INCLUDE_ARCH_XTENSA_EXC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,4 +42,4 @@ extern const NANO_ESF _default_esf;
 #endif
 
 
-#endif /* _ARCH_XTENSA_EXC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_EXC_H_ */
diff --git a/include/arch/xtensa/sys_io.h b/include/arch/xtensa/sys_io.h
index 9953742efae..7168dff0172 100644
--- a/include/arch/xtensa/sys_io.h
+++ b/include/arch/xtensa/sys_io.h
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef XTENSA_SYS_IO_H
-#define XTENSA_SYS_IO_H
+#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_SYS_IO_H_
+#define ZEPHYR_INCLUDE_ARCH_XTENSA_SYS_IO_H_
 
 #if !defined(_ASMLANGUAGE)
 
@@ -119,4 +119,4 @@ static ALWAYS_INLINE
 #endif /* !_ASMLANGUAGE */
 
 
-#endif /* XTENSA_SYS_IO_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_SYS_IO_H_ */
diff --git a/include/arch/xtensa/xtensa_irq.h b/include/arch/xtensa/xtensa_irq.h
index 80933a98bd8..31f2d507a2a 100644
--- a/include/arch/xtensa/xtensa_irq.h
+++ b/include/arch/xtensa/xtensa_irq.h
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef XTENSA_IRQ_H
-#define XTENSA_IRQ_H
+#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_XTENSA_IRQ_H_
+#define ZEPHYR_INCLUDE_ARCH_XTENSA_XTENSA_IRQ_H_
 
 #include <xtensa_api.h>
 #include <xtensa/xtruntime.h>
@@ -73,4 +73,4 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
 
 #include <irq.h>
 
-#endif /* XTENSA_IRQ_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_XTENSA_IRQ_H_ */
diff --git a/include/atomic.h b/include/atomic.h
index 449fa6466f4..1e24539e909 100644
--- a/include/atomic.h
+++ b/include/atomic.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ATOMIC_H__
-#define __ATOMIC_H__
+#ifndef ZEPHYR_INCLUDE_ATOMIC_H_
+#define ZEPHYR_INCLUDE_ATOMIC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -417,4 +417,4 @@ static inline void atomic_set_bit(atomic_t *target, int bit)
 }
 #endif
 
-#endif /* __ATOMIC_H__ */
+#endif /* ZEPHYR_INCLUDE_ATOMIC_H_ */
diff --git a/include/audio/codec.h b/include/audio/codec.h
index 3935ecbbe94..2424838a677 100644
--- a/include/audio/codec.h
+++ b/include/audio/codec.h
@@ -11,8 +11,8 @@
  * This file contains the Audio Codec APIs
  */
 
-#ifndef __AUDIO_CODEC_H__
-#define __AUDIO_CODEC_H__
+#ifndef ZEPHYR_INCLUDE_AUDIO_CODEC_H_
+#define ZEPHYR_INCLUDE_AUDIO_CODEC_H_
 
 #include <i2s.h>
 
@@ -212,4 +212,4 @@ static inline int audio_codec_apply_properties(struct device *dev)
 }
 #endif
 
-#endif /* __AUDIO_CODEC_H__ */
+#endif /* ZEPHYR_INCLUDE_AUDIO_CODEC_H_ */
diff --git a/include/audio/dmic.h b/include/audio/dmic.h
index 15e03ab303a..c4161f6670e 100644
--- a/include/audio/dmic.h
+++ b/include/audio/dmic.h
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __AUDIO_DMIC_H__
-#define __AUDIO_DMIC_H__
+#ifndef ZEPHYR_INCLUDE_AUDIO_DMIC_H_
+#define ZEPHYR_INCLUDE_AUDIO_DMIC_H_
 
 #include <kernel.h>
 #include <device.h>
@@ -273,4 +273,4 @@ static inline int dmic_read(struct device *dev, u8_t stream, void **buffer,
 }
 #endif
 
-#endif /* __AUDIO_DMIC_H__ */
+#endif /* ZEPHYR_INCLUDE_AUDIO_DMIC_H_ */
diff --git a/include/base64.h b/include/base64.h
index 62653bfcd24..b168a391753 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -21,8 +21,8 @@
  *  - Removed mbedtls_ prefixes
  *  - Reworked coding style
  */
-#ifndef __BASE64_H__
-#define __BASE64_H__
+#ifndef ZEPHYR_INCLUDE_BASE64_H_
+#define ZEPHYR_INCLUDE_BASE64_H_
 
 #include <stddef.h>
 #include <zephyr/types.h>
@@ -76,4 +76,4 @@ int base64_decode(u8_t *dst, size_t dlen, size_t *olen, const u8_t *src,
 }
 #endif
 
-#endif /* __BASE64_H__ */
+#endif /* ZEPHYR_INCLUDE_BASE64_H_ */
diff --git a/include/bluetooth/a2dp-codec.h b/include/bluetooth/a2dp-codec.h
index 3c0ea3e916b..d6b96a8b175 100644
--- a/include/bluetooth/a2dp-codec.h
+++ b/include/bluetooth/a2dp-codec.h
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __BT_A2DP_SBC_H
-#define __BT_A2DP_SBC_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_A2DP_CODEC_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_A2DP_CODEC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ struct bt_a2dp_codec_sbc_params {
 }
 #endif
 
-#endif /* __BT_A2DP_SBC_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_A2DP_CODEC_H_ */
diff --git a/include/bluetooth/a2dp.h b/include/bluetooth/a2dp.h
index f1aaead46ca..9f20e229907 100644
--- a/include/bluetooth/a2dp.h
+++ b/include/bluetooth/a2dp.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_A2DP_H
-#define __BT_A2DP_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_A2DP_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_A2DP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -108,4 +108,4 @@ int bt_a2dp_register_endpoint(struct bt_a2dp_endpoint *endpoint,
 }
 #endif
 
-#endif /* __BT_A2DP_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_A2DP_H_ */
diff --git a/include/bluetooth/att.h b/include/bluetooth/att.h
index 38ca3bbcdf5..6885441c140 100644
--- a/include/bluetooth/att.h
+++ b/include/bluetooth/att.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_ATT_H
-#define __BT_ATT_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_ATT_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_ATT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,4 +62,4 @@ struct bt_att_req {
 }
 #endif
 
-#endif /* __BT_ATT_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_ATT_H_ */
diff --git a/include/bluetooth/avdtp.h b/include/bluetooth/avdtp.h
index ceb84a85df4..c053a3be3dc 100644
--- a/include/bluetooth/avdtp.h
+++ b/include/bluetooth/avdtp.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_AVDTP_H
-#define __BT_AVDTP_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_AVDTP_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_AVDTP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,4 +51,4 @@ struct bt_avdtp_stream {
 }
 #endif
 
-#endif /* __BT_AVDTP_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_AVDTP_H_ */
diff --git a/include/bluetooth/bluetooth.h b/include/bluetooth/bluetooth.h
index b8a7ef3caaf..37abd48d5b4 100644
--- a/include/bluetooth/bluetooth.h
+++ b/include/bluetooth/bluetooth.h
@@ -8,8 +8,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_BLUETOOTH_H
-#define __BT_BLUETOOTH_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_BLUETOOTH_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_BLUETOOTH_H_
 
 /**
  * @brief Bluetooth APIs
@@ -689,4 +689,4 @@ int bt_unpair(u8_t id, const bt_addr_le_t *addr);
  * @}
  */
 
-#endif /* __BT_BLUETOOTH_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_BLUETOOTH_H_ */
diff --git a/include/bluetooth/buf.h b/include/bluetooth/buf.h
index 148ed9648f2..a71f14ed0e6 100644
--- a/include/bluetooth/buf.h
+++ b/include/bluetooth/buf.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __BT_BUF_H
-#define __BT_BUF_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_BUF_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_BUF_H_
 
 /**
  * @brief Data buffers
@@ -95,4 +95,4 @@ static inline enum bt_buf_type bt_buf_get_type(struct net_buf *buf)
  * @}
  */
 
-#endif /* __BT_BUF_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_BUF_H_ */
diff --git a/include/bluetooth/conn.h b/include/bluetooth/conn.h
index b8ce9e3d8c1..755492e79a1 100644
--- a/include/bluetooth/conn.h
+++ b/include/bluetooth/conn.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_CONN_H
-#define __BT_CONN_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_CONN_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_CONN_H_
 
 /**
  * @brief Connection management
@@ -665,4 +665,4 @@ struct bt_conn *bt_conn_create_sco(const bt_addr_t *peer);
  * @}
  */
 
-#endif /* __BT_CONN_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_CONN_H_ */
diff --git a/include/bluetooth/crypto.h b/include/bluetooth/crypto.h
index 8ee807ff84d..4f2034c4068 100644
--- a/include/bluetooth/crypto.h
+++ b/include/bluetooth/crypto.h
@@ -8,8 +8,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_CRYPTO_H
-#define __BT_CRYPTO_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_CRYPTO_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_CRYPTO_H_
 
 /**
  * @brief Cryptography
@@ -74,4 +74,4 @@ int bt_encrypt_be(const u8_t key[16], const u8_t plaintext[16],
  * @}
  */
 
-#endif /* __BT_CRYPTO_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_CRYPTO_H_ */
diff --git a/include/bluetooth/gatt.h b/include/bluetooth/gatt.h
index 42170d74224..7a48f524158 100644
--- a/include/bluetooth/gatt.h
+++ b/include/bluetooth/gatt.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_GATT_H
-#define __BT_GATT_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_GATT_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_GATT_H_
 
 /**
  * @brief Generic Attribute Profile (GATT)
@@ -1090,4 +1090,4 @@ void bt_gatt_cancel(struct bt_conn *conn, void *params);
  * @}
  */
 
-#endif /* __BT_GATT_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_GATT_H_ */
diff --git a/include/bluetooth/hci.h b/include/bluetooth/hci.h
index 21f163891fc..155f7e2af9c 100644
--- a/include/bluetooth/hci.h
+++ b/include/bluetooth/hci.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_HCI_H
-#define __BT_HCI_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_HCI_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_HCI_H_
 
 #include <toolchain.h>
 #include <zephyr/types.h>
@@ -1902,4 +1902,4 @@ int bt_hci_cmd_send_sync(u16_t opcode, struct net_buf *buf,
 }
 #endif
 
-#endif /* __BT_HCI_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_HCI_H_ */
diff --git a/include/bluetooth/hci_raw.h b/include/bluetooth/hci_raw.h
index 6b51981e522..dba2d4af5fe 100644
--- a/include/bluetooth/hci_raw.h
+++ b/include/bluetooth/hci_raw.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_HCI_RAW_H
-#define __BT_HCI_RAW_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_HCI_RAW_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_HCI_RAW_H_
 
 /**
  * @brief HCI RAW channel
@@ -51,4 +51,4 @@ int bt_enable_raw(struct k_fifo *rx_queue);
  * @}
  */
 
-#endif /* __BT_HCI_RAW_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_HCI_RAW_H_ */
diff --git a/include/bluetooth/hci_vs.h b/include/bluetooth/hci_vs.h
index 55d0fc4a189..3ae73981f62 100644
--- a/include/bluetooth/hci_vs.h
+++ b/include/bluetooth/hci_vs.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_HCI_VS_H
-#define __BT_HCI_VS_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_HCI_VS_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_HCI_VS_H_
 
 #include <bluetooth/hci.h>
 
@@ -167,4 +167,4 @@ struct bt_hci_evt_vs_scan_req_rx {
 }
 #endif
 
-#endif /* __BT_HCI_VS_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_HCI_VS_H_ */
diff --git a/include/bluetooth/hfp_hf.h b/include/bluetooth/hfp_hf.h
index 509a811bb83..1ae0567ba09 100644
--- a/include/bluetooth/hfp_hf.h
+++ b/include/bluetooth/hfp_hf.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_HFP_H
-#define __BT_HFP_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_HFP_HF_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_HFP_HF_H_
 
 /**
  * @brief Hands Free Profile (HFP)
@@ -169,4 +169,4 @@ int bt_hfp_hf_send_cmd(struct bt_conn *conn, enum bt_hfp_hf_at_cmd cmd);
  * @}
  */
 
-#endif /* __BT_HFP_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_HFP_HF_H_ */
diff --git a/include/bluetooth/l2cap.h b/include/bluetooth/l2cap.h
index ae2b463676b..589028e6ee3 100644
--- a/include/bluetooth/l2cap.h
+++ b/include/bluetooth/l2cap.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_L2CAP_H
-#define __BT_L2CAP_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_L2CAP_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_L2CAP_H_
 
 /**
  * @brief L2CAP
@@ -332,4 +332,4 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf);
  * @}
  */
 
-#endif /* __BT_L2CAP_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_L2CAP_H_ */
diff --git a/include/bluetooth/mesh.h b/include/bluetooth/mesh.h
index 2acf8c20f01..ef4e2982d17 100644
--- a/include/bluetooth/mesh.h
+++ b/include/bluetooth/mesh.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_H
-#define __BT_MESH_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_H_
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -22,4 +22,4 @@
 #include <bluetooth/mesh/health_cli.h>
 #include <bluetooth/mesh/proxy.h>
 
-#endif /* __BT_MESH_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_H_ */
diff --git a/include/bluetooth/mesh/access.h b/include/bluetooth/mesh/access.h
index 721bf47a473..bb13aca0ebf 100644
--- a/include/bluetooth/mesh/access.h
+++ b/include/bluetooth/mesh/access.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_ACCESS_H
-#define __BT_MESH_ACCESS_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_ACCESS_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_ACCESS_H_
 
 /**
  * @brief Bluetooth Mesh Access Layer
@@ -421,4 +421,4 @@ struct bt_mesh_comp {
  * @}
  */
 
-#endif /* __BT_MESH_ACCESS_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_ACCESS_H_ */
diff --git a/include/bluetooth/mesh/cfg_cli.h b/include/bluetooth/mesh/cfg_cli.h
index 01c6f64ddc8..dbb4b299435 100644
--- a/include/bluetooth/mesh/cfg_cli.h
+++ b/include/bluetooth/mesh/cfg_cli.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_CFG_CLI_H
-#define __BT_MESH_CFG_CLI_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_CFG_CLI_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_CFG_CLI_H_
 
 /**
  * @brief Bluetooth Mesh
@@ -181,4 +181,4 @@ void bt_mesh_cfg_cli_timeout_set(s32_t timeout);
  * @}
  */
 
-#endif /* __BT_MESH_CFG_CLI_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_CFG_CLI_H_ */
diff --git a/include/bluetooth/mesh/cfg_srv.h b/include/bluetooth/mesh/cfg_srv.h
index 5b7ba0c3650..36e3c5e2a53 100644
--- a/include/bluetooth/mesh/cfg_srv.h
+++ b/include/bluetooth/mesh/cfg_srv.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_CFG_SRV_H
-#define __BT_MESH_CFG_SRV_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_CFG_SRV_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_CFG_SRV_H_
 
 /**
  * @brief Bluetooth Mesh
@@ -66,4 +66,4 @@ extern const struct bt_mesh_model_op bt_mesh_cfg_srv_op[];
  * @}
  */
 
-#endif /* __BT_MESH_CFG_SRV_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_CFG_SRV_H_ */
diff --git a/include/bluetooth/mesh/health_cli.h b/include/bluetooth/mesh/health_cli.h
index 8b890422eae..709e7b645e7 100644
--- a/include/bluetooth/mesh/health_cli.h
+++ b/include/bluetooth/mesh/health_cli.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_HEALTH_CLI_H
-#define __BT_MESH_HEALTH_CLI_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_HEALTH_CLI_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_HEALTH_CLI_H_
 
 /**
  * @brief Bluetooth Mesh
@@ -69,4 +69,4 @@ void bt_mesh_health_cli_timeout_set(s32_t timeout);
  * @}
  */
 
-#endif /* __BT_MESH_HEALTH_CLI_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_HEALTH_CLI_H_ */
diff --git a/include/bluetooth/mesh/health_srv.h b/include/bluetooth/mesh/health_srv.h
index 65644bb1bba..77a7389b870 100644
--- a/include/bluetooth/mesh/health_srv.h
+++ b/include/bluetooth/mesh/health_srv.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_HEALTH_SRV_H
-#define __BT_MESH_HEALTH_SRV_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_HEALTH_SRV_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_HEALTH_SRV_H_
 
 /**
  * @brief Bluetooth Mesh Health Server Model
@@ -87,4 +87,4 @@ extern const struct bt_mesh_model_op bt_mesh_health_srv_op[];
  * @}
  */
 
-#endif /* __BT_MESH_HEALTH_SRV_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_HEALTH_SRV_H_ */
diff --git a/include/bluetooth/mesh/main.h b/include/bluetooth/mesh/main.h
index 6d756dd29f4..82f322496e3 100644
--- a/include/bluetooth/mesh/main.h
+++ b/include/bluetooth/mesh/main.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_MAIN_H
-#define __BT_MESH_MAIN_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_MAIN_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_MAIN_H_
 
 /**
  * @brief Bluetooth Mesh Provisioning
@@ -360,4 +360,4 @@ void bt_mesh_lpn_set_cb(void (*cb)(u16_t friend_addr, bool established));
  * @}
  */
 
-#endif /* __BT_MESH_MAIN_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_MAIN_H_ */
diff --git a/include/bluetooth/mesh/proxy.h b/include/bluetooth/mesh/proxy.h
index 55c74e90272..419cb57fa20 100644
--- a/include/bluetooth/mesh/proxy.h
+++ b/include/bluetooth/mesh/proxy.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_MESH_PROXY_H
-#define __BT_MESH_PROXY_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_MESH_PROXY_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_MESH_PROXY_H_
 
 /**
  * @brief Bluetooth Mesh Proxy
@@ -32,4 +32,4 @@ int bt_mesh_proxy_identity_enable(void);
  * @}
  */
 
-#endif /* __BT_MESH_PROXY_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_MESH_PROXY_H_ */
diff --git a/include/bluetooth/rfcomm.h b/include/bluetooth/rfcomm.h
index fa2350f14d9..296efe16e97 100644
--- a/include/bluetooth/rfcomm.h
+++ b/include/bluetooth/rfcomm.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_RFCOMM_H
-#define __BT_RFCOMM_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_RFCOMM_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_RFCOMM_H_
 
 /**
  * @brief RFCOMM
@@ -187,4 +187,4 @@ struct net_buf *bt_rfcomm_create_pdu(struct net_buf_pool *pool);
  * @}
  */
 
-#endif /* __BT_RFCOMM_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_RFCOMM_H_ */
diff --git a/include/bluetooth/sdp.h b/include/bluetooth/sdp.h
index 16ac7005221..9f14aad5022 100644
--- a/include/bluetooth/sdp.h
+++ b/include/bluetooth/sdp.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_SDP_H
-#define __BT_SDP_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_SDP_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_SDP_H_
 
 /**
  * @brief Service Discovery Protocol (SDP)
@@ -609,4 +609,4 @@ int bt_sdp_get_features(const struct net_buf *buf, u16_t *features);
  * @}
  */
 
-#endif /* __BT_SDP_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_SDP_H_ */
diff --git a/include/bluetooth/testing.h b/include/bluetooth/testing.h
index f5fc3a2bc92..71a44941102 100644
--- a/include/bluetooth/testing.h
+++ b/include/bluetooth/testing.h
@@ -8,8 +8,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_TESTING_H
-#define __BT_TESTING_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_
 
 /**
  * @brief Bluetooth testing
@@ -90,4 +90,4 @@ int bt_test_mesh_rpl_clear(void);
 }
 #endif
 
-#endif /* __BT_TESTING_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_ */
diff --git a/include/bluetooth/uuid.h b/include/bluetooth/uuid.h
index 558bff0d77d..cc6bbbbe0b8 100644
--- a/include/bluetooth/uuid.h
+++ b/include/bluetooth/uuid.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_UUID_H
-#define __BT_UUID_H
+#ifndef ZEPHYR_INCLUDE_BLUETOOTH_UUID_H_
+#define ZEPHYR_INCLUDE_BLUETOOTH_UUID_H_
 
 /**
  * @brief UUIDs
@@ -496,4 +496,4 @@ static inline const char *bt_uuid_str(const struct bt_uuid *uuid)
  * @}
  */
 
-#endif /* __BT_UUID_H */
+#endif /* ZEPHYR_INCLUDE_BLUETOOTH_UUID_H_ */
diff --git a/include/cache.h b/include/cache.h
index f193dde4e7c..5158730d8f2 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _cache__h_
-#define _cache__h_
+#ifndef ZEPHYR_INCLUDE_CACHE_H_
+#define ZEPHYR_INCLUDE_CACHE_H_
 
 #include <kernel.h>
 
@@ -57,4 +57,4 @@ static inline _sys_cache_flush_sig(sys_cache_flush)
 }
 #endif
 
-#endif /* _cache__h_ */
+#endif /* ZEPHYR_INCLUDE_CACHE_H_ */
diff --git a/include/can.h b/include/can.h
index b86fb816df1..c8575bd9e62 100644
--- a/include/can.h
+++ b/include/can.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __DRIVERS_CAN_H
-#define __DRIVERS_CAN_H
+#ifndef ZEPHYR_INCLUDE_CAN_H_
+#define ZEPHYR_INCLUDE_CAN_H_
 
 /**
  * @brief CAN Interface
@@ -378,4 +378,4 @@ static inline int _impl_can_configure(struct device *dev, enum can_mode mode,
  */
 #include <syscalls/can.h>
 
-#endif /*__DRIVERS_CAN_H*/
+#endif /* ZEPHYR_INCLUDE_CAN_H_ */
diff --git a/include/clock_control.h b/include/clock_control.h
index 9a8bd9a4e21..85de5882f92 100644
--- a/include/clock_control.h
+++ b/include/clock_control.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __CLOCK_CONTROL_H__
-#define __CLOCK_CONTROL_H__
+#ifndef ZEPHYR_INCLUDE_CLOCK_CONTROL_H_
+#define ZEPHYR_INCLUDE_CLOCK_CONTROL_H_
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -93,4 +93,4 @@ static inline int clock_control_get_rate(struct device *dev,
 }
 #endif
 
-#endif /* __CLOCK_CONTROL_H__ */
+#endif /* ZEPHYR_INCLUDE_CLOCK_CONTROL_H_ */
diff --git a/include/cmsis_rtos_v1/cmsis_os.h b/include/cmsis_rtos_v1/cmsis_os.h
index 8222b89365d..4b6277fabdb 100644
--- a/include/cmsis_rtos_v1/cmsis_os.h
+++ b/include/cmsis_rtos_v1/cmsis_os.h
@@ -42,8 +42,8 @@
  *---------------------------------------------------------------------------*/
  
  
-#ifndef _CMSIS_OS_H
-#define _CMSIS_OS_H
+#ifndef ZEPHYR_INCLUDE_CMSIS_RTOS_V1_CMSIS_OS_H_
+#define ZEPHYR_INCLUDE_CMSIS_RTOS_V1_CMSIS_OS_H_
  
 /// \note MUST REMAIN UNCHANGED: \b osCMSIS identifies the CMSIS-RTOS API version.
 #define osCMSIS           0x10002      ///< API version (main [31:16] .sub [15:0])
@@ -712,4 +712,4 @@ osStatus osMailFree (osMailQId queue_id, void *mail);
 }
 #endif
  
-#endif  // _CMSIS_OS_H
+#endif  /* ZEPHYR_INCLUDE_CMSIS_RTOS_V1_CMSIS_OS_H_ */
diff --git a/include/console.h b/include/console.h
index 231ad0e6f18..a7641695d77 100644
--- a/include/console.h
+++ b/include/console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __CONSOLE_H__
-#define __CONSOLE_H__
+#ifndef ZEPHYR_INCLUDE_CONSOLE_H_
+#define ZEPHYR_INCLUDE_CONSOLE_H_
 
 #include <zephyr/types.h>
 #include <kernel.h>
@@ -102,4 +102,4 @@ void console_register_line_input(struct k_fifo *avail_queue,
 }
 #endif
 
-#endif /* __CONSOLE_H__ */
+#endif /* ZEPHYR_INCLUDE_CONSOLE_H_ */
diff --git a/include/counter.h b/include/counter.h
index a5d192a2e19..1a515aea514 100644
--- a/include/counter.h
+++ b/include/counter.h
@@ -9,8 +9,8 @@
  * @brief Public API for counter and timer drivers
  */
 
-#ifndef __COUNTER_H__
-#define __COUNTER_H__
+#ifndef ZEPHYR_INCLUDE_COUNTER_H_
+#define ZEPHYR_INCLUDE_COUNTER_H_
 
 /**
  * @brief Counter Interface
@@ -155,4 +155,4 @@ static inline int _impl_counter_get_pending_int(struct device *dev)
 
 #include <syscalls/counter.h>
 
-#endif /* __COUNTER_H__ */
+#endif /* ZEPHYR_INCLUDE_COUNTER_H_ */
diff --git a/include/crc16.h b/include/crc16.h
index a5485e38157..9ab0fcd06ec 100644
--- a/include/crc16.h
+++ b/include/crc16.h
@@ -7,8 +7,8 @@
  * @brief CRC 16 computation function
  */
 
-#ifndef __CRC16_H
-#define __CRC16_H
+#ifndef ZEPHYR_INCLUDE_CRC16_H_
+#define ZEPHYR_INCLUDE_CRC16_H_
 
 #include <zephyr/types.h>
 #include <stdbool.h>
diff --git a/include/crc32.h b/include/crc32.h
index e27af36c0b1..0d0b9296f63 100644
--- a/include/crc32.h
+++ b/include/crc32.h
@@ -10,8 +10,8 @@
  * @brief CRC 32 computation function
  */
 
-#ifndef __CRC32_H
-#define __CRC32_H
+#ifndef ZEPHYR_INCLUDE_CRC32_H_
+#define ZEPHYR_INCLUDE_CRC32_H_
 
 #include <zephyr/types.h>
 #include <stdbool.h>
diff --git a/include/crc8.h b/include/crc8.h
index c2bea9469e3..d7cbf5a9fcc 100644
--- a/include/crc8.h
+++ b/include/crc8.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __CRC8_H_
-#define __CRC8_H_
+#ifndef ZEPHYR_INCLUDE_CRC8_H_
+#define ZEPHYR_INCLUDE_CRC8_H_
 
 #include <zephyr/types.h>
 #include <stddef.h>
diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h
index 0a69f16c452..96af98a9a92 100644
--- a/include/crypto/cipher.h
+++ b/include/crypto/cipher.h
@@ -14,8 +14,8 @@
  * as a part of ongoing development.
  */
 
-#ifndef __CRYPTO_CIPHER_H__
-#define __CRYPTO_CIPHER_H__
+#ifndef ZEPHYR_INCLUDE_CRYPTO_CIPHER_H_
+#define ZEPHYR_INCLUDE_CRYPTO_CIPHER_H_
 
 #include <device.h>
 #include <errno.h>
@@ -268,4 +268,4 @@ static inline int cipher_ccm_op(struct cipher_ctx *ctx,
 	return ctx->ops.ccm_crypt_hndlr(ctx, pkt, nonce);
 }
 
-#endif /* __CRYPTO_CIPHER_H__ */
+#endif /* ZEPHYR_INCLUDE_CRYPTO_CIPHER_H_ */
diff --git a/include/crypto/cipher_structs.h b/include/crypto/cipher_structs.h
index 02772a2f64e..a0fef2dd463 100644
--- a/include/crypto/cipher_structs.h
+++ b/include/crypto/cipher_structs.h
@@ -14,8 +14,8 @@
  * as a part of ongoing development.
  */
 
-#ifndef __CRYPTO_CIPHER_STRUCTS_H__
-#define __CRYPTO_CIPHER_STRUCTS_H__
+#ifndef ZEPHYR_INCLUDE_CRYPTO_CIPHER_STRUCTS_H_
+#define ZEPHYR_INCLUDE_CRYPTO_CIPHER_STRUCTS_H_
 
 #include <device.h>
 #include <misc/util.h>
@@ -243,4 +243,4 @@ struct cipher_aead_pkt {
  */
 typedef void (*crypto_completion_cb)(struct cipher_pkt *completed, int status);
 
-#endif /* __CRYPTO_CIPHER_STRUCTS_H__ */
+#endif /* ZEPHYR_INCLUDE_CRYPTO_CIPHER_STRUCTS_H_ */
diff --git a/include/debug/gdb_server.h b/include/debug/gdb_server.h
index 955ada778e2..d296fd13af3 100644
--- a/include/debug/gdb_server.h
+++ b/include/debug/gdb_server.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __MISC_DEBUG_GDB_SERVER__H_
-#define __MISC_DEBUG_GDB_SERVER__H_
+#ifndef ZEPHYR_INCLUDE_DEBUG_GDB_SERVER_H_
+#define ZEPHYR_INCLUDE_DEBUG_GDB_SERVER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,4 +65,4 @@ extern void gdb_handler(enum gdb_exc_mode mode, void *esf, int signal);
 #ifdef __cplusplus
 }
 #endif
-#endif /* __MISC_DEBUG_GDB_SERVER__H_*/
+#endif /* ZEPHYR_INCLUDE_DEBUG_GDB_SERVER_H_*/
diff --git a/include/debug/object_tracing.h b/include/debug/object_tracing.h
index 7e357cd47d1..f2c8e7c6421 100644
--- a/include/debug/object_tracing.h
+++ b/include/debug/object_tracing.h
@@ -9,8 +9,8 @@
  * @brief APIs used when examining the objects in a debug tracing list.
  */
 
-#ifndef _OBJECT_TRACING_H_
-#define _OBJECT_TRACING_H_
+#ifndef ZEPHYR_INCLUDE_DEBUG_OBJECT_TRACING_H_
+#define ZEPHYR_INCLUDE_DEBUG_OBJECT_TRACING_H_
 
 #ifdef CONFIG_OBJECT_TRACING
 
@@ -85,4 +85,4 @@ extern struct k_queue	 *_trace_list_k_queue;
 
 #endif /*CONFIG_THREAD_MONITOR*/
 
-#endif /*_OBJECT_TRACING_H_*/
+#endif /*ZEPHYR_INCLUDE_DEBUG_OBJECT_TRACING_H_*/
diff --git a/include/debug/object_tracing_common.h b/include/debug/object_tracing_common.h
index cfa88c44f29..ed1167e0af9 100644
--- a/include/debug/object_tracing_common.h
+++ b/include/debug/object_tracing_common.h
@@ -9,8 +9,8 @@
  * @brief APIs used to add or remove an object in a debug tracing list.
  */
 
-#ifndef _OBJECT_TRACING_COMMON_H_
-#define _OBJECT_TRACING_COMMON_H_
+#ifndef ZEPHYR_INCLUDE_DEBUG_OBJECT_TRACING_COMMON_H_
+#define ZEPHYR_INCLUDE_DEBUG_OBJECT_TRACING_COMMON_H_
 
 #ifndef CONFIG_OBJECT_TRACING
 
@@ -98,4 +98,4 @@
 	while (0)
 
 #endif  /*CONFIG_OBJECT_TRACING*/
-#endif  /*_OBJECT_TRACING_COMMON_H_*/
+#endif  /*ZEPHYR_INCLUDE_DEBUG_OBJECT_TRACING_COMMON_H_*/
diff --git a/include/device.h b/include/device.h
index a5f6580659f..6dff831d179 100644
--- a/include/device.h
+++ b/include/device.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _DEVICE_H_
-#define _DEVICE_H_
+#ifndef ZEPHYR_INCLUDE_DEVICE_H_
+#define ZEPHYR_INCLUDE_DEVICE_H_
 
 #include <kernel.h>
 
@@ -434,4 +434,4 @@ int device_busy_check(struct device *chk_dev);
 /**
  * @}
  */
-#endif /* _DEVICE_H_ */
+#endif /* ZEPHYR_INCLUDE_DEVICE_H_ */
diff --git a/include/dfu/flash_img.h b/include/dfu/flash_img.h
index 0862baf2920..4a887913bb7 100644
--- a/include/dfu/flash_img.h
+++ b/include/dfu/flash_img.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __FLASH_IMG_H__
-#define __FLASH_IMG_H__
+#ifndef ZEPHYR_INCLUDE_DFU_FLASH_IMG_H_
+#define ZEPHYR_INCLUDE_DFU_FLASH_IMG_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,4 +60,4 @@ int flash_img_buffered_write(struct flash_img_context *ctx, u8_t *data,
 }
 #endif
 
-#endif	/* __FLASH_IMG_H__ */
+#endif	/* ZEPHYR_INCLUDE_DFU_FLASH_IMG_H_ */
diff --git a/include/dfu/mcuboot.h b/include/dfu/mcuboot.h
index 6a706c4e4de..085439b358f 100644
--- a/include/dfu/mcuboot.h
+++ b/include/dfu/mcuboot.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __MCUBOOT_H__
-#define __MCUBOOT_H__
+#ifndef ZEPHYR_INCLUDE_DFU_MCUBOOT_H_
+#define ZEPHYR_INCLUDE_DFU_MCUBOOT_H_
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -167,4 +167,4 @@ int boot_request_upgrade(int permanent);
  */
 int boot_erase_img_bank(u32_t bank_offset);
 
-#endif  /* __MCUBOOT_H__ */
+#endif  /* ZEPHYR_INCLUDE_DFU_MCUBOOT_H_ */
diff --git a/include/disk_access.h b/include/disk_access.h
index 29235419703..4beca021f6a 100644
--- a/include/disk_access.h
+++ b/include/disk_access.h
@@ -14,8 +14,8 @@
  * and Filesystems.
  */
 
-#ifndef _DISK_ACCESS_H_
-#define _DISK_ACCESS_H_
+#ifndef ZEPHYR_INCLUDE_DISK_ACCESS_H_
+#define ZEPHYR_INCLUDE_DISK_ACCESS_H_
 
 #include <kernel.h>
 #include <zephyr/types.h>
@@ -128,4 +128,4 @@ int disk_access_unregister(struct disk_info *disk);
 }
 #endif
 
-#endif /* _DISK_ACCESS_H_ */
+#endif /* ZEPHYR_INCLUDE_DISK_ACCESS_H_ */
diff --git a/include/display/grove_lcd.h b/include/display/grove_lcd.h
index dfa1b554405..ca9335c9c95 100644
--- a/include/display/grove_lcd.h
+++ b/include/display/grove_lcd.h
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef DISPLAY_GROVE_LCD_H
-#define DISPLAY_GROVE_LCD_H
+#ifndef ZEPHYR_INCLUDE_DISPLAY_GROVE_LCD_H_
+#define ZEPHYR_INCLUDE_DISPLAY_GROVE_LCD_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -179,4 +179,4 @@ int glcd_initialize(struct device *port);
 }
 #endif
 
-#endif /* DISPLAY_GROVE_LCD_H */
+#endif /* ZEPHYR_INCLUDE_DISPLAY_GROVE_LCD_H_ */
diff --git a/include/display/mb_display.h b/include/display/mb_display.h
index 24e2e319a8f..63ddaaf75c4 100644
--- a/include/display/mb_display.h
+++ b/include/display/mb_display.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __MB_DISPLAY_H
-#define __MB_DISPLAY_H
+#ifndef ZEPHYR_INCLUDE_DISPLAY_MB_DISPLAY_H_
+#define ZEPHYR_INCLUDE_DISPLAY_MB_DISPLAY_H_
 
 /**
  * @brief BBC micro:bit display APIs
@@ -166,4 +166,4 @@ void mb_display_stop(struct mb_display *disp);
  * @}
  */
 
-#endif /* __MB_DISPLAY_H */
+#endif /* ZEPHYR_INCLUDE_DISPLAY_MB_DISPLAY_H_ */
diff --git a/include/dma.h b/include/dma.h
index 29a12c2f1c1..378ae7d04e3 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _DMA_H_
-#define _DMA_H_
+#ifndef ZEPHYR_INCLUDE_DMA_H_
+#define ZEPHYR_INCLUDE_DMA_H_
 
 #include <kernel.h>
 #include <device.h>
@@ -306,4 +306,4 @@ static inline u32_t dma_burst_index(u32_t burst)
 
 #include <syscalls/dma.h>
 
-#endif /* _DMA_H_ */
+#endif /* ZEPHYR_INCLUDE_DMA_H_ */
diff --git a/include/drivers/bluetooth/hci_driver.h b/include/drivers/bluetooth/hci_driver.h
index a8977b8a8e0..9f92326d67d 100644
--- a/include/drivers/bluetooth/hci_driver.h
+++ b/include/drivers/bluetooth/hci_driver.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __BT_HCI_DRIVER_H
-#define __BT_HCI_DRIVER_H
+#ifndef ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_
+#define ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_
 
 /**
  * @brief HCI drivers
@@ -175,4 +175,4 @@ int bt_hci_driver_register(const struct bt_hci_driver *drv);
  * @}
  */
 
-#endif /* __BT_HCI_DRIVER_H */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_BLUETOOTH_HCI_DRIVER_H_ */
diff --git a/include/drivers/clock_control/arm_clock_control.h b/include/drivers/clock_control/arm_clock_control.h
index 6d0c4121333..af0e88e25b3 100644
--- a/include/drivers/clock_control/arm_clock_control.h
+++ b/include/drivers/clock_control/arm_clock_control.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ARM_CLOCK_CONTROL_H_
-#define _ARM_CLOCK_CONTROL_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_ARM_CLOCK_CONTROL_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_ARM_CLOCK_CONTROL_H_
 
 #include <clock_control.h>
 
@@ -37,4 +37,4 @@ struct arm_clock_control_t {
 	u32_t device;
 };
 
-#endif /* _ARM_CLOCK_CONTROL_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_ARM_CLOCK_CONTROL_H_ */
diff --git a/include/drivers/clock_control/nrf5_clock_control.h b/include/drivers/clock_control/nrf5_clock_control.h
index 350e6a6211f..2b0c42f309a 100644
--- a/include/drivers/clock_control/nrf5_clock_control.h
+++ b/include/drivers/clock_control/nrf5_clock_control.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _NRF5_CLOCK_CONTROL_H_
-#define _NRF5_CLOCK_CONTROL_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF5_CLOCK_CONTROL_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF5_CLOCK_CONTROL_H_
 
 #if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
 #include <device.h>
@@ -59,4 +59,4 @@ bool nrf5_power_clock_usb_vbusdet(struct device *dev);
 bool nrf5_power_clock_usb_outrdy(struct device *dev);
 #endif
 
-#endif /* _NRF5_CLOCK_CONTROL_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_NRF5_CLOCK_CONTROL_H_ */
diff --git a/include/drivers/clock_control/quark_se_clock_control.h b/include/drivers/clock_control/quark_se_clock_control.h
index afae6eccc3a..f6b4a0274db 100644
--- a/include/drivers/clock_control/quark_se_clock_control.h
+++ b/include/drivers/clock_control/quark_se_clock_control.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __QUARK_SE_CLOCK_CONTROL_H__
-#define __QUARK_SE_CLOCK_CONTROL_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_QUARK_SE_CLOCK_CONTROL_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_QUARK_SE_CLOCK_CONTROL_H_
 
 enum quark_se_peripheral_clocks {
 	QUARK_SE_PERIPH_PCLK_EN = 0,
@@ -51,4 +51,4 @@ enum quark_se_sensor_clocks {
 	QUARK_SE_CCU_ADC_CLK_EN,
 };
 
-#endif /* __QUARK_SE_CLOCK_CONTROL_H__ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_QUARK_SE_CLOCK_CONTROL_H_ */
diff --git a/include/drivers/clock_control/stm32_clock_control.h b/include/drivers/clock_control/stm32_clock_control.h
index ab48dbe110d..d3d4584fa4c 100644
--- a/include/drivers/clock_control/stm32_clock_control.h
+++ b/include/drivers/clock_control/stm32_clock_control.h
@@ -6,8 +6,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _STM32_CLOCK_CONTROL_H_
-#define _STM32_CLOCK_CONTROL_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_STM32_CLOCK_CONTROL_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_STM32_CLOCK_CONTROL_H_
 
 #include <clock_control.h>
 #include <dt-bindings/clock/stm32_clock.h>
@@ -20,4 +20,4 @@ struct stm32_pclken {
 	u32_t enr;
 };
 
-#endif /* _STM32_CLOCK_CONTROL_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CLOCK_CONTROL_STM32_CLOCK_CONTROL_H_ */
diff --git a/include/drivers/console/console.h b/include/drivers/console/console.h
index 63b7798f322..08ce1077deb 100644
--- a/include/drivers/console/console.h
+++ b/include/drivers/console/console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __DRIVERS_CONSOLE_CONSOLE_H__
-#define __DRIVERS_CONSOLE_CONSOLE_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_CONSOLE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_CONSOLE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,4 +48,4 @@ typedef void (*console_input_fn)(struct k_fifo *avail, struct k_fifo *lines,
 }
 #endif
 
-#endif /* __DRIVERS_CONSOLE_CONSOLE_H__ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CONSOLE_CONSOLE_H_ */
diff --git a/include/drivers/console/ipm_console.h b/include/drivers/console/ipm_console.h
index 786561350f2..11782cb34c4 100644
--- a/include/drivers/console/ipm_console.h
+++ b/include/drivers/console/ipm_console.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _IPM_CONSOLE_H_
-#define _IPM_CONSOLE_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_IPM_CONSOLE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_IPM_CONSOLE_H_
 
 #include <kernel.h>
 #include <device.h>
@@ -105,4 +105,4 @@ int ipm_console_sender_init(struct device *d);
 }
 #endif
 
-#endif /* _IPM_CONSOLE_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CONSOLE_IPM_CONSOLE_H_ */
diff --git a/include/drivers/console/native_posix_console.h b/include/drivers/console/native_posix_console.h
index f90c028d3f1..b5b556c3f64 100644
--- a/include/drivers/console/native_posix_console.h
+++ b/include/drivers/console/native_posix_console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _NATIVE_POSIX_CONSOLE_H
-#define _NATIVE_POSIX_CONSOLE_H
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_NATIVE_POSIX_CONSOLE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_NATIVE_POSIX_CONSOLE_H_
 
 #include "kernel.h"
 
@@ -26,4 +26,4 @@ void native_stdin_register_input(struct k_fifo *avail, struct k_fifo *lines,
 }
 #endif
 
-#endif /* _NATIVE_POSIX_CONSOLE_H */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CONSOLE_NATIVE_POSIX_CONSOLE_H_ */
diff --git a/include/drivers/console/telnet_console.h b/include/drivers/console/telnet_console.h
index 530888e24b6..d4003baf974 100644
--- a/include/drivers/console/telnet_console.h
+++ b/include/drivers/console/telnet_console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __TELNET_CONSOLE_H__
-#define __TELNET_CONSOLE_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_TELNET_CONSOLE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_TELNET_CONSOLE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,4 +34,4 @@ void telnet_register_input(struct k_fifo *avail, struct k_fifo *lines,
 }
 #endif
 
-#endif /* __TELNET_CONSOLE_H__ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CONSOLE_TELNET_CONSOLE_H_ */
diff --git a/include/drivers/console/uart_console.h b/include/drivers/console/uart_console.h
index 7e4684eb60f..a996db4ecf5 100644
--- a/include/drivers/console/uart_console.h
+++ b/include/drivers/console/uart_console.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _UART_CONSOLE__H_
-#define _UART_CONSOLE__H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_CONSOLE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_CONSOLE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,4 +54,4 @@ void uart_console_in_debug_hook_install(uart_console_in_debug_hook_t hook);
 }
 #endif
 
-#endif /* _UART_CONSOLE__H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_CONSOLE_H_ */
diff --git a/include/drivers/console/uart_mcumgr.h b/include/drivers/console/uart_mcumgr.h
index 770d78df037..8fe43984d0b 100644
--- a/include/drivers/console/uart_mcumgr.h
+++ b/include/drivers/console/uart_mcumgr.h
@@ -10,8 +10,8 @@
  * @see include/mgmt/serial.h
  */
 
-#ifndef H_UART_MCUMGR_
-#define H_UART_MCUMGR_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_MCUMGR_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_UART_MCUMGR_H_
 
 #include <stdlib.h>
 #include <zephyr/types.h>
diff --git a/include/drivers/console/websocket_console.h b/include/drivers/console/websocket_console.h
index 2ce36ac5e98..f0f6cd32ffa 100644
--- a/include/drivers/console/websocket_console.h
+++ b/include/drivers/console/websocket_console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __WS_CONSOLE_H__
-#define __WS_CONSOLE_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_CONSOLE_WEBSOCKET_CONSOLE_H_
+#define ZEPHYR_INCLUDE_DRIVERS_CONSOLE_WEBSOCKET_CONSOLE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,4 +34,4 @@ void ws_register_input(struct k_fifo *avail, struct k_fifo *lines,
 }
 #endif
 
-#endif /* __WS_CONSOLE_H__ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_CONSOLE_WEBSOCKET_CONSOLE_H_ */
diff --git a/include/drivers/display/ili9340.h b/include/drivers/display/ili9340.h
index d143983767a..0bbceaf8f48 100644
--- a/include/drivers/display/ili9340.h
+++ b/include/drivers/display/ili9340.h
@@ -2,8 +2,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ILI9340_H
-#define ILI9340_H
+#ifndef ZEPHYR_INCLUDE_DRIVERS_DISPLAY_ILI9340_H_
+#define ZEPHYR_INCLUDE_DRIVERS_DISPLAY_ILI9340_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,4 +57,4 @@ void ili9340_display_off(struct device *dev);
 }
 #endif
 
-#endif /* ILI9340_H */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_DISPLAY_ILI9340_H_ */
diff --git a/include/drivers/entropy/nrf5_entropy.h b/include/drivers/entropy/nrf5_entropy.h
index 0eb372d8220..dcd4a68679c 100644
--- a/include/drivers/entropy/nrf5_entropy.h
+++ b/include/drivers/entropy/nrf5_entropy.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _NRF5_ENTROPY_H_
-#define _NRF5_ENTROPY_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_ENTROPY_NRF5_ENTROPY_H_
+#define ZEPHYR_INCLUDE_DRIVERS_ENTROPY_NRF5_ENTROPY_H_
 
 /**
  * @brief Fills a buffer with entropy in a non-blocking manner.
@@ -18,4 +18,4 @@
  */
 u8_t entropy_nrf_get_entropy_isr(struct device *dev, u8_t *buf, u8_t len);
 
-#endif /* _NRF5_ENTROPY_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_ENTROPY_NRF5_ENTROPY_H_ */
diff --git a/include/drivers/gpio/gpio_esp32.h b/include/drivers/gpio/gpio_esp32.h
index 91afdc2c570..eaad3afabd1 100644
--- a/include/drivers/gpio/gpio_esp32.h
+++ b/include/drivers/gpio/gpio_esp32.h
@@ -2,8 +2,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __GPIO_ESP32_H__
-#define __GPIO_ESP32_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_ESP32_H_
+#define ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_ESP32_H_
 
 static const char *gpio_esp32_get_gpio_for_pin(int pin)
 {
@@ -22,4 +22,4 @@ static const char *gpio_esp32_get_gpio_for_pin(int pin)
 #endif /* CONFIG_GPIO_ESP32_1 */
 }
 
-#endif /* __GPIO_ESP32_H__ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_ESP32_H_ */
diff --git a/include/drivers/gpio/gpio_mmio32.h b/include/drivers/gpio/gpio_mmio32.h
index 228f14938e0..1285e283527 100644
--- a/include/drivers/gpio/gpio_mmio32.h
+++ b/include/drivers/gpio/gpio_mmio32.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _GPIO_MMIO32_H_
-#define _GPIO_MMIO32_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_MMIO32_H_
+#define ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_MMIO32_H_
 
 #include <device.h>
 #include <gpio.h>
@@ -61,4 +61,4 @@ DEVICE_INIT(_dev_name, _drv_name,					\
 #endif
 
 
-#endif /* _GPIO_MMIO32_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_GPIO_GPIO_MMIO32_H_ */
diff --git a/include/drivers/i2c/slave/eeprom.h b/include/drivers/i2c/slave/eeprom.h
index b64693a6c02..d90bf920546 100644
--- a/include/drivers/i2c/slave/eeprom.h
+++ b/include/drivers/i2c/slave/eeprom.h
@@ -9,8 +9,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef I2C_EEPROM_SLAVE_H
-#define I2C_EEPROM_SLAVE_H
+#ifndef ZEPHYR_INCLUDE_DRIVERS_I2C_SLAVE_EEPROM_H_
+#define ZEPHYR_INCLUDE_DRIVERS_I2C_SLAVE_EEPROM_H_
 
 /**
  * @brief I2C EEPROM Slave Driver API
@@ -49,4 +49,4 @@ int eeprom_slave_read(struct device *dev, u8_t *eeprom_data,
  * @}
  */
 
-#endif /* I2C_EEPROM_SLAVE_H */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_I2C_SLAVE_EEPROM_H_ */
diff --git a/include/drivers/ieee802154/cc1200.h b/include/drivers/ieee802154/cc1200.h
index cf8ace2ceb3..6a1fe9e02e8 100644
--- a/include/drivers/ieee802154/cc1200.h
+++ b/include/drivers/ieee802154/cc1200.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __CC1200_H__
-#define __CC1200_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_IEEE802154_CC1200_H_
+#define ZEPHYR_INCLUDE_DRIVERS_IEEE802154_CC1200_H_
 
 #include <device.h>
 
@@ -56,4 +56,4 @@ struct cc1200_gpio_configuration {
 
 struct cc1200_gpio_configuration *cc1200_configure_gpios(void);
 
-#endif /* __CC1200_H__ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_IEEE802154_CC1200_H_ */
diff --git a/include/drivers/ioapic.h b/include/drivers/ioapic.h
index 564fe63cbad..25ad5075bc2 100644
--- a/include/drivers/ioapic.h
+++ b/include/drivers/ioapic.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INCioapich
-#define __INCioapich
+#ifndef ZEPHYR_INCLUDE_DRIVERS_IOAPIC_H_
+#define ZEPHYR_INCLUDE_DRIVERS_IOAPIC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,4 +45,4 @@ void _ioapic_irq_set(unsigned int irq, unsigned int vector, u32_t flags);
 }
 #endif
 
-#endif /* __INCioapich */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_IOAPIC_H_ */
diff --git a/include/drivers/loapic.h b/include/drivers/loapic.h
index f73bd9f396b..b6965e27125 100644
--- a/include/drivers/loapic.h
+++ b/include/drivers/loapic.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INCloapich
-#define __INCloapich
+#ifndef ZEPHYR_INCLUDE_DRIVERS_LOAPIC_H_
+#define ZEPHYR_INCLUDE_DRIVERS_LOAPIC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,4 +60,4 @@ extern void _lakemont_eoi(void);
 }
 #endif
 
-#endif /* __INCloapich */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_LOAPIC_H_ */
diff --git a/include/drivers/modem/modem_receiver.h b/include/drivers/modem/modem_receiver.h
index 632de7e8fb0..76a4b28648c 100644
--- a/include/drivers/modem/modem_receiver.h
+++ b/include/drivers/modem/modem_receiver.h
@@ -11,8 +11,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _MODEM_RECEIVER_H_
-#define _MODEM_RECEIVER_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_RECEIVER_H_
+#define ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_RECEIVER_H_
 
 #include <stdlib.h>
 #include <kernel.h>
@@ -52,4 +52,4 @@ int mdm_receiver_register(struct mdm_receiver_context *ctx,
 }
 #endif
 
-#endif /* _MODEM_RECEIVER_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_MODEM_MODEM_RECEIVER_H_ */
diff --git a/include/drivers/mvic.h b/include/drivers/mvic.h
index 410b4b29d8a..be0ebfae655 100644
--- a/include/drivers/mvic.h
+++ b/include/drivers/mvic.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef MVIC_H
-#define MVIC_H
+#ifndef ZEPHYR_INCLUDE_DRIVERS_MVIC_H_
+#define ZEPHYR_INCLUDE_DRIVERS_MVIC_H_
 
 #include <arch/cpu.h>
 
@@ -72,4 +72,4 @@ static inline void __irq_controller_eoi(void)
 
 #endif
 
-#endif /* MVIC_H */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_MVIC_H_ */
diff --git a/include/drivers/pci/pci.h b/include/drivers/pci/pci.h
index 0b9818104ae..6567b51b520 100644
--- a/include/drivers/pci/pci.h
+++ b/include/drivers/pci/pci.h
@@ -11,8 +11,8 @@
  * Module declares routines of PCI bus initialization and query
  */
 
-#ifndef _PCI_H_
-#define _PCI_H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_PCI_PCI_H_
+#define ZEPHYR_INCLUDE_DRIVERS_PCI_PCI_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -75,4 +75,4 @@ extern void pci_show(struct pci_dev_info *dev_info);
 }
 #endif
 
-#endif /* _PCI_H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_PCI_PCI_H_ */
diff --git a/include/drivers/pci/pci_mgr.h b/include/drivers/pci/pci_mgr.h
index 9c64ffb9d2e..4ad9a6307ad 100644
--- a/include/drivers/pci/pci_mgr.h
+++ b/include/drivers/pci/pci_mgr.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __inc_pci_mgr_h
-#define __inc_pci_mgr_h
+#ifndef ZEPHYR_INCLUDE_DRIVERS_PCI_PCI_MGR_H_
+#define ZEPHYR_INCLUDE_DRIVERS_PCI_PCI_MGR_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1603,4 +1603,4 @@ extern int pci_config_ext_cap_ptr_find(
 }
 #endif /* __cplusplus */
 
-#endif /* __inc_pci_mgr_h */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_PCI_PCI_MGR_H_ */
diff --git a/include/drivers/sysapic.h b/include/drivers/sysapic.h
index 6264d740565..3c25e4f2f36 100644
--- a/include/drivers/sysapic.h
+++ b/include/drivers/sysapic.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_SYS_APIC_H
-#define __INC_SYS_APIC_H
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_
 
 #include <drivers/loapic.h>
 
@@ -60,4 +60,4 @@ static inline void __irq_controller_eoi(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* __INC_SYS_APIC_H */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SYSAPIC_H_ */
diff --git a/include/drivers/system_timer.h b/include/drivers/system_timer.h
index bb48712ddc1..9fa129a1817 100644
--- a/include/drivers/system_timer.h
+++ b/include/drivers/system_timer.h
@@ -12,8 +12,8 @@
  * Declare API implemented by system timer driver and used by kernel components.
  */
 
-#ifndef _TIMER__H_
-#define _TIMER__H_
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SYSTEM_TIMER_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SYSTEM_TIMER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -88,4 +88,4 @@ static inline void _sys_clock_final_tick_announce(void)
 }
 #endif
 
-#endif /* _TIMER__H_ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SYSTEM_TIMER_H_ */
diff --git a/include/drivers/usb/usb_dc.h b/include/drivers/usb/usb_dc.h
index f4b8dc17b35..db49f75a6d6 100644
--- a/include/drivers/usb/usb_dc.h
+++ b/include/drivers/usb/usb_dc.h
@@ -14,8 +14,8 @@
  * drivers should implement the APIs described in this file.
  */
 
-#ifndef __USB_DC_H__
-#define __USB_DC_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_USB_USB_DC_H_
+#define ZEPHYR_INCLUDE_DRIVERS_USB_USB_DC_H_
 
 #include <device.h>
 
@@ -394,4 +394,4 @@ int usb_dc_ep_mps(u8_t ep);
  * @}
  */
 
-#endif /* __USB_DC_H__ */
+#endif /* ZEPHYR_INCLUDE_DRIVERS_USB_USB_DC_H_ */
diff --git a/include/dt-bindings/clock/imx_ccm.h b/include/dt-bindings/clock/imx_ccm.h
index 82668ed3cf3..f04cc56a547 100644
--- a/include/dt-bindings/clock/imx_ccm.h
+++ b/include/dt-bindings/clock/imx_ccm.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IMX_CCM_H
-#define __IMX_CCM_H
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_IMX_CCM_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_IMX_CCM_H_
 
 #define IMX_CCM_CORESYS_CLK		0
 #define IMX_CCM_PLATFORM_CLK		1
@@ -13,4 +13,4 @@
 #define IMX_CCM_LPUART_CLK		3
 #define IMX_CCM_LPI2C_CLK		4
 
-#endif /* __IMX_CCM_H */
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_IMX_CCM_H_ */
diff --git a/include/dt-bindings/clock/kinetis_sim.h b/include/dt-bindings/clock/kinetis_sim.h
index 25edaf3b09c..f6c53e3f877 100644
--- a/include/dt-bindings/clock/kinetis_sim.h
+++ b/include/dt-bindings/clock/kinetis_sim.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __KINETIS_SIM_H
-#define __KINETIS_SIM_H
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_KINETIS_SIM_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_KINETIS_SIM_H_
 
 #define KINETIS_SIM_CORESYS_CLK		0
 #define KINETIS_SIM_PLATFORM_CLK	1
 #define KINETIS_SIM_BUS_CLK		2
 #define KINETIS_SIM_LPO_CLK		19
 
-#endif /* __KINETIS_SIM_H */
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_KINETIS_SIM_H_ */
diff --git a/include/dt-bindings/clock/stm32_clock.h b/include/dt-bindings/clock/stm32_clock.h
index cef35c078f9..9e187783682 100644
--- a/include/dt-bindings/clock/stm32_clock.h
+++ b/include/dt-bindings/clock/stm32_clock.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __STM32_CLOCK_H
-#define __STM32_CLOCK_H
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32_CLOCK_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32_CLOCK_H_
 
 /* clock bus references */
 #define STM32_CLOCK_BUS_AHB1    0
@@ -15,4 +15,4 @@
 #define STM32_CLOCK_BUS_IOP     5
 
 
-#endif /* __STM32_CLOCK_H */
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_CLOCK_STM32_CLOCK_H_ */
diff --git a/include/dt-bindings/gpio/gpio.h b/include/dt-bindings/gpio/gpio.h
index fe1105a8964..21fd0dfa6ce 100644
--- a/include/dt-bindings/gpio/gpio.h
+++ b/include/dt-bindings/gpio/gpio.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __DT_BINDINGS_GPIO_GPIO_H
-#define __DT_BINDINGS_GPIO_GPIO_H
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_GPIO_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_GPIO_H_
 
 
 /**
@@ -180,4 +180,4 @@
 
 
 
-#endif /* __DT_BINDINGS_GPIO_GPIO_H */
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_GPIO_GPIO_H_ */
diff --git a/include/dt-bindings/i2c/i2c.h b/include/dt-bindings/i2c/i2c.h
index 358fc947096..b0a25842638 100644
--- a/include/dt-bindings/i2c/i2c.h
+++ b/include/dt-bindings/i2c/i2c.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __DT_BINDINGS_I2C_I2C_H
-#define __DT_BINDINGS_I2C_I2C_H
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_I2C_I2C_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_I2C_I2C_H_
 
 #define I2C_BITRATE_STANDARD	100000	/* 100 Kbit/s */
 #define I2C_BITRATE_FAST	400000	/* 400 Kbit/s */
@@ -12,4 +12,4 @@
 #define I2C_BITRATE_HIGH	3400000	/* 3.4 Mbit/s */
 #define I2C_BITRATE_ULTRA	5000000 /* 5 Mbit/s */
 
-#endif /* __DT_BINDINGS_I2C_I2C_H */
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_I2C_I2C_H_ */
diff --git a/include/dt-bindings/interrupt-controller/intel-ioapic.h b/include/dt-bindings/interrupt-controller/intel-ioapic.h
index 1d4c65827d5..493cfb807a3 100644
--- a/include/dt-bindings/interrupt-controller/intel-ioapic.h
+++ b/include/dt-bindings/interrupt-controller/intel-ioapic.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __DT_BINDING_IRQ_H
-#define __DT_BINDING_IRQ_H
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_INTEL_IOAPIC_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_INTERRUPT_CONTROLLER_INTEL_IOAPIC_H_
 
 #define	IRQ_TYPE_LEVEL			0x00008000
 #define	IRQ_TYPE_EDGE			0x00000000
diff --git a/include/dt-bindings/pinctrl/stm32-pinctrl-common.h b/include/dt-bindings/pinctrl/stm32-pinctrl-common.h
index 8c63ec3b9e0..c58e91f32f7 100644
--- a/include/dt-bindings/pinctrl/stm32-pinctrl-common.h
+++ b/include/dt-bindings/pinctrl/stm32-pinctrl-common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32_PINCTRL_COMMON_H_
-#define _STM32_PINCTRL_COMMON_H_
+#ifndef ZEPHYR_STM32_PINCTRL_COMMON_H_
+#define ZEPHYR_STM32_PINCTRL_COMMON_H_
 
 
 /**
@@ -233,4 +233,4 @@
 #define STM32_PIN_PK14  STM32PIN(STM32_PORTK, 14)
 #define STM32_PIN_PK15  STM32PIN(STM32_PORTK, 15)
 
-#endif	/* _STM32_PINCTRL_COMMON_H_ */
+#endif	/* ZEPHYR_STM32_PINCTRL_COMMON_H_ */
diff --git a/include/dt-bindings/pinctrl/stm32-pinctrl.h b/include/dt-bindings/pinctrl/stm32-pinctrl.h
index ebb1546d189..36adde514e2 100644
--- a/include/dt-bindings/pinctrl/stm32-pinctrl.h
+++ b/include/dt-bindings/pinctrl/stm32-pinctrl.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32_PINCTRL_H_
-#define _STM32_PINCTRL_H_
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_STM32_PINCTRL_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_STM32_PINCTRL_H_
 
 #include <dt-bindings/pinctrl/stm32-pinctrl-common.h>
 /**
@@ -94,4 +94,4 @@
 #define STM32_OPENDRAIN_PULLUP   (STM32_OTYPER_OPEN_DRAIN | STM32_PUPDR_PULL_UP)
 #define STM32_PUSHPULL_PULLUP	 (STM32_OTYPER_PUSH_PULL | STM32_PUPDR_PULL_UP)
 
-#endif	/* _STM32_PINCTRL_H_ */
+#endif	/* ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_STM32_PINCTRL_H_ */
diff --git a/include/dt-bindings/pinctrl/stm32-pinctrlf1.h b/include/dt-bindings/pinctrl/stm32-pinctrlf1.h
index 5f267e37d8d..d816c4b8297 100644
--- a/include/dt-bindings/pinctrl/stm32-pinctrlf1.h
+++ b/include/dt-bindings/pinctrl/stm32-pinctrlf1.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _STM32_PINCTRLF1_H_
-#define _STM32_PINCTRLF1_H_
+#ifndef ZEPHYR_STM32_PINCTRLF1_H_
+#define ZEPHYR_STM32_PINCTRLF1_H_
 
 #include <dt-bindings/pinctrl/stm32-pinctrl-common.h>
 
@@ -107,4 +107,4 @@
 #define STM32_PIN_SPI_SLAVE_NSS		(STM32_MODE_INPUT | STM32_CNF_IN_FLOAT)
 #define STM32_PIN_USB			(STM32_MODE_INPUT | STM32_CNF_IN_PUPD)
 
-#endif	/* _STM32_PINCTRLF1_H_ */
+#endif	/* ZEPHYR_STM32_PINCTRLF1_H_ */
diff --git a/include/dt-bindings/rdc/imx_rdc.h b/include/dt-bindings/rdc/imx_rdc.h
index acfae545cad..1fb4c35dd79 100644
--- a/include/dt-bindings/rdc/imx_rdc.h
+++ b/include/dt-bindings/rdc/imx_rdc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __IMX_RDC_H
-#define __IMX_RDC_H
+#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_RDC_IMX_RDC_H_
+#define ZEPHYR_INCLUDE_DT_BINDINGS_RDC_IMX_RDC_H_
 
 #define A7_DOMAIN_ID	0
 #define A9_DOMAIN_ID	0
@@ -18,4 +18,4 @@
 
 #define RDC_DOMAIN_PERM(domain, perm) (perm << (domain * 2))
 
-#endif /* __IMX_RDC_H */
+#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_RDC_IMX_RDC_H_ */
diff --git a/include/entropy.h b/include/entropy.h
index f8d919558f2..30d10fe4319 100644
--- a/include/entropy.h
+++ b/include/entropy.h
@@ -10,8 +10,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __ENTROPY_H__
-#define __ENTROPY_H__
+#ifndef ZEPHYR_INCLUDE_ENTROPY_H_
+#define ZEPHYR_INCLUDE_ENTROPY_H_
 
 /**
  * @brief Entropy Interface
@@ -112,4 +112,4 @@ static inline int entropy_get_entropy_isr(struct device *dev,
 
 #include <syscalls/entropy.h>
 
-#endif /* __ENTROPY_H__ */
+#endif /* ZEPHYR_INCLUDE_ENTROPY_H_ */
diff --git a/include/exc_handle.h b/include/exc_handle.h
index 982c92d322b..f28955f7daf 100644
--- a/include/exc_handle.h
+++ b/include/exc_handle.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ZEPHYR_EXC_HANDLE_H_
-#define _ZEPHYR_EXC_HANDLE_H_
+#ifndef ZEPHYR_INCLUDE_EXC_HANDLE_H_
+#define ZEPHYR_INCLUDE_EXC_HANDLE_H_
 
 /*
  * This is used by some architectures to define code ranges which may
@@ -42,4 +42,4 @@ struct z_exc_handle {
 	extern void (*name ## _fault_end)(void); \
 	extern void (*name ## _fixup)(void)
 
-#endif /* _ZEPHYR_EXC_HANDLE_H_ */
+#endif /* ZEPHYR_INCLUDE_EXC_HANDLE_H_ */
diff --git a/include/fcb.h b/include/fcb.h
index 49d595d1779..698fa3d3e1f 100644
--- a/include/fcb.h
+++ b/include/fcb.h
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __FCB_H_
-#define __FCB_H_
+#ifndef ZEPHYR_INCLUDE_FCB_H_
+#define ZEPHYR_INCLUDE_FCB_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -143,4 +143,4 @@ int fcb_flash_write(const struct fcb *fcb, const struct flash_sector *sector,
 }
 #endif
 
-#endif /* __FCB_H_ */
+#endif /* ZEPHYR_INCLUDE_FCB_H_ */
diff --git a/include/flash.h b/include/flash.h
index 838110bc35e..fa255f9ba46 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -10,8 +10,8 @@
  * @brief Public API for FLASH drivers
  */
 
-#ifndef __FLASH_H__
-#define __FLASH_H__
+#ifndef ZEPHYR_INCLUDE_FLASH_H_
+#define ZEPHYR_INCLUDE_FLASH_H_
 
 /**
  * @brief FLASH Interface
@@ -280,4 +280,4 @@ static inline size_t _impl_flash_get_write_block_size(struct device *dev)
 
 #include <syscalls/flash.h>
 
-#endif /* _FLASH_H_ */
+#endif /* ZEPHYR_INCLUDE_FLASH_H_ */
diff --git a/include/flash_map.h b/include/flash_map.h
index 9c9682fa767..752a43b5f86 100644
--- a/include/flash_map.h
+++ b/include/flash_map.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __FLASH_MAP_H__
-#define __FLASH_MAP_H__
+#ifndef ZEPHYR_INCLUDE_FLASH_MAP_H_
+#define ZEPHYR_INCLUDE_FLASH_MAP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -81,4 +81,4 @@ int flash_area_get_sectors(int fa_id, u32_t *count,
 }
 #endif
 
-#endif /* __FLASH_MAP_H__ */
+#endif /* ZEPHYR_INCLUDE_FLASH_MAP_H_ */
diff --git a/include/fs.h b/include/fs.h
index bbb850baf6c..de9222f87ba 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _FS_H_
-#define _FS_H_
+#ifndef ZEPHYR_INCLUDE_FS_H_
+#define ZEPHYR_INCLUDE_FS_H_
 
 #ifdef CONFIG_ARCH_POSIX
 #ifndef __ssize_t_defined
@@ -494,4 +494,4 @@ int fs_unregister(enum fs_type type, struct fs_file_system_t *fs);
 }
 #endif
 
-#endif /* _FS_H_ */
+#endif /* ZEPHYR_INCLUDE_FS_H_ */
diff --git a/include/fs/fs_interface.h b/include/fs/fs_interface.h
index 616da92403b..4284bfc2ab9 100644
--- a/include/fs/fs_interface.h
+++ b/include/fs/fs_interface.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _FS_INTERFACE_H_
-#define _FS_INTERFACE_H_
+#ifndef ZEPHYR_INCLUDE_FS_FS_INTERFACE_H_
+#define ZEPHYR_INCLUDE_FS_FS_INTERFACE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,4 +45,4 @@ struct fs_dir_t {
 }
 #endif
 
-#endif /* _FS_INTERFACE_H_ */
+#endif /* ZEPHYR_INCLUDE_FS_FS_INTERFACE_H_ */
diff --git a/include/gpio.h b/include/gpio.h
index d174837b8b8..bb804846635 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -10,8 +10,8 @@
  * @brief Public APIs for GPIO drivers
  */
 
-#ifndef __GPIO_H__
-#define __GPIO_H__
+#ifndef ZEPHYR_INCLUDE_GPIO_H_
+#define ZEPHYR_INCLUDE_GPIO_H_
 
 #include <misc/__assert.h>
 #include <misc/slist.h>
@@ -456,4 +456,4 @@ struct gpio_pin_config {
 }
 #endif
 
-#endif /* __GPIO_H__ */
+#endif /* ZEPHYR_INCLUDE_GPIO_H_ */
diff --git a/include/i2c.h b/include/i2c.h
index c1543d20211..3a1e55f01cb 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -9,8 +9,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __DRIVERS_I2C_H
-#define __DRIVERS_I2C_H
+#ifndef ZEPHYR_INCLUDE_I2C_H_
+#define ZEPHYR_INCLUDE_I2C_H_
 
 /**
  * @brief I2C Interface
@@ -877,4 +877,4 @@ struct i2c_client_config {
 
 #include <syscalls/i2c.h>
 
-#endif /* __DRIVERS_I2C_H */
+#endif /* ZEPHYR_INCLUDE_I2C_H_ */
diff --git a/include/i2s.h b/include/i2s.h
index bb587a2422f..a146cd6c56b 100644
--- a/include/i2s.h
+++ b/include/i2s.h
@@ -9,8 +9,8 @@
  * @brief Public APIs for the I2S (Inter-IC Sound) bus drivers.
  */
 
-#ifndef __I2S_H__
-#define __I2S_H__
+#ifndef ZEPHYR_INCLUDE_I2S_H_
+#define ZEPHYR_INCLUDE_I2S_H_
 
 /**
  * @defgroup i2s_interface I2S Interface
@@ -523,4 +523,4 @@ static inline int _impl_i2s_trigger(struct device *dev, enum i2s_dir dir,
  * @}
  */
 
-#endif /* __I2S_H__ */
+#endif /* ZEPHYR_INCLUDE_I2S_H_ */
diff --git a/include/init.h b/include/init.h
index 43501db2903..caac6110e60 100644
--- a/include/init.h
+++ b/include/init.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _INIT_H_
-#define _INIT_H_
+#ifndef ZEPHYR_INCLUDE_INIT_H_
+#define ZEPHYR_INCLUDE_INIT_H_
 
 #include <device.h>
 #include <toolchain.h>
@@ -74,4 +74,4 @@ extern "C" {
 }
 #endif
 
-#endif /* _INIT_H_ */
+#endif /* ZEPHYR_INCLUDE_INIT_H_ */
diff --git a/include/ipm.h b/include/ipm.h
index fe0f1e523ad..04d8544d2a9 100644
--- a/include/ipm.h
+++ b/include/ipm.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INCipmh
-#define __INCipmh
+#ifndef ZEPHYR_INCLUDE_IPM_H_
+#define ZEPHYR_INCLUDE_IPM_H_
 
 /**
  * @brief IPM Interface
@@ -222,4 +222,4 @@ static inline int _impl_ipm_set_enabled(struct device *ipmdev, int enable)
 
 #include <syscalls/ipm.h>
 
-#endif /* __INCipmh */
+#endif /* ZEPHYR_INCLUDE_IPM_H_ */
diff --git a/include/irq.h b/include/irq.h
index 359139483ad..a919cb25d87 100644
--- a/include/irq.h
+++ b/include/irq.h
@@ -8,8 +8,8 @@
  * @file
  * @brief Public interface for configuring interrupts
  */
-#ifndef _IRQ_H_
-#define _IRQ_H_
+#ifndef ZEPHYR_INCLUDE_IRQ_H_
+#define ZEPHYR_INCLUDE_IRQ_H_
 
 /* Pull in the arch-specific implementations */
 #include <arch/cpu.h>
@@ -260,4 +260,4 @@ void _smp_global_unlock(unsigned int key);
 #endif
 
 #endif /* ASMLANGUAGE */
-#endif /* _IRQ_H_ */
+#endif /* ZEPHYR_INCLUDE_IRQ_H_ */
diff --git a/include/irq_nextlevel.h b/include/irq_nextlevel.h
index 1495ec17498..f8140861f23 100644
--- a/include/irq_nextlevel.h
+++ b/include/irq_nextlevel.h
@@ -8,8 +8,8 @@
  * @file
  * @brief Public interface for configuring interrupts
  */
-#ifndef _IRQ_NEXTLEVEL_H_
-#define _IRQ_NEXTLEVEL_H_
+#ifndef ZEPHYR_INCLUDE_IRQ_NEXTLEVEL_H_
+#define ZEPHYR_INCLUDE_IRQ_NEXTLEVEL_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -92,4 +92,4 @@ static inline unsigned int irq_is_enabled_next_level(struct device *dev)
 }
 #endif
 
-#endif /* _IRQ_NEXTLEVEL_H_ */
+#endif /* ZEPHYR_INCLUDE_IRQ_NEXTLEVEL_H_ */
diff --git a/include/irq_offload.h b/include/irq_offload.h
index 17beb14b058..1a1581389bb 100644
--- a/include/irq_offload.h
+++ b/include/irq_offload.h
@@ -8,8 +8,8 @@
  * @file
  * @brief IRQ Offload interface
  */
-#ifndef _IRQ_OFFLOAD_H_
-#define _IRQ_OFFLOAD_H_
+#ifndef ZEPHYR_INCLUDE_IRQ_OFFLOAD_H_
+#define ZEPHYR_INCLUDE_IRQ_OFFLOAD_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/json.h b/include/json.h
index 9f451840659..263c63ef476 100644
--- a/include/json.h
+++ b/include/json.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __JSON_H
-#define __JSON_H
+#ifndef ZEPHYR_INCLUDE_JSON_H_
+#define ZEPHYR_INCLUDE_JSON_H_
 
 
 
@@ -633,4 +633,4 @@ int json_obj_encode(const struct json_obj_descr *descr, size_t descr_len,
 /**
  * @}
  */
-#endif /* __JSON_H */
+#endif /* ZEPHYR_INCLUDE_JSON_H_ */
diff --git a/include/kernel.h b/include/kernel.h
index 26b701918b6..095003f4863 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -10,8 +10,8 @@
  * @brief Public kernel APIs.
  */
 
-#ifndef _kernel__h_
-#define _kernel__h_
+#ifndef ZEPHYR_INCLUDE_KERNEL_H_
+#define ZEPHYR_INCLUDE_KERNEL_H_
 
 #if !defined(_ASMLANGUAGE)
 #include <kernel_includes.h>
@@ -4983,4 +4983,4 @@ inline void *operator new[](size_t size, void *ptr)
 
 #endif /* !_ASMLANGUAGE */
 
-#endif /* _kernel__h_ */
+#endif /* ZEPHYR_INCLUDE_KERNEL_H_ */
diff --git a/include/kernel_includes.h b/include/kernel_includes.h
index df609865c75..c701f1d3790 100644
--- a/include/kernel_includes.h
+++ b/include/kernel_includes.h
@@ -10,8 +10,8 @@
  * @brief Header files included by kernel.h.
  */
 
-#ifndef _KERNEL_INCLUDES__H
-#define _KERNEL_INCLUDES__H
+#ifndef ZEPHYR_INCLUDE_KERNEL_INCLUDES_H_
+#define ZEPHYR_INCLUDE_KERNEL_INCLUDES_H_
 
 #include <stddef.h>
 #include <zephyr/types.h>
@@ -34,4 +34,4 @@
 #include <arch/cpu.h>
 #include <misc/rb.h>
 
-#endif /* _KERNEL_INCLUDES__H */
+#endif /* ZEPHYR_INCLUDE_KERNEL_INCLUDES_H_ */
diff --git a/include/kernel_version.h b/include/kernel_version.h
index 6a36b05a333..d7df62773e0 100644
--- a/include/kernel_version.h
+++ b/include/kernel_version.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _kernel_version__h_
-#define _kernel_version__h_
+#ifndef ZEPHYR_INCLUDE_KERNEL_VERSION_H_
+#define ZEPHYR_INCLUDE_KERNEL_VERSION_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,4 +38,4 @@ extern u32_t sys_kernel_version_get(void);
 }
 #endif
 
-#endif /* _kernel_version__h_ */
+#endif /* ZEPHYR_INCLUDE_KERNEL_VERSION_H_ */
diff --git a/include/led.h b/include/led.h
index f96bcbf81ae..6c1d1400f42 100644
--- a/include/led.h
+++ b/include/led.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ZEPHYR_LED_H
-#define _ZEPHYR_LED_H
+#ifndef ZEPHYR_INCLUDE_LED_H_
+#define ZEPHYR_INCLUDE_LED_H_
 
 /**
  * @file
@@ -142,4 +142,4 @@ static inline int _impl_led_off(struct device *dev, u32_t led)
 
 #include <syscalls/led.h>
 
-#endif	/* _ZEPHYR_LED_H */
+#endif	/* ZEPHYR_INCLUDE_LED_H_ */
diff --git a/include/led_strip.h b/include/led_strip.h
index 56743e7a493..05800fecaa7 100644
--- a/include/led_strip.h
+++ b/include/led_strip.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ZEPHYR_LED_STRIP_H
-#define _ZEPHYR_LED_STRIP_H
+#ifndef ZEPHYR_INCLUDE_LED_STRIP_H_
+#define ZEPHYR_INCLUDE_LED_STRIP_H_
 
 /**
  * @file
@@ -126,4 +126,4 @@ static inline int led_strip_update_channels(struct device *dev,
 }
 #endif
 
-#endif	/* _ZEPHYR_LED_STRIP_H */
+#endif	/* ZEPHYR_INCLUDE_LED_STRIP_H_ */
diff --git a/include/linker/linker-defs.h b/include/linker/linker-defs.h
index 87857bcf7c1..b5f177cf12c 100644
--- a/include/linker/linker-defs.h
+++ b/include/linker/linker-defs.h
@@ -16,8 +16,8 @@
  *   section
  */
 
-#ifndef _LINKERDEFS_H
-#define _LINKERDEFS_H
+#ifndef ZEPHYR_INCLUDE_LINKER_LINKER_DEFS_H_
+#define ZEPHYR_INCLUDE_LINKER_LINKER_DEFS_H_
 
 #include <toolchain.h>
 #include <linker/sections.h>
@@ -272,4 +272,4 @@ extern char __sg_size[];
 
 #endif /* ! _ASMLANGUAGE */
 
-#endif /* _LINKERDEFS_H */
+#endif /* ZEPHYR_INCLUDE_LINKER_LINKER_DEFS_H_ */
diff --git a/include/linker/linker-tool-gcc.h b/include/linker/linker-tool-gcc.h
index 285decabc9f..2a845e8e1c7 100644
--- a/include/linker/linker-tool-gcc.h
+++ b/include/linker/linker-tool-gcc.h
@@ -12,8 +12,8 @@
  * use with the GCC linker.
  */
 
-#ifndef __LINKER_TOOL_GCC_H
-#define __LINKER_TOOL_GCC_H
+#ifndef ZEPHYR_INCLUDE_LINKER_LINKER_TOOL_GCC_H_
+#define ZEPHYR_INCLUDE_LINKER_LINKER_TOOL_GCC_H_
 
 #if defined(CONFIG_ARM)
 	OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
@@ -121,4 +121,4 @@
 
 #define COMMON_SYMBOLS *(COMMON)
 
-#endif /* !__LINKER_TOOL_GCC_H */
+#endif /* ZEPHYR_INCLUDE_LINKER_LINKER_TOOL_GCC_H_ */
diff --git a/include/linker/linker-tool.h b/include/linker/linker-tool.h
index b5b96b263b3..f5e341221dd 100644
--- a/include/linker/linker-tool.h
+++ b/include/linker/linker-tool.h
@@ -12,8 +12,8 @@
  * definitions (based on the toolchain) for the linker script.
  */
 
-#ifndef __LINKER_TOOL_H
-#define __LINKER_TOOL_H
+#ifndef ZEPHYR_INCLUDE_LINKER_LINKER_TOOL_H_
+#define ZEPHYR_INCLUDE_LINKER_LINKER_TOOL_H_
 
 #if defined(_LINKER)
 #if defined(__GCC_LINKER_CMD__)
@@ -23,4 +23,4 @@
 #endif
 #endif
 
-#endif /* !__LINKER_TOOL_H */
+#endif /* ZEPHYR_INCLUDE_LINKER_LINKER_TOOL_H_ */
diff --git a/include/linker/section_tags.h b/include/linker/section_tags.h
index 362951f2641..a132c64e35b 100644
--- a/include/linker/section_tags.h
+++ b/include/linker/section_tags.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _section_tags__h_
-#define _section_tags__h_
+#ifndef ZEPHYR_INCLUDE_LINKER_SECTION_TAGS_H_
+#define ZEPHYR_INCLUDE_LINKER_SECTION_TAGS_H_
 
 #include <toolchain.h>
 
@@ -27,4 +27,4 @@
 
 #endif /* !_ASMLANGUAGE */
 
-#endif /* _section_tags__h_ */
+#endif /* ZEPHYR_INCLUDE_LINKER_SECTION_TAGS_H_ */
diff --git a/include/linker/sections.h b/include/linker/sections.h
index c8f598f30b2..b67c17ccfa0 100644
--- a/include/linker/sections.h
+++ b/include/linker/sections.h
@@ -12,8 +12,8 @@
  * files.
  */
 
-#ifndef _SECTIONS_H
-#define _SECTIONS_H
+#ifndef ZEPHYR_INCLUDE_LINKER_SECTIONS_H_
+#define ZEPHYR_INCLUDE_LINKER_SECTIONS_H_
 
 #define _TEXT_SECTION_NAME text
 #define _RODATA_SECTION_NAME rodata
@@ -61,4 +61,4 @@
 
 #include <linker/section_tags.h>
 
-#endif /* _SECTIONS_H */
+#endif /* ZEPHYR_INCLUDE_LINKER_SECTIONS_H_ */
diff --git a/include/logging/log.h b/include/logging/log.h
index 1251353b37f..b70f21c12d6 100644
--- a/include/logging/log.h
+++ b/include/logging/log.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef LOG_H_
-#define LOG_H_
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_H_
 
 #include <logging/log_instance.h>
 #include <logging/log_core.h>
@@ -362,4 +362,4 @@ int log_printk(const char *fmt, va_list ap);
 }
 #endif
 
-#endif /* LOG_H_ */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_H_ */
diff --git a/include/logging/log_backend.h b/include/logging/log_backend.h
index c352ed8299e..b7d62d6717b 100644
--- a/include/logging/log_backend.h
+++ b/include/logging/log_backend.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef LOG_BACKEND_H
-#define LOG_BACKEND_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_BACKEND_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_BACKEND_H_
 
 #include <logging/log_msg.h>
 #include <assert.h>
@@ -199,4 +199,4 @@ static inline bool log_backend_is_active(
 }
 #endif
 
-#endif /* LOG_BACKEND_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_BACKEND_H_ */
diff --git a/include/logging/log_backend_uart.h b/include/logging/log_backend_uart.h
index 116abbd4650..5ab5e52441a 100644
--- a/include/logging/log_backend_uart.h
+++ b/include/logging/log_backend_uart.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef LOG_BACKEND_UART_H
-#define LOG_BACKEND_UART_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_BACKEND_UART_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_BACKEND_UART_H_
 
 #include <logging/log_backend.h>
 
@@ -28,4 +28,4 @@ extern const struct log_backend_api log_backend_uart_api;
 
 void log_backend_uart_init(void);
 
-#endif /* LOG_BACKEND_UART_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_BACKEND_UART_H_ */
diff --git a/include/logging/log_core.h b/include/logging/log_core.h
index 9abe9a5f87e..fc6fb2b4156 100644
--- a/include/logging/log_core.h
+++ b/include/logging/log_core.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef LOG_FRONTEND_H
-#define LOG_FRONTEND_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_CORE_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_CORE_H_
 
 #include <logging/log_msg.h>
 #include <logging/log_instance.h>
@@ -475,4 +475,4 @@ void log_generic(struct log_msg_ids src_level, const char *fmt, va_list ap);
 }
 #endif
 
-#endif /* LOG_FRONTEND_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_CORE_H_ */
diff --git a/include/logging/log_ctrl.h b/include/logging/log_ctrl.h
index f920c07b735..685d2f9499c 100644
--- a/include/logging/log_ctrl.h
+++ b/include/logging/log_ctrl.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef LOG_CTRL_H
-#define LOG_CTRL_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_CTRL_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_CTRL_H_
 
 #include <logging/log_backend.h>
 
@@ -180,4 +180,4 @@ void log_backend_disable(struct log_backend const *const backend);
 }
 #endif
 
-#endif /* LOG_CTRL_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_CTRL_H_ */
diff --git a/include/logging/log_instance.h b/include/logging/log_instance.h
index 63c18e0c880..fe64c0708b1 100644
--- a/include/logging/log_instance.h
+++ b/include/logging/log_instance.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef LOG_INSTANCE_H
-#define LOG_INSTANCE_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_INSTANCE_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_INSTANCE_H_
 
 #include <zephyr/types.h>
 
@@ -106,4 +106,4 @@ struct log_source_dynamic_data {
 }
 #endif
 
-#endif /* LOG_INSTANCE_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_INSTANCE_H_ */
diff --git a/include/logging/log_msg.h b/include/logging/log_msg.h
index 76ac2c0d0f9..9292b49dbff 100644
--- a/include/logging/log_msg.h
+++ b/include/logging/log_msg.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef LOG_MSG_H
-#define LOG_MSG_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_MSG_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_MSG_H_
 
 #include <kernel.h>
 #include <atomic.h>
@@ -522,4 +522,4 @@ struct log_msg *log_msg_create_n(const char *str,
 }
 #endif
 
-#endif /* LOG_MSG_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_MSG_H_ */
diff --git a/include/logging/log_output.h b/include/logging/log_output.h
index 7e558e9d222..43bbc71d47c 100644
--- a/include/logging/log_output.h
+++ b/include/logging/log_output.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef LOG_OUTPUT_H
-#define LOG_OUTPUT_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_LOG_OUTPUT_H_
+#define ZEPHYR_INCLUDE_LOGGING_LOG_OUTPUT_H_
 
 #include <logging/log_msg.h>
 
@@ -114,4 +114,4 @@ void log_output_timestamp_freq_set(u32_t freq);
 }
 #endif
 
-#endif /* LOG_OUTPUT_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_LOG_OUTPUT_H_ */
diff --git a/include/logging/sys_log.h b/include/logging/sys_log.h
index cfcb8053a09..d880e389044 100644
--- a/include/logging/sys_log.h
+++ b/include/logging/sys_log.h
@@ -7,8 +7,8 @@
 /** @file sys_log.h
  *  @brief Logging macros.
  */
-#ifndef __SYS_LOG_H
-#define __SYS_LOG_H
+#ifndef ZEPHYR_INCLUDE_LOGGING_SYS_LOG_H_
+#define ZEPHYR_INCLUDE_LOGGING_SYS_LOG_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -190,4 +190,4 @@ void syslog_hook_install(void (*hook)(const char *, ...));
 }
 #endif
 
-#endif /* __SYS_LOG_H */
+#endif /* ZEPHYR_INCLUDE_LOGGING_SYS_LOG_H_ */
diff --git a/include/mgmt/buf.h b/include/mgmt/buf.h
index a4a9feb4f85..a2bfdebf74d 100644
--- a/include/mgmt/buf.h
+++ b/include/mgmt/buf.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef H_MGMT_BUF
-#define H_MGMT_BUF
+#ifndef ZEPHYR_INCLUDE_MGMT_BUF_H_
+#define ZEPHYR_INCLUDE_MGMT_BUF_H_
 
 #include <inttypes.h>
 #include "cbor_encoder_writer.h"
diff --git a/include/mgmt/serial.h b/include/mgmt/serial.h
index a2c23c2bf47..694565b0e18 100644
--- a/include/mgmt/serial.h
+++ b/include/mgmt/serial.h
@@ -56,8 +56,8 @@
  * | Initial Value | 0             |
  */
 
-#ifndef H_MGMT_SERIAL_
-#define H_MGMT_SERIAL_
+#ifndef ZEPHYR_INCLUDE_MGMT_SERIAL_H_
+#define ZEPHYR_INCLUDE_MGMT_SERIAL_H_
 
 #include <zephyr/types.h>
 
diff --git a/include/mgmt/smp.h b/include/mgmt/smp.h
index 0eca9660e23..99a6ba36ad4 100644
--- a/include/mgmt/smp.h
+++ b/include/mgmt/smp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef H_ZEPHYR_SMP_
-#define H_ZEPHYR_SMP_
+#ifndef ZEPHYR_INCLUDE_MGMT_SMP_H_
+#define ZEPHYR_INCLUDE_MGMT_SMP_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/mgmt/smp_bt.h b/include/mgmt/smp_bt.h
index 1e40bb7169e..b79f85fd7e9 100644
--- a/include/mgmt/smp_bt.h
+++ b/include/mgmt/smp_bt.h
@@ -8,8 +8,8 @@
  * @brief Bluetooth transport for the mcumgr SMP protocol.
  */
 
-#ifndef H_SMP_BT_
-#define H_SMP_BT_
+#ifndef ZEPHYR_INCLUDE_MGMT_SMP_BT_H_
+#define ZEPHYR_INCLUDE_MGMT_SMP_BT_H_
 
 #include <zephyr/types.h>
 struct bt_conn;
diff --git a/include/misc/__assert.h b/include/misc/__assert.h
index 4b26e8c8916..bc8ac8dc325 100644
--- a/include/misc/__assert.h
+++ b/include/misc/__assert.h
@@ -58,8 +58,8 @@
  * discouraged.
  */
 
-#ifndef ___ASSERT__H_
-#define ___ASSERT__H_
+#ifndef ZEPHYR_INCLUDE_MISC___ASSERT_H_
+#define ZEPHYR_INCLUDE_MISC___ASSERT_H_
 
 #ifdef CONFIG_ASSERT
 #ifndef __ASSERT_ON
@@ -126,4 +126,4 @@ extern void posix_exit(int exit_code);
 
 #define __ASSERT_NO_MSG(test) __ASSERT(test, "")
 
-#endif /* ___ASSERT__H_ */
+#endif /* ZEPHYR_INCLUDE_MISC___ASSERT_H_ */
diff --git a/include/misc/byteorder.h b/include/misc/byteorder.h
index d48200d50b6..1a94d4d214a 100644
--- a/include/misc/byteorder.h
+++ b/include/misc/byteorder.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __BYTEORDER_H__
-#define __BYTEORDER_H__
+#ifndef ZEPHYR_INCLUDE_MISC_BYTEORDER_H_
+#define ZEPHYR_INCLUDE_MISC_BYTEORDER_H_
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -325,4 +325,4 @@ static inline void sys_mem_swap(void *buf, size_t length)
 	}
 }
 
-#endif /* __BYTEORDER_H__ */
+#endif /* ZEPHYR_INCLUDE_MISC_BYTEORDER_H_ */
diff --git a/include/misc/dlist.h b/include/misc/dlist.h
index 817fee1a8a2..cdb4366bc2f 100644
--- a/include/misc/dlist.h
+++ b/include/misc/dlist.h
@@ -17,8 +17,8 @@
  * simplifies the adding and removing of nodes to/from the list.
  */
 
-#ifndef _misc_dlist__h_
-#define _misc_dlist__h_
+#ifndef ZEPHYR_INCLUDE_MISC_DLIST_H_
+#define ZEPHYR_INCLUDE_MISC_DLIST_H_
 
 #include <stddef.h>
 
@@ -491,4 +491,4 @@ static inline sys_dnode_t *sys_dlist_get(sys_dlist_t *list)
 }
 #endif
 
-#endif /* _misc_dlist__h_ */
+#endif /* ZEPHYR_INCLUDE_MISC_DLIST_H_ */
diff --git a/include/misc/errno_private.h b/include/misc/errno_private.h
index a5eac650d35..dc3e0142c6b 100644
--- a/include/misc/errno_private.h
+++ b/include/misc/errno_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _MISC_ERRNO_PRIVATE_H_
-#define _MISC_ERRNO_PRIVATE_H_
+#ifndef ZEPHYR_INCLUDE_MISC_ERRNO_PRIVATE_H_
+#define ZEPHYR_INCLUDE_MISC_ERRNO_PRIVATE_H_
 
 #include <toolchain.h>
 
@@ -33,4 +33,4 @@ __syscall int *z_errno(void);
 
 #include <syscalls/errno_private.h>
 
-#endif /* _MISC_ERRNO_PRIVATE_H */
+#endif /* ZEPHYR_INCLUDE_MISC_ERRNO_PRIVATE_H_ */
diff --git a/include/misc/libc-hooks.h b/include/misc/libc-hooks.h
index d7f6bc58e81..51a9db126b8 100644
--- a/include/misc/libc-hooks.h
+++ b/include/misc/libc-hooks.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_LIBC_HOOKS_H
-#define ZEPHYR_LIBC_HOOKS_H
+#ifndef ZEPHYR_INCLUDE_MISC_LIBC_HOOKS_H_
+#define ZEPHYR_INCLUDE_MISC_LIBC_HOOKS_H_
 
 #include <toolchain.h>
 #include <stdio.h>
@@ -39,4 +39,4 @@ __syscall size_t _zephyr_fwrite(const void *_MLIBC_RESTRICT ptr, size_t size,
 
 #include <syscalls/libc-hooks.h>
 
-#endif /* ZEPHYR_LIBC_HOOKS_H */
+#endif /* ZEPHYR_INCLUDE_MISC_LIBC_HOOKS_H_ */
diff --git a/include/misc/list_gen.h b/include/misc/list_gen.h
index f1d7fd8b4a9..ee266d29f37 100644
--- a/include/misc/list_gen.h
+++ b/include/misc/list_gen.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_MISC_LIST_GEN_H
-#define ZEPHYR_MISC_LIST_GEN_H
+#ifndef ZEPHYR_INCLUDE_MISC_LIST_GEN_H_
+#define ZEPHYR_INCLUDE_MISC_LIST_GEN_H_
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -230,4 +230,4 @@
 		return false;						 \
 	}
 
-#endif /* ZEPHYR_MISC_LIST_GEN_H */
+#endif /* ZEPHYR_INCLUDE_MISC_LIST_GEN_H_ */
diff --git a/include/misc/mempool.h b/include/misc/mempool.h
index e4fcfe7b0da..a4d380a9bab 100644
--- a/include/misc/mempool.h
+++ b/include/misc/mempool.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef SYS_MEMPOOL_H
-#define SYS_MEMPOOL_H
+#ifndef ZEPHYR_INCLUDE_MISC_MEMPOOL_H_
+#define ZEPHYR_INCLUDE_MISC_MEMPOOL_H_
 
 #include <kernel.h>
 #include <misc/mempool_base.h>
diff --git a/include/misc/mempool_base.h b/include/misc/mempool_base.h
index f4a2340bcb9..e0863834842 100644
--- a/include/misc/mempool_base.h
+++ b/include/misc/mempool_base.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef SYS_MEMPOOL_BASE_H
-#define SYS_MEMPOOL_BASE_H
+#ifndef ZEPHYR_INCLUDE_MISC_MEMPOOL_BASE_H_
+#define ZEPHYR_INCLUDE_MISC_MEMPOOL_BASE_H_
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -107,4 +107,4 @@ int _sys_mem_pool_block_alloc(struct sys_mem_pool_base *p, size_t size,
 void _sys_mem_pool_block_free(struct sys_mem_pool_base *p, u32_t level,
 			      u32_t block);
 
-#endif /* SYS_MEMPOOL_BASE_H */
+#endif /* ZEPHYR_INCLUDE_MISC_MEMPOOL_BASE_H_ */
diff --git a/include/misc/printk.h b/include/misc/printk.h
index 4489fd5ce78..c5749aded7f 100644
--- a/include/misc/printk.h
+++ b/include/misc/printk.h
@@ -5,8 +5,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _PRINTK_H_
-#define _PRINTK_H_
+#ifndef ZEPHYR_INCLUDE_MISC_PRINTK_H_
+#define ZEPHYR_INCLUDE_MISC_PRINTK_H_
 
 #include <toolchain.h>
 #include <stddef.h>
diff --git a/include/misc/rb.h b/include/misc/rb.h
index d86321c94cc..4be17092a7f 100644
--- a/include/misc/rb.h
+++ b/include/misc/rb.h
@@ -40,8 +40,8 @@
  * just two pointers, identical with a doubly-linked list.
  */
 
-#ifndef _RB_H
-#define _RB_H
+#ifndef ZEPHYR_INCLUDE_MISC_RB_H_
+#define ZEPHYR_INCLUDE_MISC_RB_H_
 
 struct rbnode {
 	struct rbnode *children[2];
@@ -182,4 +182,4 @@ struct rbnode *_rb_foreach_next(struct rbtree *tree, struct _rb_foreach *f);
 				  __typeof__(*(node)), field));		\
 	     /**/)
 
-#endif /* _RB_H */
+#endif /* ZEPHYR_INCLUDE_MISC_RB_H_ */
diff --git a/include/misc/reboot.h b/include/misc/reboot.h
index dec1fcde50e..8bf7755eb58 100644
--- a/include/misc/reboot.h
+++ b/include/misc/reboot.h
@@ -11,8 +11,8 @@
  * @details See misc/Kconfig and the reboot help for details.
  */
 
-#ifndef _misc_reboot__h_
-#define _misc_reboot__h_
+#ifndef ZEPHYR_INCLUDE_MISC_REBOOT_H_
+#define ZEPHYR_INCLUDE_MISC_REBOOT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,4 +39,4 @@ extern void sys_reboot(int type);
 }
 #endif
 
-#endif /* _misc_reboot__h_ */
+#endif /* ZEPHYR_INCLUDE_MISC_REBOOT_H_ */
diff --git a/include/misc/ring_buffer.h b/include/misc/ring_buffer.h
index b1c5ec99a20..ef23cf3f395 100644
--- a/include/misc/ring_buffer.h
+++ b/include/misc/ring_buffer.h
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef RING_BUFFER_DEP_H__
-#define RING_BUFFER_DEP_H__
+#ifndef ZEPHYR_INCLUDE_MISC_RING_BUFFER_H_
+#define ZEPHYR_INCLUDE_MISC_RING_BUFFER_H_
 
 #warning "This header file has moved, include <ring_buffer.h> instead."
 
 #include <ring_buffer.h>
 
-#endif /* RING_BUFFER_DEP_H__ */
+#endif /* ZEPHYR_INCLUDE_MISC_RING_BUFFER_H_ */
diff --git a/include/misc/sflist.h b/include/misc/sflist.h
index 85311667a4b..538a6daea96 100644
--- a/include/misc/sflist.h
+++ b/include/misc/sflist.h
@@ -14,8 +14,8 @@
  * calls to functions must be protected with synchronization primitives.
  */
 
-#ifndef __SFLIST_H__
-#define __SFLIST_H__
+#ifndef ZEPHYR_INCLUDE_MISC_SFLIST_H_
+#define ZEPHYR_INCLUDE_MISC_SFLIST_H_
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -475,4 +475,4 @@ Z_GENLIST_FIND_AND_REMOVE(sflist, sfnode);
 }
 #endif
 
-#endif /* __SFLIST_H__ */
+#endif /* ZEPHYR_INCLUDE_MISC_SFLIST_H_ */
diff --git a/include/misc/slist.h b/include/misc/slist.h
index 9c124adc23f..32f11968500 100644
--- a/include/misc/slist.h
+++ b/include/misc/slist.h
@@ -14,8 +14,8 @@
  * calls to functions must be protected with synchronization primitives.
  */
 
-#ifndef __SLIST_H__
-#define __SLIST_H__
+#ifndef ZEPHYR_INCLUDE_MISC_SLIST_H_
+#define ZEPHYR_INCLUDE_MISC_SLIST_H_
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -413,4 +413,4 @@ Z_GENLIST_FIND_AND_REMOVE(slist, snode);
 }
 #endif
 
-#endif /* __SLIST_H__ */
+#endif /* ZEPHYR_INCLUDE_MISC_SLIST_H_ */
diff --git a/include/misc/stack.h b/include/misc/stack.h
index 754af18a460..cebadde5153 100644
--- a/include/misc/stack.h
+++ b/include/misc/stack.h
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _MISC_STACK_H_
-#define _MISC_STACK_H_
+#ifndef ZEPHYR_INCLUDE_MISC_STACK_H_
+#define ZEPHYR_INCLUDE_MISC_STACK_H_
 
 #include <misc/printk.h>
 
@@ -94,4 +94,4 @@ static inline void stack_analyze(const char *name, const char *stack,
 	stack_analyze(name, K_THREAD_STACK_BUFFER(sym), \
 		      K_THREAD_STACK_SIZEOF(sym))
 
-#endif /* _MISC_STACK_H_ */
+#endif /* ZEPHYR_INCLUDE_MISC_STACK_H_ */
diff --git a/include/misc/util.h b/include/misc/util.h
index 527a36a0d55..696e1d13123 100644
--- a/include/misc/util.h
+++ b/include/misc/util.h
@@ -11,8 +11,8 @@
  * Misc utilities usable by the kernel and application code.
  */
 
-#ifndef _UTIL__H_
-#define _UTIL__H_
+#ifndef ZEPHYR_INCLUDE_MISC_UTIL_H_
+#define ZEPHYR_INCLUDE_MISC_UTIL_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -441,4 +441,4 @@ static inline s64_t arithmetic_shift_right(s64_t value, u8_t shift)
 	_for_10, _for_9, _for_8, _for_7, _for_6, _for_5, \
 	_for_4, _for_3, _for_2, _for_1, _for_0)(x, ##__VA_ARGS__)
 
-#endif /* _UTIL__H_ */
+#endif /* ZEPHYR_INCLUDE_MISC_UTIL_H_ */
diff --git a/include/net/bt.h b/include/net/bt.h
index 90c9509f164..977e4bf8dbf 100644
--- a/include/net/bt.h
+++ b/include/net/bt.h
@@ -9,8 +9,8 @@
  * @brief Bluetooth L2 stack public header
  */
 
-#ifndef __BT_H__
-#define __BT_H__
+#ifndef ZEPHYR_INCLUDE_NET_BT_H_
+#define ZEPHYR_INCLUDE_NET_BT_H_
 
 #include <net/net_mgmt.h>
 
@@ -57,4 +57,4 @@ enum net_event_bt_cmd {
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_BT_DISCONNECT);
 
-#endif /* __BT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_BT_H_ */
diff --git a/include/net/buf.h b/include/net/buf.h
index 9b50d54fce1..5244993c123 100644
--- a/include/net/buf.h
+++ b/include/net/buf.h
@@ -7,8 +7,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __NET_BUF_H
-#define __NET_BUF_H
+#ifndef ZEPHYR_INCLUDE_NET_BUF_H_
+#define ZEPHYR_INCLUDE_NET_BUF_H_
 
 #include <stddef.h>
 #include <zephyr/types.h>
@@ -1412,4 +1412,4 @@ static inline size_t net_buf_frags_len(struct net_buf *buf)
 }
 #endif
 
-#endif /* __NET_BUF_H */
+#endif /* ZEPHYR_INCLUDE_NET_BUF_H_ */
diff --git a/include/net/coap.h b/include/net/coap.h
index f43437c2847..23777292adf 100644
--- a/include/net/coap.h
+++ b/include/net/coap.h
@@ -10,8 +10,8 @@
  * @brief CoAP implementation for Zephyr.
  */
 
-#ifndef __COAP_H__
-#define __COAP_H__
+#ifndef ZEPHYR_INCLUDE_NET_COAP_H_
+#define ZEPHYR_INCLUDE_NET_COAP_H_
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -812,4 +812,4 @@ u8_t *coap_next_token(void);
 }
 #endif
 
-#endif /* __COAP_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_COAP_H_ */
diff --git a/include/net/coap_link_format.h b/include/net/coap_link_format.h
index f8440ff7182..7c7a0069b3e 100644
--- a/include/net/coap_link_format.h
+++ b/include/net/coap_link_format.h
@@ -10,8 +10,8 @@
  * @brief CoAP implementation for Zephyr.
  */
 
-#ifndef __LINK_FORMAT_H__
-#define __LINK_FORMAT_H__
+#ifndef ZEPHYR_INCLUDE_NET_COAP_LINK_FORMAT_H_
+#define ZEPHYR_INCLUDE_NET_COAP_LINK_FORMAT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,4 +51,4 @@ struct coap_core_metadata {
 }
 #endif
 
-#endif /* __LINK_FORMAT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_COAP_LINK_FORMAT_H_ */
diff --git a/include/net/dhcpv4.h b/include/net/dhcpv4.h
index abf905c62a5..f7aa183116e 100644
--- a/include/net/dhcpv4.h
+++ b/include/net/dhcpv4.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __DHCPV4_H
-#define __DHCPV4_H
+#ifndef ZEPHYR_INCLUDE_NET_DHCPV4_H_
+#define ZEPHYR_INCLUDE_NET_DHCPV4_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ const char *net_dhcpv4_state_name(enum net_dhcpv4_state state);
 }
 #endif
 
-#endif /* __DHCPV4_H */
+#endif /* ZEPHYR_INCLUDE_NET_DHCPV4_H_ */
diff --git a/include/net/dns_resolve.h b/include/net/dns_resolve.h
index 43897915c66..d40e07bb410 100644
--- a/include/net/dns_resolve.h
+++ b/include/net/dns_resolve.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _DNS_RESOLVE_H
-#define _DNS_RESOLVE_H
+#ifndef ZEPHYR_INCLUDE_NET_DNS_RESOLVE_H_
+#define ZEPHYR_INCLUDE_NET_DNS_RESOLVE_H_
 
 #include <net/net_ip.h>
 #include <net/net_context.h>
@@ -367,4 +367,4 @@ void dns_init_resolver(void);
 }
 #endif
 
-#endif /* _DNS_RESOLVE_H */
+#endif /* ZEPHYR_INCLUDE_NET_DNS_RESOLVE_H_ */
diff --git a/include/net/ethernet.h b/include/net/ethernet.h
index 158d4b1fe04..f4b4a7d127e 100644
--- a/include/net/ethernet.h
+++ b/include/net/ethernet.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ETHERNET_H
-#define __ETHERNET_H
+#ifndef ZEPHYR_INCLUDE_NET_ETHERNET_H_
+#define ZEPHYR_INCLUDE_NET_ETHERNET_H_
 
 #include <zephyr/types.h>
 #include <stdbool.h>
@@ -656,4 +656,4 @@ static inline void net_eth_unset_lldpdu(struct net_if *iface)
  * @}
  */
 
-#endif /* __ETHERNET_H */
+#endif /* ZEPHYR_INCLUDE_NET_ETHERNET_H_ */
diff --git a/include/net/ethernet_mgmt.h b/include/net/ethernet_mgmt.h
index a8dcd7656d8..7f8c07ba9c0 100644
--- a/include/net/ethernet_mgmt.h
+++ b/include/net/ethernet_mgmt.h
@@ -9,8 +9,8 @@
  * @brief Ethernet Management interface public header
  */
 
-#ifndef __ETHERNET_MGMT_H__
-#define __ETHERNET_MGMT_H__
+#ifndef ZEPHYR_INCLUDE_NET_ETHERNET_MGMT_H_
+#define ZEPHYR_INCLUDE_NET_ETHERNET_MGMT_H_
 
 #include <net/ethernet.h>
 #include <net/net_mgmt.h>
@@ -167,4 +167,4 @@ static inline void ethernet_mgmt_raise_vlan_disabled_event(struct net_if *iface,
 }
 #endif
 
-#endif /* __ETHERNET_MGMT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_ETHERNET_MGMT_H_ */
diff --git a/include/net/ethernet_vlan.h b/include/net/ethernet_vlan.h
index 15952dcf88a..317fb3009c5 100644
--- a/include/net/ethernet_vlan.h
+++ b/include/net/ethernet_vlan.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __ETHERNET_VLAN_H
-#define __ETHERNET_VLAN_H
+#ifndef ZEPHYR_INCLUDE_NET_ETHERNET_VLAN_H_
+#define ZEPHYR_INCLUDE_NET_ETHERNET_VLAN_H_
 
 /**
  * @brief VLAN definitions and helpers
@@ -73,4 +73,4 @@ static inline u16_t net_eth_vlan_set_pcp(u16_t tci, u8_t pcp)
  */
 
 
-#endif /* __ETHERNET_VLAN_H */
+#endif /* ZEPHYR_INCLUDE_NET_ETHERNET_VLAN_H_ */
diff --git a/include/net/gptp.h b/include/net/gptp.h
index 065ba002ce2..95dbf3a350e 100644
--- a/include/net/gptp.h
+++ b/include/net/gptp.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __GPTP_H
-#define __GPTP_H
+#ifndef ZEPHYR_INCLUDE_NET_GPTP_H_
+#define ZEPHYR_INCLUDE_NET_GPTP_H_
 
 /**
  * @brief generic Precision Time Protocol (gPTP) support
@@ -286,4 +286,4 @@ struct gptp_domain *gptp_get_domain(void);
  * @}
  */
 
-#endif /* __GPTP_H */
+#endif /* ZEPHYR_INCLUDE_NET_GPTP_H_ */
diff --git a/include/net/hostname.h b/include/net/hostname.h
index a1c655265c6..0f525bde48d 100644
--- a/include/net/hostname.h
+++ b/include/net/hostname.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_HOSTNAME_H
-#define __NET_HOSTNAME_H
+#ifndef ZEPHYR_INCLUDE_NET_HOSTNAME_H_
+#define ZEPHYR_INCLUDE_NET_HOSTNAME_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -80,4 +80,4 @@ static inline int net_hostname_set_postfix(const u8_t *hostname_postfix,
 }
 #endif
 
-#endif /* __NET_HOSTNAME_H */
+#endif /* ZEPHYR_INCLUDE_NET_HOSTNAME_H_ */
diff --git a/include/net/http.h b/include/net/http.h
index 48804b1ff9b..c696342342e 100644
--- a/include/net/http.h
+++ b/include/net/http.h
@@ -10,8 +10,8 @@
  * @brief HTTP server and client implementation for Zephyr.
  */
 
-#ifndef __HTTP_H__
-#define __HTTP_H__
+#ifndef ZEPHYR_INCLUDE_NET_HTTP_H_
+#define ZEPHYR_INCLUDE_NET_HTTP_H_
 
 #include <net/net_app.h>
 #include <net/http_parser.h>
@@ -1122,4 +1122,4 @@ void http_server_conn_del(struct http_ctx *ctx);
 }
 #endif
 
-#endif /* __HTTP_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_HTTP_H_ */
diff --git a/include/net/http_parser.h b/include/net/http_parser.h
index 922a37d913d..d069e4bf7c3 100644
--- a/include/net/http_parser.h
+++ b/include/net/http_parser.h
@@ -18,8 +18,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef _HTTP_PARSER_H_
-#define _HTTP_PARSER_H_
+#ifndef ZEPHYR_INCLUDE_NET_HTTP_PARSER_H_
+#define ZEPHYR_INCLUDE_NET_HTTP_PARSER_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/net/http_parser_state.h b/include/net/http_parser_state.h
index a9bdfdf0ab5..136eb188549 100644
--- a/include/net/http_parser_state.h
+++ b/include/net/http_parser_state.h
@@ -18,8 +18,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef _HTTP_PARSER_STATE_H_
-#define _HTTP_PARSER_STATE_H_
+#ifndef ZEPHYR_INCLUDE_NET_HTTP_PARSER_STATE_H_
+#define ZEPHYR_INCLUDE_NET_HTTP_PARSER_STATE_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/net/http_parser_url.h b/include/net/http_parser_url.h
index 8859e7552f4..9afc59a24af 100644
--- a/include/net/http_parser_url.h
+++ b/include/net/http_parser_url.h
@@ -18,8 +18,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef _HTTP_PARSER_URL_H_
-#define _HTTP_PARSER_URL_H_
+#ifndef ZEPHYR_INCLUDE_NET_HTTP_PARSER_URL_H_
+#define ZEPHYR_INCLUDE_NET_HTTP_PARSER_URL_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/net/ieee802154.h b/include/net/ieee802154.h
index d8662bac89c..814342b494d 100644
--- a/include/net/ieee802154.h
+++ b/include/net/ieee802154.h
@@ -9,8 +9,8 @@
  * @brief IEEE 802.15.4 L2 stack public header
  */
 
-#ifndef __IEEE802154_H__
-#define __IEEE802154_H__
+#ifndef ZEPHYR_INCLUDE_NET_IEEE802154_H_
+#define ZEPHYR_INCLUDE_NET_IEEE802154_H_
 
 #include <limits.h>
 #include <net/net_mgmt.h>
@@ -83,4 +83,4 @@ struct ieee802154_context {
  * @}
  */
 
-#endif /* __IEEE802154_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_IEEE802154_H_ */
diff --git a/include/net/ieee802154_mgmt.h b/include/net/ieee802154_mgmt.h
index e29d9b2ae22..2ab119b0fea 100644
--- a/include/net/ieee802154_mgmt.h
+++ b/include/net/ieee802154_mgmt.h
@@ -9,8 +9,8 @@
  * @brief IEEE 802.15.4 Management interface public header
  */
 
-#ifndef __IEEE802154_MGMT_H__
-#define __IEEE802154_MGMT_H__
+#ifndef ZEPHYR_INCLUDE_NET_IEEE802154_MGMT_H_
+#define ZEPHYR_INCLUDE_NET_IEEE802154_MGMT_H_
 
 #include <net/net_mgmt.h>
 
@@ -230,4 +230,4 @@ struct ieee802154_security_params {
  * @}
  */
 
-#endif /* __IEEE802154_MGMT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_IEEE802154_MGMT_H_ */
diff --git a/include/net/ieee802154_radio.h b/include/net/ieee802154_radio.h
index 73277bd9781..c3315703ddf 100644
--- a/include/net/ieee802154_radio.h
+++ b/include/net/ieee802154_radio.h
@@ -9,8 +9,8 @@
  * @brief Public IEEE 802.15.4 Radio API
  */
 
-#ifndef __IEEE802154_RADIO_H__
-#define __IEEE802154_RADIO_H__
+#ifndef ZEPHYR_INCLUDE_NET_IEEE802154_RADIO_H_
+#define ZEPHYR_INCLUDE_NET_IEEE802154_RADIO_H_
 
 #include <device.h>
 #include <net/net_if.h>
@@ -189,4 +189,4 @@ static inline enum net_verdict ieee802154_radio_handle_ack(struct net_if *iface,
  * @}
  */
 
-#endif /* __IEEE802154_RADIO_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_IEEE802154_RADIO_H_ */
diff --git a/include/net/ipv4_autoconf.h b/include/net/ipv4_autoconf.h
index 0286146d31f..5fec5eb6637 100644
--- a/include/net/ipv4_autoconf.h
+++ b/include/net/ipv4_autoconf.h
@@ -8,8 +8,8 @@
  * @brief IPv4 Autoconfiguration
  */
 
-#ifndef __IPV4_AUTOCONF_H
-#define __IPV4_AUTOCONF_H
+#ifndef ZEPHYR_INCLUDE_NET_IPV4_AUTOCONF_H_
+#define ZEPHYR_INCLUDE_NET_IPV4_AUTOCONF_H_
 
 /** Current state of IPv4 Autoconfiguration */
 enum net_ipv4_autoconf_state {
@@ -29,4 +29,4 @@ void net_ipv4_autoconf_init(void);
 #define net_ipv4_autoconf_init(...)
 #endif
 
-#endif /* __IPV4_AUTOCONF_H */
+#endif /* ZEPHYR_INCLUDE_NET_IPV4_AUTOCONF_H_ */
diff --git a/include/net/lldp.h b/include/net/lldp.h
index 3e99638113f..95aabb8e7b6 100644
--- a/include/net/lldp.h
+++ b/include/net/lldp.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __LLDP_H
-#define __LLDP_H
+#ifndef ZEPHYR_INCLUDE_NET_LLDP_H_
+#define ZEPHYR_INCLUDE_NET_LLDP_H_
 
 /**
  * @brief LLDP definitions and helpers
@@ -208,4 +208,4 @@ enum net_verdict net_lldp_recv(struct net_if *iface, struct net_pkt *pkt);
  * @}
  */
 
-#endif /* __LLDP_H */
+#endif /* ZEPHYR_INCLUDE_NET_LLDP_H_ */
diff --git a/include/net/lwm2m.h b/include/net/lwm2m.h
index d880febe886..dcac610ca17 100644
--- a/include/net/lwm2m.h
+++ b/include/net/lwm2m.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __LWM2M_H__
-#define __LWM2M_H__
+#ifndef ZEPHYR_INCLUDE_NET_LWM2M_H_
+#define ZEPHYR_INCLUDE_NET_LWM2M_H_
 
 #include <net/net_app.h>
 #include <net/coap.h>
@@ -257,4 +257,4 @@ int lwm2m_rd_client_start(struct lwm2m_ctx *client_ctx,
 			  const char *ep_name,
 			  lwm2m_ctx_event_cb_t event_cb);
 
-#endif	/* __LWM2M_H__ */
+#endif	/* ZEPHYR_INCLUDE_NET_LWM2M_H_ */
diff --git a/include/net/mii.h b/include/net/mii.h
index 4a537d12ddf..47784b2e8e3 100644
--- a/include/net/mii.h
+++ b/include/net/mii.h
@@ -8,8 +8,8 @@
  * @brief Definitions for IEEE 802.3, Section 2 MII compatible PHY transceivers
  */
 
-#ifndef _MII_H_
-#define _MII_H_
+#ifndef ZEPHYR_INCLUDE_NET_MII_H_
+#define ZEPHYR_INCLUDE_NET_MII_H_
 
 /**
  * @addtogroup ethernet
@@ -85,4 +85,4 @@
  * @}
  */
 
-#endif /* _MII_H_ */
+#endif /* ZEPHYR_INCLUDE_NET_MII_H_ */
diff --git a/include/net/mqtt.h b/include/net/mqtt.h
index 109b34c93bf..65752a58372 100644
--- a/include/net/mqtt.h
+++ b/include/net/mqtt.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _MQTT_H_
-#define _MQTT_H_
+#ifndef ZEPHYR_INCLUDE_NET_MQTT_H_
+#define ZEPHYR_INCLUDE_NET_MQTT_H_
 
 #include <net/mqtt_types.h>
 #include <net/net_context.h>
@@ -471,4 +471,4 @@ int mqtt_rx_publish(struct mqtt_ctx *ctx, struct net_buf *rx);
 }
 #endif
 
-#endif /* _MQTT_H_ */
+#endif /* ZEPHYR_INCLUDE_NET_MQTT_H_ */
diff --git a/include/net/mqtt_types.h b/include/net/mqtt_types.h
index 4e65642f8d6..a43ba99aa73 100644
--- a/include/net/mqtt_types.h
+++ b/include/net/mqtt_types.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _MQTT_TYPES_H_
-#define _MQTT_TYPES_H_
+#ifndef ZEPHYR_INCLUDE_NET_MQTT_TYPES_H_
+#define ZEPHYR_INCLUDE_NET_MQTT_TYPES_H_
 
 #include <zephyr/types.h>
 
@@ -96,4 +96,4 @@ struct mqtt_publish_msg {
 }
 #endif
 
-#endif /* _MQTT_TYPES_H_ */
+#endif /* ZEPHYR_INCLUDE_NET_MQTT_TYPES_H_ */
diff --git a/include/net/net_app.h b/include/net/net_app.h
index 245abd1dd4f..90fe87c1f6f 100644
--- a/include/net/net_app.h
+++ b/include/net/net_app.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_APP_H
-#define __NET_APP_H
+#ifndef ZEPHYR_INCLUDE_NET_NET_APP_H_
+#define ZEPHYR_INCLUDE_NET_NET_APP_H_
 
 #if defined(CONFIG_NET_APP_TLS) || defined(CONFIG_NET_APP_DTLS)
 #if defined(CONFIG_MBEDTLS)
@@ -993,4 +993,4 @@ void net_app_client_foreach(net_app_ctx_cb_t cb, void *user_data);
 }
 #endif
 
-#endif /* __NET_APP_H */
+#endif /* ZEPHYR_INCLUDE_NET_NET_APP_H_ */
diff --git a/include/net/net_config.h b/include/net/net_config.h
index 4a672d80331..609a9762eb9 100644
--- a/include/net/net_config.h
+++ b/include/net/net_config.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_CONFIG_H
-#define __NET_CONFIG_H
+#ifndef ZEPHYR_INCLUDE_NET_NET_CONFIG_H_
+#define ZEPHYR_INCLUDE_NET_NET_CONFIG_H_
 
 #include <zephyr/types.h>
 
@@ -49,4 +49,4 @@ int net_config_init(const char *app_info, u32_t flags, s32_t timeout);
 }
 #endif
 
-#endif /* __NET_CONFIG_H */
+#endif /* ZEPHYR_INCLUDE_NET_NET_CONFIG_H_ */
diff --git a/include/net/net_context.h b/include/net/net_context.h
index 2b9bcdad7b2..9b1c2ec96d8 100644
--- a/include/net/net_context.h
+++ b/include/net/net_context.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_CONTEXT_H
-#define __NET_CONTEXT_H
+#ifndef ZEPHYR_INCLUDE_NET_NET_CONTEXT_H_
+#define ZEPHYR_INCLUDE_NET_NET_CONTEXT_H_
 
 /**
  * @brief Application network context
@@ -933,4 +933,4 @@ static inline void net_context_setup_pools(struct net_context *context,
  * @}
  */
 
-#endif /* __NET_CONTEXT_H */
+#endif /* ZEPHYR_INCLUDE_NET_NET_CONTEXT_H_ */
diff --git a/include/net/net_core.h b/include/net/net_core.h
index 2ccfd658599..4a5701a7dac 100644
--- a/include/net/net_core.h
+++ b/include/net/net_core.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_CORE_H
-#define __NET_CORE_H
+#ifndef ZEPHYR_INCLUDE_NET_NET_CORE_H_
+#define ZEPHYR_INCLUDE_NET_NET_CORE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -248,4 +248,4 @@ static inline void net_analyze_stack(const char *name,
 }
 #endif
 
-#endif /* __NET_CORE_H */
+#endif /* ZEPHYR_INCLUDE_NET_NET_CORE_H_ */
diff --git a/include/net/net_event.h b/include/net/net_event.h
index 996bd0fc2d0..cae104c1670 100644
--- a/include/net/net_event.h
+++ b/include/net/net_event.h
@@ -9,8 +9,8 @@
  * @brief Network Events code public header
  */
 
-#ifndef __NET_EVENT_H__
-#define __NET_EVENT_H__
+#ifndef ZEPHYR_INCLUDE_NET_NET_EVENT_H_
+#define ZEPHYR_INCLUDE_NET_NET_EVENT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -193,4 +193,4 @@ struct net_event_ipv6_route {
  * @}
  */
 
-#endif /* __NET_EVENT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_NET_EVENT_H_ */
diff --git a/include/net/net_if.h b/include/net/net_if.h
index 7790ed75c51..e9bf04480fd 100644
--- a/include/net/net_if.h
+++ b/include/net/net_if.h
@@ -9,8 +9,8 @@
  * @brief Public API for network interface
  */
 
-#ifndef __NET_IF_H__
-#define __NET_IF_H__
+#ifndef ZEPHYR_INCLUDE_NET_NET_IF_H_
+#define ZEPHYR_INCLUDE_NET_NET_IF_H_
 
 /**
  * @brief Network Interface abstraction layer
@@ -1857,4 +1857,4 @@ struct net_if_api {
  * @}
  */
 
-#endif /* __NET_IF_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_NET_IF_H_ */
diff --git a/include/net/net_ip.h b/include/net/net_ip.h
index 90a563e68e9..0083436911a 100644
--- a/include/net/net_ip.h
+++ b/include/net/net_ip.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_IP_H
-#define __NET_IP_H
+#ifndef ZEPHYR_INCLUDE_NET_NET_IP_H_
+#define ZEPHYR_INCLUDE_NET_NET_IP_H_
 
 /**
  * @brief IPv4/IPv6 primitives and helpers
@@ -1054,4 +1054,4 @@ static inline u8_t net_priority2vlan(enum net_priority priority)
  */
 
 
-#endif /* __NET_IP_H */
+#endif /* ZEPHYR_INCLUDE_NET_NET_IP_H_ */
diff --git a/include/net/net_l2.h b/include/net/net_l2.h
index 4af747cdd7c..1b79f2c06f4 100644
--- a/include/net/net_l2.h
+++ b/include/net/net_l2.h
@@ -9,8 +9,8 @@
  * @brief Public API for network L2 interface
  */
 
-#ifndef __NET_L2_H__
-#define __NET_L2_H__
+#ifndef ZEPHYR_INCLUDE_NET_NET_L2_H_
+#define ZEPHYR_INCLUDE_NET_NET_L2_H_
 
 #include <net/buf.h>
 
@@ -128,4 +128,4 @@ NET_L2_DECLARE_PUBLIC(OPENTHREAD_L2);
 }
 #endif
 
-#endif /* __NET_L2_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_NET_L2_H_ */
diff --git a/include/net/net_linkaddr.h b/include/net/net_linkaddr.h
index e6e67ecf90b..4e57a8c62a5 100644
--- a/include/net/net_linkaddr.h
+++ b/include/net/net_linkaddr.h
@@ -9,8 +9,8 @@
  * @brief Public API for network link address
  */
 
-#ifndef __NET_LINKADDR_H__
-#define __NET_LINKADDR_H__
+#ifndef ZEPHYR_INCLUDE_NET_NET_LINKADDR_H_
+#define ZEPHYR_INCLUDE_NET_NET_LINKADDR_H_
 
 #include <zephyr/types.h>
 #include <stdbool.h>
@@ -140,4 +140,4 @@ static inline int net_linkaddr_set(struct net_linkaddr_storage *lladdr_store,
 }
 #endif
 
-#endif /* __NET_LINKADDR_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_NET_LINKADDR_H_ */
diff --git a/include/net/net_mgmt.h b/include/net/net_mgmt.h
index 9c38a3171e9..c9e9c141f65 100644
--- a/include/net/net_mgmt.h
+++ b/include/net/net_mgmt.h
@@ -9,8 +9,8 @@
  * @brief Network Management API public header
  */
 
-#ifndef __NET_MGMT_H__
-#define __NET_MGMT_H__
+#ifndef ZEPHYR_INCLUDE_NET_NET_MGMT_H_
+#define ZEPHYR_INCLUDE_NET_NET_MGMT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -300,4 +300,4 @@ static inline int net_mgmt_event_wait_on_iface(struct net_if *iface,
 }
 #endif
 
-#endif /* __NET_MGMT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_NET_MGMT_H_ */
diff --git a/include/net/net_offload.h b/include/net/net_offload.h
index dd6360a93bf..9ddc213cedb 100644
--- a/include/net/net_offload.h
+++ b/include/net/net_offload.h
@@ -9,8 +9,8 @@
  * @brief Public API for offloading IP stack
  */
 
-#ifndef __NET_OFFLOAD_H__
-#define __NET_OFFLOAD_H__
+#ifndef ZEPHYR_INCLUDE_NET_NET_OFFLOAD_H_
+#define ZEPHYR_INCLUDE_NET_NET_OFFLOAD_H_
 
 /**
  * @brief Network offloading interface
@@ -438,4 +438,4 @@ static inline int net_offload_put(struct net_if *iface,
  * @}
  */
 
-#endif /* __NET_OFFLOAD_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_NET_OFFLOAD_H_ */
diff --git a/include/net/net_pkt.h b/include/net/net_pkt.h
index 6e7f18c96dd..6e80b452181 100644
--- a/include/net/net_pkt.h
+++ b/include/net/net_pkt.h
@@ -13,8 +13,8 @@
 
 /* Data buffer API - used for all data to/from net */
 
-#ifndef __NET_PKT_H__
-#define __NET_PKT_H__
+#ifndef ZEPHYR_INCLUDE_NET_NET_PKT_H_
+#define ZEPHYR_INCLUDE_NET_NET_PKT_H_
 
 #include <zephyr/types.h>
 #include <stdbool.h>
@@ -1882,4 +1882,4 @@ const char *net_pkt_pool2str(struct net_buf_pool *pool);
 }
 #endif
 
-#endif /* __NET_PKT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_NET_PKT_H_ */
diff --git a/include/net/net_stats.h b/include/net/net_stats.h
index ea6f45f5f42..e316c40320a 100644
--- a/include/net/net_stats.h
+++ b/include/net/net_stats.h
@@ -11,8 +11,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_STATS_H
-#define __NET_STATS_H
+#ifndef ZEPHYR_INCLUDE_NET_NET_STATS_H_
+#define ZEPHYR_INCLUDE_NET_NET_STATS_H_
 
 #include <zephyr/types.h>
 #include <net/net_core.h>
@@ -480,4 +480,4 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_ETHERNET);
 }
 #endif
 
-#endif /* __NET_STATS_H */
+#endif /* ZEPHYR_INCLUDE_NET_NET_STATS_H_ */
diff --git a/include/net/net_timeout.h b/include/net/net_timeout.h
index d0af6c2dd40..9f537953405 100644
--- a/include/net/net_timeout.h
+++ b/include/net/net_timeout.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_TIMEOUT_H
-#define __NET_TIMEOUT_H
+#ifndef ZEPHYR_INCLUDE_NET_NET_TIMEOUT_H_
+#define ZEPHYR_INCLUDE_NET_NET_TIMEOUT_H_
 
 /**
  * @brief Network long timeout primitives and helpers
@@ -63,4 +63,4 @@ struct net_timeout {
  */
 
 
-#endif /* __NET_TIMEOUT_H */
+#endif /* ZEPHYR_INCLUDE_NET_NET_TIMEOUT_H_ */
diff --git a/include/net/openthread.h b/include/net/openthread.h
index b48dfeb1e6a..d2fa776842a 100644
--- a/include/net/openthread.h
+++ b/include/net/openthread.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_OPENTHREAD_H_
-#define __NET_OPENTHREAD_H_
+#ifndef ZEPHYR_INCLUDE_NET_OPENTHREAD_H_
+#define ZEPHYR_INCLUDE_NET_OPENTHREAD_H_
 
 #include <kernel.h>
 
@@ -36,4 +36,4 @@ struct openthread_context {
 }
 #endif
 
-#endif /* __NET_OPENTHREAD_H_ */
+#endif /* ZEPHYR_INCLUDE_NET_OPENTHREAD_H_ */
diff --git a/include/net/promiscuous.h b/include/net/promiscuous.h
index 598c71e61ca..75a6fb78419 100644
--- a/include/net/promiscuous.h
+++ b/include/net/promiscuous.h
@@ -11,8 +11,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __PROMISCUOUS_H
-#define __PROMISCUOUS_H
+#ifndef ZEPHYR_INCLUDE_NET_PROMISCUOUS_H_
+#define ZEPHYR_INCLUDE_NET_PROMISCUOUS_H_
 
 /**
  * @brief Promiscuous mode support.
@@ -90,4 +90,4 @@ static inline int net_promisc_mode_off(struct net_if *iface)
  * @}
  */
 
-#endif /* __PROMISCUOUS_H */
+#endif /* ZEPHYR_INCLUDE_NET_PROMISCUOUS_H_ */
diff --git a/include/net/ptp_time.h b/include/net/ptp_time.h
index da405a48160..30ff5dff4bf 100644
--- a/include/net/ptp_time.h
+++ b/include/net/ptp_time.h
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __PTP_TIME_H
-#define __PTP_TIME_H
+#ifndef ZEPHYR_INCLUDE_NET_PTP_TIME_H_
+#define ZEPHYR_INCLUDE_NET_PTP_TIME_H_
 
 /**
  * @brief Precision Time Protocol time specification
@@ -66,4 +66,4 @@ struct net_ptp_time {
  * @}
  */
 
-#endif /* __PTP_TIME_H */
+#endif /* ZEPHYR_INCLUDE_NET_PTP_TIME_H_ */
diff --git a/include/net/sntp.h b/include/net/sntp.h
index c2ca5031ac0..925300b6f83 100644
--- a/include/net/sntp.h
+++ b/include/net/sntp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SNTP_H
-#define __SNTP_H
+#ifndef ZEPHYR_INCLUDE_NET_SNTP_H_
+#define ZEPHYR_INCLUDE_NET_SNTP_H_
 
 #include <net/net_app.h>
 
diff --git a/include/net/socket.h b/include/net/socket.h
index 105f2ee5c8b..eb51ed0e5a6 100644
--- a/include/net/socket.h
+++ b/include/net/socket.h
@@ -11,8 +11,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __NET_SOCKET_H
-#define __NET_SOCKET_H
+#ifndef ZEPHYR_INCLUDE_NET_SOCKET_H_
+#define ZEPHYR_INCLUDE_NET_SOCKET_H_
 
 /**
  * @brief BSD Sockets compatible API
@@ -369,4 +369,4 @@ static inline void freeaddrinfo(struct zsock_addrinfo *ai)
  * @}
  */
 
-#endif /* __NET_SOCKET_H */
+#endif /* ZEPHYR_INCLUDE_NET_SOCKET_H_ */
diff --git a/include/net/socket_offload.h b/include/net/socket_offload.h
index 8ef97e8bcb9..f4e53f68a1c 100644
--- a/include/net/socket_offload.h
+++ b/include/net/socket_offload.h
@@ -9,8 +9,8 @@
  * @brief Socket Offload Redirect API
  */
 
-#ifndef __SOCKET_OFFLOAD_H__
-#define __SOCKET_OFFLOAD_H__
+#ifndef ZEPHYR_INCLUDE_NET_SOCKET_OFFLOAD_H_
+#define ZEPHYR_INCLUDE_NET_SOCKET_OFFLOAD_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -144,4 +144,4 @@ static inline ssize_t sendto(int sock, const void *buf,
 }
 #endif
 
-#endif /* __SOCKET_OFFLOAD_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_SOCKET_OFFLOAD_H_ */
diff --git a/include/net/socket_offload_ops.h b/include/net/socket_offload_ops.h
index 0fbc5a66a52..0d3f6fa1264 100644
--- a/include/net/socket_offload_ops.h
+++ b/include/net/socket_offload_ops.h
@@ -9,8 +9,8 @@
  * @brief Socket Offload Redirect API
  */
 
-#ifndef __SOCKET_OFFLOAD_OPS_H__
-#define __SOCKET_OFFLOAD_OPS_H__
+#ifndef ZEPHYR_INCLUDE_NET_SOCKET_OFFLOAD_OPS_H_
+#define ZEPHYR_INCLUDE_NET_SOCKET_OFFLOAD_OPS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,4 +53,4 @@ extern void socket_offload_register(const struct socket_offload *ops);
 }
 #endif
 
-#endif /* __SOCKET_OFFLOAD_OPS_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_SOCKET_OFFLOAD_OPS_H_ */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 96dcbf5015a..756eff468ac 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __TCP_H
-#define __TCP_H
+#ifndef ZEPHYR_INCLUDE_NET_TCP_H_
+#define ZEPHYR_INCLUDE_NET_TCP_H_
 
 #include <zephyr/types.h>
 
@@ -66,4 +66,4 @@ struct net_tcp_hdr *net_tcp_set_hdr(struct net_pkt *pkt,
 }
 #endif
 
-#endif /* __TCP_H */
+#endif /* ZEPHYR_INCLUDE_NET_TCP_H_ */
diff --git a/include/net/tls_credentials.h b/include/net/tls_credentials.h
index d42d487c546..a6e644c05d4 100644
--- a/include/net/tls_credentials.h
+++ b/include/net/tls_credentials.h
@@ -10,8 +10,8 @@
  * An API for applications to configure TLS credentials.
  */
 
-#ifndef __TLS_CREDENTIAL_H
-#define __TLS_CREDENTIAL_H
+#ifndef ZEPHYR_INCLUDE_NET_TLS_CREDENTIALS_H_
+#define ZEPHYR_INCLUDE_NET_TLS_CREDENTIALS_H_
 
 /**
  * @brief TLS credentials management
@@ -108,4 +108,4 @@ int tls_credential_delete(sec_tag_t tag, enum tls_credential_type type);
  * @}
  */
 
-#endif /* __TLS_CREDENTIAL_H */
+#endif /* ZEPHYR_INCLUDE_NET_TLS_CREDENTIALS_H_ */
diff --git a/include/net/trickle.h b/include/net/trickle.h
index abc3903e700..e7ca1ab4db3 100644
--- a/include/net/trickle.h
+++ b/include/net/trickle.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __TRICKLE_H
-#define __TRICKLE_H
+#ifndef ZEPHYR_INCLUDE_NET_TRICKLE_H_
+#define ZEPHYR_INCLUDE_NET_TRICKLE_H_
 
 #include <stdbool.h>
 #include <zephyr/types.h>
@@ -135,4 +135,4 @@ static inline bool net_trickle_is_running(struct net_trickle *trickle)
 }
 #endif
 
-#endif /* __TRICKLE_H */
+#endif /* ZEPHYR_INCLUDE_NET_TRICKLE_H_ */
diff --git a/include/net/udp.h b/include/net/udp.h
index b2b6ddd8a80..e7a875526d2 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __UDP_H
-#define __UDP_H
+#ifndef ZEPHYR_INCLUDE_NET_UDP_H_
+#define ZEPHYR_INCLUDE_NET_UDP_H_
 
 #include <zephyr/types.h>
 
@@ -92,4 +92,4 @@ static inline struct net_udp_hdr *net_udp_set_hdr(struct net_pkt *pkt,
 }
 #endif
 
-#endif /* __UDP_H */
+#endif /* ZEPHYR_INCLUDE_NET_UDP_H_ */
diff --git a/include/net/websocket.h b/include/net/websocket.h
index 880ac178c10..19eed0062cb 100644
--- a/include/net/websocket.h
+++ b/include/net/websocket.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __WEBSOCKET_H__
-#define __WEBSOCKET_H__
+#ifndef ZEPHYR_INCLUDE_NET_WEBSOCKET_H_
+#define ZEPHYR_INCLUDE_NET_WEBSOCKET_H_
 
 #include <net/http.h>
 
diff --git a/include/net/websocket_console.h b/include/net/websocket_console.h
index 4a626d1cda9..5648c213b5a 100644
--- a/include/net/websocket_console.h
+++ b/include/net/websocket_console.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __WEBSOCKET_CONSOLE_H__
-#define __WEBSOCKET_CONSOLE_H__
+#ifndef ZEPHYR_INCLUDE_NET_WEBSOCKET_CONSOLE_H_
+#define ZEPHYR_INCLUDE_NET_WEBSOCKET_CONSOLE_H_
 
 #include <net/websocket.h>
 
@@ -57,4 +57,4 @@ int ws_console_recv(struct http_ctx *ctx, struct net_pkt *pkt);
  * @}
  */
 
-#endif /* __WEBSOCKET_CONSOLE_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_WEBSOCKET_CONSOLE_H_ */
diff --git a/include/net/wifi.h b/include/net/wifi.h
index 50c2fce52ee..38bd3a93836 100644
--- a/include/net/wifi.h
+++ b/include/net/wifi.h
@@ -9,8 +9,8 @@
  * @brief General WiFi Definitions
  */
 
-#ifndef __WIFI_H__
-#define __WIFI_H__
+#ifndef ZEPHYR_INCLUDE_NET_WIFI_H_
+#define ZEPHYR_INCLUDE_NET_WIFI_H_
 
 enum wifi_security_type {
 	WIFI_SECURITY_TYPE_NONE = 0,
@@ -23,4 +23,4 @@ enum wifi_security_type {
 #define WIFI_CHANNEL_MAX 14
 #define WIFI_CHANNEL_ANY 255
 
-#endif /* __WIFI_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_WIFI_H_ */
diff --git a/include/net/wifi_mgmt.h b/include/net/wifi_mgmt.h
index eabb65edda5..e830fca756e 100644
--- a/include/net/wifi_mgmt.h
+++ b/include/net/wifi_mgmt.h
@@ -9,8 +9,8 @@
  * @brief WiFi L2 stack public header
  */
 
-#ifndef __WIFI_MGMT_H__
-#define __WIFI_MGMT_H__
+#ifndef ZEPHYR_INCLUDE_NET_WIFI_MGMT_H_
+#define ZEPHYR_INCLUDE_NET_WIFI_MGMT_H_
 
 #include <net/net_mgmt.h>
 #include <net/wifi.h>
@@ -123,4 +123,4 @@ void wifi_mgmt_raise_disconnect_result_event(struct net_if *iface, int status);
 
 #endif /* CONFIG_WIFI_OFFLOAD */
 
-#endif /* __WIFI_MGMT_H__ */
+#endif /* ZEPHYR_INCLUDE_NET_WIFI_MGMT_H_ */
diff --git a/include/nvs/nvs.h b/include/nvs/nvs.h
index 3173f92994e..782de74ce7b 100644
--- a/include/nvs/nvs.h
+++ b/include/nvs/nvs.h
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __NVS_H_
-#define __NVS_H_
+#ifndef ZEPHYR_INCLUDE_NVS_NVS_H_
+#define ZEPHYR_INCLUDE_NVS_NVS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -179,4 +179,4 @@ ssize_t nvs_read_hist(struct nvs_fs *fs, u16_t id, void *data, size_t len,
 }
 #endif
 
-#endif /* __NVS_H_ */
+#endif /* ZEPHYR_INCLUDE_NVS_NVS_H_ */
diff --git a/include/pinmux.h b/include/pinmux.h
index b3c3ef2e9a9..e8029f734e5 100644
--- a/include/pinmux.h
+++ b/include/pinmux.h
@@ -9,8 +9,8 @@
  * Public APIs for Pinmux drivers
  */
 
-#ifndef __INCLUDE_PINMUX_H
-#define __INCLUDE_PINMUX_H
+#ifndef ZEPHYR_INCLUDE_PINMUX_H_
+#define ZEPHYR_INCLUDE_PINMUX_H_
 
 /**
  * @brief Pinmux Interface
@@ -111,4 +111,4 @@ static inline int pinmux_pin_input_enable(struct device *dev, u32_t pin,
  * @}
  */
 
-#endif /* __INCLUDE_PINMUX_H */
+#endif /* ZEPHYR_INCLUDE_PINMUX_H_ */
diff --git a/include/posix/mqueue.h b/include/posix/mqueue.h
index e2ec4096a9d..2d0ed3a9d56 100644
--- a/include/posix/mqueue.h
+++ b/include/posix/mqueue.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __MQUEUE_H__
-#define __MQUEUE_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_MQUEUE_H_
+#define ZEPHYR_INCLUDE_POSIX_MQUEUE_H_
 
 #include <kernel.h>
 #include <posix/time.h>
@@ -63,4 +63,4 @@ int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
 }
 #endif
 
-#endif  /* __MQUEUE_H__ */
+#endif  /* ZEPHYR_INCLUDE_POSIX_MQUEUE_H_ */
diff --git a/include/posix/posix_sched.h b/include/posix/posix_sched.h
index be5f45881e1..726e47a35bc 100644
--- a/include/posix/posix_sched.h
+++ b/include/posix/posix_sched.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __POSIX_SCHED_H__
-#define __POSIX_SCHED_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_POSIX_SCHED_H_
+#define ZEPHYR_INCLUDE_POSIX_POSIX_SCHED_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,4 +42,4 @@ int sched_get_priority_max(int policy);
 }
 #endif
 
-#endif /* __POSIX_SCHED_H__ */
+#endif /* ZEPHYR_INCLUDE_POSIX_POSIX_SCHED_H_ */
diff --git a/include/posix/pthread.h b/include/posix/pthread.h
index 255418c54d5..4f187576e67 100644
--- a/include/posix/pthread.h
+++ b/include/posix/pthread.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __PTHREAD_H__
-#define __PTHREAD_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_PTHREAD_H_
+#define ZEPHYR_INCLUDE_POSIX_PTHREAD_H_
 
 #include <kernel.h>
 #include <wait_q.h>
@@ -517,4 +517,4 @@ int pthread_key_delete(pthread_key_t key);
 int pthread_setspecific(pthread_key_t key, const void *value);
 void *pthread_getspecific(pthread_key_t key);
 
-#endif /* __PTHREAD_H__ */
+#endif /* ZEPHYR_INCLUDE_POSIX_PTHREAD_H_ */
diff --git a/include/posix/pthread_key.h b/include/posix/pthread_key.h
index ac6521a1b66..6d763dfa9ac 100644
--- a/include/posix/pthread_key.h
+++ b/include/posix/pthread_key.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __POSIX_THREAD_KEY_H__
-#define __POSIX_THREAD_KEY_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_PTHREAD_KEY_H_
+#define ZEPHYR_INCLUDE_POSIX_PTHREAD_KEY_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,4 +49,4 @@ typedef struct pthread_key_data {
 }
 #endif
 
-#endif /* __POSIX_THREAD_KEY_H__ */
+#endif /* ZEPHYR_INCLUDE_POSIX_PTHREAD_KEY_H_*/
diff --git a/include/posix/semaphore.h b/include/posix/semaphore.h
index 52c9dc6bfdb..283e295e923 100644
--- a/include/posix/semaphore.h
+++ b/include/posix/semaphore.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _POSIX_SEMAPHORE_H
-#define _POSIX_SEMAPHORE_H
+#ifndef ZEPHYR_INCLUDE_POSIX_SEMAPHORE_H_
+#define ZEPHYR_INCLUDE_POSIX_SEMAPHORE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,4 +25,4 @@ int sem_wait(sem_t *semaphore);
 }
 #endif
 
-#endif /* POSIX_SEMAPHORE_H */
+#endif /* ZEPHYR_INCLUDE_POSIX_SEMAPHORE_H_ */
diff --git a/include/posix/signal.h b/include/posix/signal.h
index f04ab3c5154..4205eb3a438 100644
--- a/include/posix/signal.h
+++ b/include/posix/signal.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __POSIX_SIGNAL_H__
-#define __POSIX_SIGNAL_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_SIGNAL_H_
+#define ZEPHYR_INCLUDE_POSIX_SIGNAL_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,4 +41,4 @@ typedef struct sigevent {
 }
 #endif
 
-#endif /* __POSIX_TIME_H__ */
+#endif /* POSIX__SIGNAL_H */
diff --git a/include/posix/sys/stat.h b/include/posix/sys/stat.h
index 7a594707d51..fd4369c8857 100644
--- a/include/posix/sys/stat.h
+++ b/include/posix/sys/stat.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __POSIX_STAT_H__
-#define __POSIX_STAT_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_SYS_STAT_H_
+#define ZEPHYR_INCLUDE_POSIX_SYS_STAT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,4 +54,4 @@ struct stat {
 }
 #endif
 
-#endif	/* __POSIX_STAT_H__ */
+#endif	/* ZEPHYR_INCLUDE_POSIX_SYS_STAT_H_ */
diff --git a/include/posix/sys/types.h b/include/posix/sys/types.h
index 912ac54a520..41a2e02634a 100644
--- a/include/posix/sys/types.h
+++ b/include/posix/sys/types.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __POSIX_TYPES_H__
-#define __POSIX_TYPES_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_SYS_TYPES_H_
+#define ZEPHYR_INCLUDE_POSIX_SYS_TYPES_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -88,4 +88,4 @@ typedef struct pthread_rwlock_obj {
 }
 #endif
 
-#endif	/* __POSIX_TYPES_H__ */
+#endif	/* ZEPHYR_INCLUDE_POSIX_SYS_TYPES_H_ */
diff --git a/include/posix/time.h b/include/posix/time.h
index ddf51c80316..f5bd9bb3781 100644
--- a/include/posix/time.h
+++ b/include/posix/time.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __POSIX_TIME_H__
-#define __POSIX_TIME_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_TIME_H_
+#define ZEPHYR_INCLUDE_POSIX_TIME_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -64,4 +64,4 @@ int gettimeofday(struct timeval *tv, const void *tz);
 }
 #endif
 
-#endif /* __POSIX_TIME_H__ */
+#endif /* ZEPHYR_INCLUDE_POSIX_TIME_H_ */
diff --git a/include/posix/unistd.h b/include/posix/unistd.h
index aa8040f4dcd..672dc4665d4 100644
--- a/include/posix/unistd.h
+++ b/include/posix/unistd.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __POSIX_UNISTD_H__
-#define __POSIX_UNISTD_H__
+#ifndef ZEPHYR_INCLUDE_POSIX_UNISTD_H_
+#define ZEPHYR_INCLUDE_POSIX_UNISTD_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,4 +50,4 @@ int usleep(useconds_t useconds);
 }
 #endif
 
-#endif	/* __POSIX_UNISTD_H__ */
+#endif	/* ZEPHYR_INCLUDE_POSIX_UNISTD_H_ */
diff --git a/include/power.h b/include/power.h
index 60a28455f39..0b1f58a36ae 100644
--- a/include/power.h
+++ b/include/power.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INCpower
-#define __INCpower
+#ifndef ZEPHYR_INCLUDE_POWER_H_
+#define ZEPHYR_INCLUDE_POWER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -121,4 +121,4 @@ extern int _sys_soc_suspend(s32_t ticks);
 }
 #endif
 
-#endif /* __INCpower */
+#endif /* ZEPHYR_INCLUDE_POWER_H_ */
diff --git a/include/ptp_clock.h b/include/ptp_clock.h
index 7e56142521c..68120b97039 100644
--- a/include/ptp_clock.h
+++ b/include/ptp_clock.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _PTP_CLOCK_H_
-#define _PTP_CLOCK_H_
+#ifndef ZEPHYR_INCLUDE_PTP_CLOCK_H_
+#define ZEPHYR_INCLUDE_PTP_CLOCK_H_
 
 #include <stdint.h>
 #include <device.h>
@@ -92,4 +92,4 @@ static inline int ptp_clock_rate_adjust(struct device *dev, float rate)
 }
 #endif
 
-#endif /* __PTP_CLOCK_H__ */
+#endif /* ZEPHYR_INCLUDE_PTP_CLOCK_H_ */
diff --git a/include/pwm.h b/include/pwm.h
index 70d5c78c33f..1a2aa55dcd9 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -9,8 +9,8 @@
  * @brief Public PWM Driver APIs
  */
 
-#ifndef __PWM_H__
-#define __PWM_H__
+#ifndef ZEPHYR_INCLUDE_PWM_H_
+#define ZEPHYR_INCLUDE_PWM_H_
 
 /**
  * @brief PWM Interface
@@ -144,4 +144,4 @@ static inline int pwm_pin_set_usec(struct device *dev, u32_t pwm,
 
 #include <syscalls/pwm.h>
 
-#endif /* __PWM_H__ */
+#endif /* ZEPHYR_INCLUDE_PWM_H_ */
diff --git a/include/random/rand32.h b/include/random/rand32.h
index c214d63b750..186b68fb739 100644
--- a/include/random/rand32.h
+++ b/include/random/rand32.h
@@ -17,8 +17,8 @@
  * sys_rand32_get().
  */
 
-#ifndef __INCrand32h
-#define __INCrand32h
+#ifndef ZEPHYR_INCLUDE_RANDOM_RAND32_H_
+#define ZEPHYR_INCLUDE_RANDOM_RAND32_H_
 
 #include <zephyr/types.h>
 
@@ -32,4 +32,4 @@ extern u32_t sys_rand32_get(void);
 }
 #endif
 
-#endif /* __INCrand32h */
+#endif /* ZEPHYR_INCLUDE_RANDOM_RAND32_H_ */
diff --git a/include/ring_buffer.h b/include/ring_buffer.h
index d7fb814a2e2..79296eeadb7 100644
--- a/include/ring_buffer.h
+++ b/include/ring_buffer.h
@@ -7,8 +7,8 @@
  */
 /** @file */
 
-#ifndef __RING_BUFFER_H__
-#define __RING_BUFFER_H__
+#ifndef ZEPHYR_INCLUDE_RING_BUFFER_H_
+#define ZEPHYR_INCLUDE_RING_BUFFER_H_
 
 #include <kernel.h>
 #include <misc/util.h>
@@ -208,4 +208,4 @@ int sys_ring_buf_get(struct ring_buf *buf, u16_t *type, u8_t *value,
 }
 #endif
 
-#endif /* __RING_BUFFER_H__ */
+#endif /* ZEPHYR_INCLUDE_RING_BUFFER_H_ */
diff --git a/include/rtc.h b/include/rtc.h
index ee1a4b5daa6..f72d4e8157a 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _RTC_H_
-#define _RTC_H_
+#ifndef ZEPHYR_INCLUDE_RTC_H_
+#define ZEPHYR_INCLUDE_RTC_H_
 #include <zephyr/types.h>
 #include <device.h>
 #include <misc/util.h>
diff --git a/include/sched_priq.h b/include/sched_priq.h
index cd3be876ffe..0850b373375 100644
--- a/include/sched_priq.h
+++ b/include/sched_priq.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _sched_priq__h_
-#define _sched_priq__h_
+#ifndef ZEPHYR_INCLUDE_SCHED_PRIQ_H_
+#define ZEPHYR_INCLUDE_SCHED_PRIQ_H_
 
 #include <misc/util.h>
 #include <misc/dlist.h>
@@ -60,4 +60,4 @@ void _priq_mq_add(struct _priq_mq *pq, struct k_thread *thread);
 void _priq_mq_remove(struct _priq_mq *pq, struct k_thread *thread);
 struct k_thread *_priq_mq_best(struct _priq_mq *pq);
 
-#endif /* _sched_priq__h_ */
+#endif /* ZEPHYR_INCLUDE_SCHED_PRIQ_H_ */
diff --git a/include/sensor.h b/include/sensor.h
index ea6f02b035b..9873e555d1f 100644
--- a/include/sensor.h
+++ b/include/sensor.h
@@ -9,8 +9,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __SENSOR_H__
-#define __SENSOR_H__
+#ifndef ZEPHYR_INCLUDE_SENSOR_H_
+#define ZEPHYR_INCLUDE_SENSOR_H_
 
 /**
  * @brief Sensor Interface
@@ -526,4 +526,4 @@ static inline double sensor_value_to_double(struct sensor_value *val)
  * @}
  */
 
-#endif /* __SENSOR_H__ */
+#endif /* ZEPHYR_INCLUDE_SENSOR_H_ */
diff --git a/include/settings/settings.h b/include/settings/settings.h
index 08263f189c9..9119f9181bd 100644
--- a/include/settings/settings.h
+++ b/include/settings/settings.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SETTINGS_H_
-#define __SETTINGS_H_
+#ifndef ZEPHYR_INCLUDE_SETTINGS_SETTINGS_H_
+#define ZEPHYR_INCLUDE_SETTINGS_SETTINGS_H_
 
 #include <misc/util.h>
 #include <misc/slist.h>
@@ -267,4 +267,4 @@ struct settings_store {
 }
 #endif
 
-#endif /* __SETTINGS_H_ */
+#endif /* ZEPHYR_INCLUDE_SETTINGS_SETTINGS_H_ */
diff --git a/include/shared_irq.h b/include/shared_irq.h
index e5ee2211af5..1dcd80ede34 100644
--- a/include/shared_irq.h
+++ b/include/shared_irq.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SHIRQ_H_
-#define _SHIRQ_H_
+#ifndef ZEPHYR_INCLUDE_SHARED_IRQ_H_
+#define ZEPHYR_INCLUDE_SHARED_IRQ_H_
 
 #include <autoconf.h>
 
@@ -92,4 +92,4 @@ static inline int shared_irq_disable(struct device *dev, struct device *isr_dev)
 }
 #endif
 
-#endif /* _SHARED_IRQ_H_ */
+#endif /* ZEPHYR_INCLUDE_SHARED_IRQ_H_ */
diff --git a/include/shell/shell.h b/include/shell/shell.h
index 1a657bb05bf..56c31341d65 100644
--- a/include/shell/shell.h
+++ b/include/shell/shell.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _SHELL_H_
-#define _SHELL_H_
+#ifndef ZEPHYR_INCLUDE_SHELL_SHELL_H_
+#define ZEPHYR_INCLUDE_SHELL_SHELL_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -205,4 +205,4 @@ static inline int shell_run(struct device *dev)
 }
 #endif
 
-#endif /* _SHELL_H_ */
+#endif /* ZEPHYR_INCLUDE_SHELL_SHELL_H_ */
diff --git a/include/spi.h b/include/spi.h
index 486e95b1b7c..fcce0c63b23 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -9,8 +9,8 @@
  * @brief Public API for SPI drivers and applications
  */
 
-#ifndef __SPI_H__
-#define __SPI_H__
+#ifndef ZEPHYR_INCLUDE_SPI_H_
+#define ZEPHYR_INCLUDE_SPI_H_
 
 /**
  * @brief SPI Interface
@@ -423,4 +423,4 @@ static inline int _impl_spi_release(struct device *dev,
 
 #include <syscalls/spi.h>
 
-#endif /* __SPI_H__ */
+#endif /* ZEPHYR_INCLUDE_SPI_H_ */
diff --git a/include/spinlock.h b/include/spinlock.h
index 8b323917991..a0e5fb360cb 100644
--- a/include/spinlock.h
+++ b/include/spinlock.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _SPINLOCK_H
-#define _SPINLOCK_H
+#ifndef ZEPHYR_INCLUDE_SPINLOCK_H_
+#define ZEPHYR_INCLUDE_SPINLOCK_H_
 
 #include <atomic.h>
 
@@ -66,4 +66,4 @@ static inline void k_spin_unlock(struct k_spinlock *l, k_spinlock_key_t key)
 	_arch_irq_unlock(key.key);
 }
 
-#endif /* _SPINLOCK_H */
+#endif /* ZEPHYR_INCLUDE_SPINLOCK_H_ */
diff --git a/include/stats.h b/include/stats.h
index 3f9c2ac24a3..7ca03eb0bde 100644
--- a/include/stats.h
+++ b/include/stats.h
@@ -48,8 +48,8 @@
  * E.g., "s0", "s1", etc.
  */
 
-#ifndef H_STATS_
-#define H_STATS_
+#ifndef ZEPHYR_INCLUDE_STATS_H_
+#define ZEPHYR_INCLUDE_STATS_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -383,4 +383,4 @@ struct stats_hdr *stats_group_find(const char *name);
 }
 #endif
 
-#endif /* H_STATS_ */
+#endif /* ZEPHYR_INCLUDE_STATS_H_ */
diff --git a/include/sw_isr_table.h b/include/sw_isr_table.h
index 460062a7047..d121abfb737 100644
--- a/include/sw_isr_table.h
+++ b/include/sw_isr_table.h
@@ -11,8 +11,8 @@
  * Data types for a software-managed ISR table, with a parameter per-ISR.
  */
 
-#ifndef _SW_ISR_TABLE__H_
-#define _SW_ISR_TABLE__H_
+#ifndef ZEPHYR_INCLUDE_SW_ISR_TABLE_H_
+#define ZEPHYR_INCLUDE_SW_ISR_TABLE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ struct _isr_list {
 }
 #endif
 
-#endif /* _SW_ISR_TABLE__H_ */
+#endif /* ZEPHYR_INCLUDE_SW_ISR_TABLE_H_ */
diff --git a/include/sys_clock.h b/include/sys_clock.h
index cdca9d97596..326f1a959b2 100644
--- a/include/sys_clock.h
+++ b/include/sys_clock.h
@@ -13,8 +13,8 @@
  * components that use timer functionality.
  */
 
-#ifndef _SYS_CLOCK__H_
-#define _SYS_CLOCK__H_
+#ifndef ZEPHYR_INCLUDE_SYS_CLOCK_H_
+#define ZEPHYR_INCLUDE_SYS_CLOCK_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -128,4 +128,4 @@ extern volatile u64_t _sys_clock_tick_count;
 }
 #endif
 
-#endif /* _SYS_CLOCK__H_ */
+#endif /* ZEPHYR_INCLUDE_SYS_CLOCK_H_ */
diff --git a/include/sys_io.h b/include/sys_io.h
index d0eff865839..839f4a87ec0 100644
--- a/include/sys_io.h
+++ b/include/sys_io.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SYS_IO_H__
-#define __SYS_IO_H__
+#ifndef ZEPHYR_INCLUDE_SYS_IO_H_
+#define ZEPHYR_INCLUDE_SYS_IO_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -336,4 +336,4 @@ typedef u32_t mem_addr_t;
 }
 #endif
 
-#endif /* __SYS_IO_H__ */
+#endif /* ZEPHYR_INCLUDE_SYS_IO_H_ */
diff --git a/include/syscall.h b/include/syscall.h
index 8a24cdbe463..bcd5f895444 100644
--- a/include/syscall.h
+++ b/include/syscall.h
@@ -5,8 +5,8 @@
  */
 
 
-#ifndef _ZEPHYR_SYSCALL_H_
-#define _ZEPHYR_SYSCALL_H_
+#ifndef ZEPHYR_INCLUDE_SYSCALL_H_
+#define ZEPHYR_INCLUDE_SYSCALL_H_
 
 #include <syscall_list.h>
 #include <arch/syscall.h>
diff --git a/include/toolchain.h b/include/toolchain.h
index 3bea0dbc29e..5d0ac3907aa 100644
--- a/include/toolchain.h
+++ b/include/toolchain.h
@@ -12,8 +12,8 @@
  * utilize toolchain specific attributes and/or pragmas.
  */
 
-#ifndef _TOOLCHAIN_H
-#define _TOOLCHAIN_H
+#ifndef ZEPHYR_INCLUDE_TOOLCHAIN_H_
+#define ZEPHYR_INCLUDE_TOOLCHAIN_H_
 
 #if defined(__XCC__)
 #include <toolchain/xcc.h>
@@ -23,4 +23,4 @@
 #include <toolchain/other.h>
 #endif
 
-#endif /* _TOOLCHAIN_H */
+#endif /* ZEPHYR_INCLUDE_TOOLCHAIN_H_ */
diff --git a/include/toolchain/common.h b/include/toolchain/common.h
index 2dd8f585d48..5d0d4146a61 100644
--- a/include/toolchain/common.h
+++ b/include/toolchain/common.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef TOOLCHAIN_COMMON_H
-#define TOOLCHAIN_COMMON_H
+#ifndef ZEPHYR_INCLUDE_TOOLCHAIN_COMMON_H_
+#define ZEPHYR_INCLUDE_TOOLCHAIN_COMMON_H_
 /**
  * @file
  * @brief Common toolchain abstraction
@@ -130,4 +130,4 @@
 #define BUILD_ASSERT_MSG(EXPR, MSG) BUILD_ASSERT(EXPR)
 #endif
 
-#endif /* TOOLCHAIN_COMMON_H */
+#endif /* ZEPHYR_INCLUDE_TOOLCHAIN_COMMON_H_ */
diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h
index c53b2de17a1..ca0f675aadb 100644
--- a/include/toolchain/gcc.h
+++ b/include/toolchain/gcc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef TOOLCHAIN_GCC_H
-#define TOOLCHAIN_GCC_H
+#ifndef ZEPHYR_INCLUDE_TOOLCHAIN_GCC_H_
+#define ZEPHYR_INCLUDE_TOOLCHAIN_GCC_H_
 /**
  * @file
  * @brief GCC toolchain abstraction
@@ -366,4 +366,4 @@ A##a:
 	__asm__ __volatile__ ("" ::: "memory"); \
 } while ((0))
 
-#endif /* TOOLCHAIN_GCC_H */
+#endif /* ZEPHYR_INCLUDE_TOOLCHAIN_GCC_H_ */
diff --git a/include/toolchain/xcc.h b/include/toolchain/xcc.h
index 902d658892c..0f0c4fd18d7 100644
--- a/include/toolchain/xcc.h
+++ b/include/toolchain/xcc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _XCC_TOOLCHAIN_H_
-#define _XCC_TOOLCHAIN_H_
+#ifndef ZEPHYR_INCLUDE_TOOLCHAIN_XCC_H_
+#define ZEPHYR_INCLUDE_TOOLCHAIN_XCC_H_
 
 #include <toolchain/gcc.h>
 
diff --git a/include/tracing.h b/include/tracing.h
index dd4639007bc..4cb836cca35 100644
--- a/include/tracing.h
+++ b/include/tracing.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _KERNEL_TRACE_H
-#define _KERNEL_TRACE_H
+#ifndef ZEPHYR_INCLUDE_TRACING_H_
+#define ZEPHYR_INCLUDE_TRACING_H_
 
 #include <kernel.h>
 
diff --git a/include/uart.h b/include/uart.h
index 4ec183ed166..05ad8392db3 100644
--- a/include/uart.h
+++ b/include/uart.h
@@ -9,8 +9,8 @@
  * @brief Public APIs for UART drivers
  */
 
-#ifndef __INCuarth
-#define __INCuarth
+#ifndef ZEPHYR_INCLUDE_UART_H_
+#define ZEPHYR_INCLUDE_UART_H_
 
 /**
  * @brief UART Interface
@@ -714,4 +714,4 @@ static inline int _impl_uart_drv_cmd(struct device *dev, u32_t cmd, u32_t p)
 
 #include <syscalls/uart.h>
 
-#endif /* __INCuarth */
+#endif /* ZEPHYR_INCLUDE_UART_H_ */
diff --git a/include/usb/class/usb_cdc.h b/include/usb/class/usb_cdc.h
index c166e47e83b..59dfcd9ee4b 100644
--- a/include/usb/class/usb_cdc.h
+++ b/include/usb/class/usb_cdc.h
@@ -18,8 +18,8 @@
  * Header is limited to ACM and ECM Subclasses.
  */
 
-#ifndef __USB_CDC_H__
-#define __USB_CDC_H__
+#ifndef ZEPHYR_INCLUDE_USB_CLASS_USB_CDC_H_
+#define ZEPHYR_INCLUDE_USB_CLASS_USB_CDC_H_
 
 /** CDC Specification release number in BCD format */
 #define CDC_SRN_1_20			0x0120
@@ -162,4 +162,4 @@ struct cdc_ecm_descriptor {
 	u8_t bNumberPowerFilters;
 } __packed;
 
-#endif /* __USB_CDC_H__ */
+#endif /* ZEPHYR_INCLUDE_USB_CLASS_USB_CDC_H_ */
diff --git a/include/usb/class/usb_dfu.h b/include/usb/class/usb_dfu.h
index b48e9b8a667..46d6223db36 100644
--- a/include/usb/class/usb_dfu.h
+++ b/include/usb/class/usb_dfu.h
@@ -39,8 +39,8 @@
  * Device Firmware Upgrade Version 1.1
  */
 
-#ifndef __USB_DFU_H__
-#define __USB_DFU_H__
+#ifndef ZEPHYR_INCLUDE_USB_CLASS_USB_DFU_H_
+#define ZEPHYR_INCLUDE_USB_CLASS_USB_DFU_H_
 
 /** DFU Class Subclass */
 #define DFU_SUBCLASS			0x01
@@ -119,4 +119,4 @@ enum dfu_state {
 	dfuERROR,
 };
 
-#endif /* __USB_DFU_H__ */
+#endif /* ZEPHYR_INCLUDE_USB_CLASS_USB_DFU_H_ */
diff --git a/include/usb/class/usb_hid.h b/include/usb/class/usb_hid.h
index d2a5801a4b0..9a632ff1f9b 100644
--- a/include/usb/class/usb_hid.h
+++ b/include/usb/class/usb_hid.h
@@ -14,8 +14,8 @@
  * Version 1.11 document (HID1_11-1.pdf).
  */
 
-#ifndef __USB_HID_H__
-#define __USB_HID_H__
+#ifndef ZEPHYR_INCLUDE_USB_CLASS_USB_HID_H_
+#define ZEPHYR_INCLUDE_USB_CLASS_USB_HID_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -170,4 +170,4 @@ int usb_hid_init(void);
 }
 #endif
 
-#endif /* __USB_HID_H__ */
+#endif /* ZEPHYR_INCLUDE_USB_CLASS_USB_HID_H_ */
diff --git a/include/usb/class/usb_msc.h b/include/usb/class/usb_msc.h
index f8eb7254df7..23dbeeac3af 100644
--- a/include/usb/class/usb_msc.h
+++ b/include/usb/class/usb_msc.h
@@ -43,8 +43,8 @@
  * Header is limited to Bulk-Only Transfer protocol.
  */
 
-#ifndef __USB_MSC_H__
-#define __USB_MSC_H__
+#ifndef ZEPHYR_INCLUDE_USB_CLASS_USB_MSC_H_
+#define ZEPHYR_INCLUDE_USB_CLASS_USB_MSC_H_
 
 /** MSC Subclass and Protocol Codes */
 #define SCSI_TRANSPARENT_SUBCLASS	0x06
@@ -106,4 +106,4 @@ struct CSW {
 #define MODE_SELECT10			0x55
 #define MODE_SENSE10			0x5A
 
-#endif /* __USB_MSC_H__ */
+#endif /* ZEPHYR_INCLUDE_USB_CLASS_USB_MSC_H_ */
diff --git a/include/usb/usb_common.h b/include/usb/usb_common.h
index 8e80444ece5..d753fb8526b 100644
--- a/include/usb/usb_common.h
+++ b/include/usb/usb_common.h
@@ -41,8 +41,8 @@
 
 #include <version.h>
 
-#ifndef USB_COMMON_H_
-#define USB_COMMON_H_
+#ifndef ZEPHYR_INCLUDE_USB_USB_COMMON_H_
+#define ZEPHYR_INCLUDE_USB_USB_COMMON_H_
 
 #define BCD(x) ((((x) / 10) << 4) | ((x) / 10))
 
@@ -198,4 +198,4 @@ struct usb_ep_descriptor {
 	u8_t bInterval;
 } __packed;
 
-#endif /* USB_COMMON_H_ */
+#endif /* ZEPHYR_INCLUDE_USB_USB_COMMON_H_ */
diff --git a/include/usb/usb_device.h b/include/usb/usb_device.h
index c69feddb8b3..ac54bf92900 100644
--- a/include/usb/usb_device.h
+++ b/include/usb/usb_device.h
@@ -33,8 +33,8 @@
  * This file contains the USB device core layer APIs and structures.
  */
 
-#ifndef USB_DEVICE_H_
-#define USB_DEVICE_H_
+#ifndef ZEPHYR_INCLUDE_USB_USB_DEVICE_H_
+#define ZEPHYR_INCLUDE_USB_USB_DEVICE_H_
 
 #include <drivers/usb/usb_dc.h>
 #include <usb/usbstruct.h>
@@ -425,4 +425,4 @@ void usb_cancel_transfer(u8_t ep);
 }
 #endif
 
-#endif /* USB_DEVICE_H_ */
+#endif /* ZEPHYR_INCLUDE_USB_USB_DEVICE_H_ */
diff --git a/include/usb/usbstruct.h b/include/usb/usbstruct.h
index 20325238549..9079c51ddb2 100644
--- a/include/usb/usbstruct.h
+++ b/include/usb/usbstruct.h
@@ -33,8 +33,8 @@
  * This file contains structures and defines of the standard USB packets
  */
 
-#ifndef _USBSTRUCT_H_
-#define _USBSTRUCT_H_
+#ifndef ZEPHYR_INCLUDE_USB_USBSTRUCT_H_
+#define ZEPHYR_INCLUDE_USB_USBSTRUCT_H_
 
 #define REQTYPE_GET_DIR(x)          (((x)>>7)&0x01)
 #define REQTYPE_GET_TYPE(x)         (((x)>>5)&0x03)
@@ -96,4 +96,4 @@ struct usb_desc_header {
 #define GET_DESC_TYPE(x)            (((x)>>8)&0xFF)
 #define GET_DESC_INDEX(x)           ((x)&0xFF)
 
-#endif /* _USBSTRUCT_H_ */
+#endif /* ZEPHYR_INCLUDE_USB_USBSTRUCT_H_ */
diff --git a/include/watchdog.h b/include/watchdog.h
index 3e22ba36e7c..e30dd5f00d2 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -10,8 +10,8 @@
  * @brief Public API for watchdog drivers.
  */
 
-#ifndef _WDT_H_
-#define _WDT_H_
+#ifndef ZEPHYR_INCLUDE_WATCHDOG_H_
+#define ZEPHYR_INCLUDE_WATCHDOG_H_
 
 /**
  * @brief Watchdog Interface
@@ -365,4 +365,4 @@ static inline void __deprecated wdt_reload(struct device *dev)
  * @}
  */
 
-#endif /* __WDT_H__ */
+#endif /* _ZEPHYR_WATCHDOG_H__ */
diff --git a/include/zephyr.h b/include/zephyr.h
index 5469216ccae..6509fdbee0d 100644
--- a/include/zephyr.h
+++ b/include/zephyr.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _ZEPHYR__H
-#define _ZEPHYR__H
+#ifndef ZEPHYR_INCLUDE_ZEPHYR_H_
+#define ZEPHYR_INCLUDE_ZEPHYR_H_
 
 /*
  * Applications can identify whether they are built for Zephyr by
@@ -17,4 +17,4 @@
 
 #include <kernel.h>
 
-#endif /* _ZEPHYR__H */
+#endif /* ZEPHYR_INCLUDE_ZEPHYR_H_ */
diff --git a/include/zephyr/types.h b/include/zephyr/types.h
index 5ae80b0fa51..1de1e570865 100644
--- a/include/zephyr/types.h
+++ b/include/zephyr/types.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __Z_TYPES_H__
-#define __Z_TYPES_H__
+#ifndef ZEPHYR_INCLUDE_ZEPHYR_TYPES_H_
+#define ZEPHYR_INCLUDE_ZEPHYR_TYPES_H_
 
 #include <stdint.h>
 
@@ -27,4 +27,4 @@ typedef unsigned long long  u64_t;
 }
 #endif
 
-#endif /* __Z_TYPES_H__ */
+#endif /* ZEPHYR_INCLUDE_ZEPHYR_TYPES_H_ */
diff --git a/lib/libc/minimal/include/assert.h b/lib/libc/minimal/include/assert.h
index 0f0af8a3c2e..8f9a52c5184 100644
--- a/lib/libc/minimal/include/assert.h
+++ b/lib/libc/minimal/include/assert.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_assert_h__
-#define __INC_assert_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ASSERT_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ASSERT_H_
 
 #include <misc/__assert.h>
 
@@ -30,4 +30,4 @@ extern "C" {
 }
 #endif
 
-#endif  /* __INC_assert_h__ */
+#endif  /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ASSERT_H_ */
diff --git a/lib/libc/minimal/include/ctype.h b/lib/libc/minimal/include/ctype.h
index 48bbecef922..9d66bbbf492 100644
--- a/lib/libc/minimal/include/ctype.h
+++ b/lib/libc/minimal/include/ctype.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_ctype_h__
-#define __INC_ctype_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_CTYPE_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_CTYPE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -69,4 +69,4 @@ static inline int isalnum(int chr)
 }
 #endif
 
-#endif  /* __INC_ctype_h__ */
+#endif  /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_CTYPE_H_ */
diff --git a/lib/libc/minimal/include/errno.h b/lib/libc/minimal/include/errno.h
index d8c723bcef9..4d2230c4901 100644
--- a/lib/libc/minimal/include/errno.h
+++ b/lib/libc/minimal/include/errno.h
@@ -14,8 +14,8 @@
  *	@(#)errno.h	7.1 (Berkeley) 6/4/86
  */
 
-#ifndef __INCerrnoh
-#define __INCerrnoh
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ERRNO_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ERRNO_H_
 
 #include <misc/errno_private.h>
 
@@ -132,4 +132,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __INCerrnoh */
+#endif /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_ERRNO_H_ */
diff --git a/lib/libc/minimal/include/inttypes.h b/lib/libc/minimal/include/inttypes.h
index 56d6908e393..66ba8dd73ce 100644
--- a/lib/libc/minimal/include/inttypes.h
+++ b/lib/libc/minimal/include/inttypes.h
@@ -5,8 +5,8 @@
  */
 
 
-#ifndef _INTTYPES_H_
-#define _INTTYPES_H_
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_INTTYPES_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_INTTYPES_H_
 
 #include <stdint.h>
 
diff --git a/lib/libc/minimal/include/limits.h b/lib/libc/minimal/include/limits.h
index 3f931b887df..621096793e2 100644
--- a/lib/libc/minimal/include/limits.h
+++ b/lib/libc/minimal/include/limits.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_limits_h__
-#define __INC_limits_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_LIMITS_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_LIMITS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,4 +54,4 @@ extern "C" {
 }
 #endif
 
-#endif  /* __INC_limits_h__ */
+#endif  /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_LIMITS_H_ */
diff --git a/lib/libc/minimal/include/stdbool.h b/lib/libc/minimal/include/stdbool.h
index 7433b53ce31..0bfccdcd713 100644
--- a/lib/libc/minimal/include/stdbool.h
+++ b/lib/libc/minimal/include/stdbool.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_stdbool_h__
-#define __INC_stdbool_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDBOOL_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDBOOL_H_
 
 #ifndef __cplusplus
 #define bool   _Bool
@@ -17,4 +17,4 @@
 
 #define __bool_true_false_are_defined  1
 
-#endif /* __INC_stdbool_h__ */
+#endif /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDBOOL_H_ */
diff --git a/lib/libc/minimal/include/stdint.h b/lib/libc/minimal/include/stdint.h
index 8b8b26904ea..68a523b5ac1 100644
--- a/lib/libc/minimal/include/stdint.h
+++ b/lib/libc/minimal/include/stdint.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_stdint_h__
-#define __INC_stdint_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDINT_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDINT_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -76,4 +76,4 @@ typedef unsigned int        uintptr_t;
 }
 #endif
 
-#endif /* __INC_stdint_h__ */
+#endif /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDINT_H_ */
diff --git a/lib/libc/minimal/include/stdio.h b/lib/libc/minimal/include/stdio.h
index f2c757cc413..f2d86aaf92b 100644
--- a/lib/libc/minimal/include/stdio.h
+++ b/lib/libc/minimal/include/stdio.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_stdio_h__
-#define __INC_stdio_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDIO_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDIO_H_
 
 #include <toolchain.h>
 #include <stdarg.h>     /* Needed to get definition of va_list */
@@ -66,4 +66,4 @@ size_t fwrite(const void *_MLIBC_RESTRICT ptr, size_t size, size_t nitems,
 }
 #endif
 
-#endif /* __INC_stdio_h__ */
+#endif /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDIO_H_ */
diff --git a/lib/libc/minimal/include/stdlib.h b/lib/libc/minimal/include/stdlib.h
index d36d7e96f47..1d9307cd094 100644
--- a/lib/libc/minimal/include/stdlib.h
+++ b/lib/libc/minimal/include/stdlib.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_stdlib_h__
-#define __INC_stdlib_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDLIB_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDLIB_H_
 
 #include <stddef.h>
 #ifdef __cplusplus
@@ -30,4 +30,4 @@ void *reallocarray(void *ptr, size_t nmemb, size_t size);
 }
 #endif
 
-#endif  /* __INC_stdlib_h__ */
+#endif  /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STDLIB_H_ */
diff --git a/lib/libc/minimal/include/string.h b/lib/libc/minimal/include/string.h
index f17b05177c2..8ff65b78de8 100644
--- a/lib/libc/minimal/include/string.h
+++ b/lib/libc/minimal/include/string.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_string_h__
-#define __INC_string_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STRING_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STRING_H_
 
 #include <stddef.h>
 #include <bits/restrict.h>
@@ -41,4 +41,4 @@ extern void  *memchr(const void *s, unsigned char c, size_t n);
 }
 #endif
 
-#endif  /* __INC_string_h__ */
+#endif  /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STRING_H_ */
diff --git a/lib/libc/minimal/include/strings.h b/lib/libc/minimal/include/strings.h
index 232b0c2bd09..db7670154aa 100644
--- a/lib/libc/minimal/include/strings.h
+++ b/lib/libc/minimal/include/strings.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_strings_h__
-#define __INC_strings_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STRINGS_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STRINGS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,4 +19,4 @@ extern int strncasecmp(const char *s1, const char *s2, size_t n);
 }
 #endif
 
-#endif  /* __INC_strings_h__ */
+#endif  /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_STRINGS_H_ */
diff --git a/lib/libc/minimal/include/sys/fcntl.h b/lib/libc/minimal/include/sys/fcntl.h
index b4e82f8afcb..b976e6e93a0 100644
--- a/lib/libc/minimal/include/sys/fcntl.h
+++ b/lib/libc/minimal/include/sys/fcntl.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_sys_fcntl_h__
-#define __INC_sys_fcntl_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_SYS_FCNTL_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_SYS_FCNTL_H_
 
 #define O_NONBLOCK 0x4000
 
 #define F_GETFL 3
 #define F_SETFL 4
 
-#endif /* __INC_sys_fcntl_h__ */
+#endif /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_SYS_FCNTL_H_ */
diff --git a/lib/libc/minimal/include/sys/types.h b/lib/libc/minimal/include/sys/types.h
index 839007e877b..bfaa7cb009e 100644
--- a/lib/libc/minimal/include/sys/types.h
+++ b/lib/libc/minimal/include/sys/types.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __INC_sys_types_h__
-#define __INC_sys_types_h__
+#ifndef ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_SYS_TYPES_H_
+#define ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_SYS_TYPES_H_
 
 #if !defined(__ssize_t_defined)
 #define __ssize_t_defined
@@ -38,4 +38,4 @@ typedef int off_t;
 
 #endif
 
-#endif /* __INC_sys_types_h__ */
+#endif /* ZEPHYR_LIB_LIBC_MINIMAL_INCLUDE_SYS_TYPES_H_ */
diff --git a/soc/posix/inf_clock/CMakeLists.txt b/soc/posix/inf_clock/CMakeLists.txt
index 612097f1f2d..861c187692f 100644
--- a/soc/posix/inf_clock/CMakeLists.txt
+++ b/soc/posix/inf_clock/CMakeLists.txt
@@ -1,5 +1,5 @@
 zephyr_library()
-zephyr_library_compile_definitions(_POSIX_CHEATS_H)
+zephyr_library_compile_definitions(NO_POSIX_CHEATS)
 zephyr_library_sources(
 	soc.c
 	)