Index: abi/arch/abs32le/include/abi/arch/elf.h
===================================================================
--- abi/arch/abs32le/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/abs32le/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_abs32le_ELF_H_
-#define ABI_abs32le_ELF_H_
+#ifndef _ABI_abs32le_ELF_H_
+#define _ABI_abs32le_ELF_H_
 
 #define ELF_MACHINE        EM_NO
Index: abi/arch/amd64/include/abi/arch/elf.h
===================================================================
--- abi/arch/amd64/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/amd64/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_amd64_ELF_H_
-#define ABI_amd64_ELF_H_
+#ifndef _ABI_amd64_ELF_H_
+#define _ABI_amd64_ELF_H_
 
 #define ELF_MACHINE        EM_X86_64
Index: abi/arch/arm32/include/abi/arch/elf.h
===================================================================
--- abi/arch/arm32/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/arm32/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -34,6 +34,6 @@
  */
 
-#ifndef ABI_arm32_ELF_H_
-#define ABI_arm32_ELF_H_
+#ifndef _ABI_arm32_ELF_H_
+#define _ABI_arm32_ELF_H_
 
 #define ELF_MACHINE  EM_ARM
Index: abi/arch/ia32/include/abi/arch/elf.h
===================================================================
--- abi/arch/ia32/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/ia32/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_ia32_ELF_H_
-#define ABI_ia32_ELF_H_
+#ifndef _ABI_ia32_ELF_H_
+#define _ABI_ia32_ELF_H_
 
 #define ELF_MACHINE        EM_386
Index: abi/arch/ia64/include/abi/arch/elf.h
===================================================================
--- abi/arch/ia64/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/ia64/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_ia64_ELF_H_
-#define ABI_ia64_ELF_H_
+#ifndef _ABI_ia64_ELF_H_
+#define _ABI_ia64_ELF_H_
 
 #define ELF_MACHINE        EM_IA_64
Index: abi/arch/mips32/include/abi/arch/elf.h
===================================================================
--- abi/arch/mips32/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/mips32/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_mips32_ELF_H_
-#define ABI_mips32_ELF_H_
+#ifndef _ABI_mips32_ELF_H_
+#define _ABI_mips32_ELF_H_
 
 #define ELF_MACHINE  EM_MIPS
Index: abi/arch/ppc32/include/abi/arch/elf.h
===================================================================
--- abi/arch/ppc32/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/ppc32/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_ppc32_ELF_H_
-#define ABI_ppc32_ELF_H_
+#ifndef _ABI_ppc32_ELF_H_
+#define _ABI_ppc32_ELF_H_
 
 #define ELF_MACHINE        EM_PPC
Index: abi/arch/riscv64/include/abi/arch/elf.h
===================================================================
--- abi/arch/riscv64/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/riscv64/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_riscv64_ELF_H_
-#define ABI_riscv64_ELF_H_
+#ifndef _ABI_riscv64_ELF_H_
+#define _ABI_riscv64_ELF_H_
 
 #define ELF_MACHINE        EM_RISCV
Index: abi/arch/sparc64/include/abi/arch/elf.h
===================================================================
--- abi/arch/sparc64/include/abi/arch/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/arch/sparc64/include/abi/arch/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_sparc64_ELF_H_
-#define ABI_sparc64_ELF_H_
+#ifndef _ABI_sparc64_ELF_H_
+#define _ABI_sparc64_ELF_H_
 
 #define ELF_MACHINE        EM_SPARCV9
Index: abi/include/abi/asmtool.h
===================================================================
--- abi/include/abi/asmtool.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/asmtool.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_ASMTOOL_H_
-#define ABI_ASMTOOL_H_
+#ifndef _ABI_ASMTOOL_H_
+#define _ABI_ASMTOOL_H_
 
 #define SYMBOL(sym) \
Index: abi/include/abi/cap.h
===================================================================
--- abi/include/abi/cap.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/cap.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_CAP_H_
-#define ABI_CAP_H_
+#ifndef _ABI_CAP_H_
+#define _ABI_CAP_H_
 
 #define CAP_NIL  0
Index: abi/include/abi/ddi/arg.h
===================================================================
--- abi/include/abi/ddi/arg.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/ddi/arg.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_DDI_ARG_H_
-#define ABI_DDI_ARG_H_
+#ifndef _ABI_DDI_ARG_H_
+#define _ABI_DDI_ARG_H_
 
 #include <stdint.h>
Index: abi/include/abi/ddi/irq.h
===================================================================
--- abi/include/abi/ddi/irq.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/ddi/irq.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_DDI_IRQ_H_
-#define ABI_DDI_IRQ_H_
+#ifndef _ABI_DDI_IRQ_H_
+#define _ABI_DDI_IRQ_H_
 
 #include <stdint.h>
Index: abi/include/abi/elf.h
===================================================================
--- abi/include/abi/elf.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/elf.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_ELF_H_
-#define ABI_ELF_H_
+#ifndef _ABI_ELF_H_
+#define _ABI_ELF_H_
 
 #include <stdint.h>
Index: abi/include/abi/fb/visuals.h
===================================================================
--- abi/include/abi/fb/visuals.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/fb/visuals.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -34,6 +34,6 @@
  */
 
-#ifndef ABI_VISUALS_H_
-#define ABI_VISUALS_H_
+#ifndef _ABI_VISUALS_H_
+#define _ABI_VISUALS_H_
 
 typedef enum {
Index: abi/include/abi/fourcc.h
===================================================================
--- abi/include/abi/fourcc.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/fourcc.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_FOURCC_H_
-#define ABI_FOURCC_H_
+#ifndef _ABI_FOURCC_H_
+#define _ABI_FOURCC_H_
 
 #include <stdint.h>
Index: abi/include/abi/ipc/event.h
===================================================================
--- abi/include/abi/ipc/event.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/ipc/event.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_IPC_EVENT_H_
-#define ABI_IPC_EVENT_H_
+#ifndef _ABI_IPC_EVENT_H_
+#define _ABI_IPC_EVENT_H_
 
 /** Global events */
Index: abi/include/abi/ipc/interfaces.h
===================================================================
--- abi/include/abi/ipc/interfaces.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/ipc/interfaces.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -35,6 +35,6 @@
  */
 
-#ifndef ABI_IPC_INTERFACES_H_
-#define ABI_IPC_INTERFACES_H_
+#ifndef _ABI_IPC_INTERFACES_H_
+#define _ABI_IPC_INTERFACES_H_
 
 #include <abi/fourcc.h>
Index: abi/include/abi/ipc/ipc.h
===================================================================
--- abi/include/abi/ipc/ipc.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/ipc/ipc.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_IPC_IPC_H_
-#define ABI_IPC_IPC_H_
+#ifndef _ABI_IPC_IPC_H_
+#define _ABI_IPC_IPC_H_
 
 #include <abi/proc/task.h>
Index: abi/include/abi/ipc/methods.h
===================================================================
--- abi/include/abi/ipc/methods.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/ipc/methods.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_IPC_METHODS_H_
-#define ABI_IPC_METHODS_H_
+#ifndef _ABI_IPC_METHODS_H_
+#define _ABI_IPC_METHODS_H_
 
 #include <abi/cap.h>
Index: abi/include/abi/kio.h
===================================================================
--- abi/include/abi/kio.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/kio.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_KIO_H_
-#define ABI_KIO_H_
+#ifndef _ABI_KIO_H_
+#define _ABI_KIO_H_
 
 enum {
Index: abi/include/abi/klog.h
===================================================================
--- abi/include/abi/klog.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/klog.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_KLOG_H_
-#define ABI_KLOG_H_
+#ifndef _ABI_KLOG_H_
+#define _ABI_KLOG_H_
 
 typedef enum {
Index: abi/include/abi/log.h
===================================================================
--- abi/include/abi/log.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/log.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -35,6 +35,6 @@
  */
 
-#ifndef ABI_LOG_H_
-#define ABI_LOG_H_
+#ifndef _ABI_LOG_H_
+#define _ABI_LOG_H_
 
 /** Log message level. */
Index: abi/include/abi/mm/as.h
===================================================================
--- abi/include/abi/mm/as.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/mm/as.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_AS_H_
-#define ABI_AS_H_
+#ifndef _ABI_AS_H_
+#define _ABI_AS_H_
 
 #include <abi/cap.h>
Index: abi/include/abi/proc/task.h
===================================================================
--- abi/include/abi/proc/task.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/proc/task.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_PROC_TASK_H_
-#define ABI_PROC_TASK_H_
+#ifndef _ABI_PROC_TASK_H_
+#define _ABI_PROC_TASK_H_
 
 #include <stdint.h>
Index: abi/include/abi/proc/thread.h
===================================================================
--- abi/include/abi/proc/thread.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/proc/thread.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_PROC_THREAD_H_
-#define ABI_PROC_THREAD_H_
+#ifndef _ABI_PROC_THREAD_H_
+#define _ABI_PROC_THREAD_H_
 
 #include <stdint.h>
Index: abi/include/abi/proc/uarg.h
===================================================================
--- abi/include/abi/proc/uarg.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/proc/uarg.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_PROC_UARG_H_
-#define ABI_PROC_UARG_H_
+#ifndef _ABI_PROC_UARG_H_
+#define _ABI_PROC_UARG_H_
 
 #include <stddef.h>
Index: abi/include/abi/synch.h
===================================================================
--- abi/include/abi/synch.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/synch.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_SYNCH_H_
-#define ABI_SYNCH_H_
+#ifndef _ABI_SYNCH_H_
+#define _ABI_SYNCH_H_
 
 /** Request with no timeout. */
Index: abi/include/abi/syscall.h
===================================================================
--- abi/include/abi/syscall.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/syscall.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_SYSCALL_H_
-#define ABI_SYSCALL_H_
+#ifndef _ABI_SYSCALL_H_
+#define _ABI_SYSCALL_H_
 
 typedef enum {
Index: abi/include/abi/sysinfo.h
===================================================================
--- abi/include/abi/sysinfo.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/sysinfo.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -34,6 +34,6 @@
  */
 
-#ifndef ABI_SYSINFO_H_
-#define ABI_SYSINFO_H_
+#ifndef _ABI_SYSINFO_H_
+#define _ABI_SYSINFO_H_
 
 #include <stdbool.h>
Index: abi/include/abi/udebug.h
===================================================================
--- abi/include/abi/udebug.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/abi/udebug.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ABI_UDEBUG_H_
-#define ABI_UDEBUG_H_
+#ifndef _ABI_UDEBUG_H_
+#define _ABI_UDEBUG_H_
 
 #define UDEBUG_EVMASK(event)  (1 << ((event) - 1))
Index: abi/include/limits.h
===================================================================
--- abi/include/limits.h	(revision d3e938c65a5927cb5851ec4118dd05109bba3ada)
+++ abi/include/limits.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_LIMITS_H_
-#define LIBC_LIMITS_H_
+#ifndef _LIBC_LIMITS_H_
+#define _LIBC_LIMITS_H_
 
 #ifdef __GNUC__