Index: boot/arch/arm32/include/arch/arch.h
===================================================================
--- boot/arch/arm32/include/arch/arch.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ boot/arch/arm32/include/arch/arch.h	(revision da9d6cae9d1c35542e015f3d2826946a83fef587)
@@ -55,15 +55,15 @@
 
 #ifdef MACHINE_beagleboardxm
-	#define PA_OFFSET 0
+#define PA_OFFSET 0
 #elif defined MACHINE_beaglebone
-	#define PA_OFFSET 0
+#define PA_OFFSET 0
 #else
-	#define PA_OFFSET 0x80000000
+#define PA_OFFSET 0x80000000
 #endif
 
 #ifndef __ASM__
-	#define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
+#define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
 #else
-	#define PA2KA(addr)  ((addr) + PA_OFFSET)
+#define PA2KA(addr)  ((addr) + PA_OFFSET)
 #endif
 
Index: boot/arch/mips32/include/arch/arch.h
===================================================================
--- boot/arch/mips32/include/arch/arch.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ boot/arch/mips32/include/arch/arch.h	(revision da9d6cae9d1c35542e015f3d2826946a83fef587)
@@ -56,11 +56,11 @@
 
 #ifndef __ASM__
-	#define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
-	#define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
-	#define KA2PA(addr)    (((uintptr_t) (addr)) - 0x80000000)
-	#define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
+#define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
+#define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
+#define KA2PA(addr)    (((uintptr_t) (addr)) - 0x80000000)
+#define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
 #else
-	#define PA2KA(addr)    ((addr) + 0x80000000)
-	#define KSEG2PA(addr)  ((addr) - 0xa0000000)
+#define PA2KA(addr)    ((addr) + 0x80000000)
+#define KSEG2PA(addr)  ((addr) - 0xa0000000)
 #endif
 
Index: boot/arch/ppc32/include/arch/arch.h
===================================================================
--- boot/arch/ppc32/include/arch/arch.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ boot/arch/ppc32/include/arch/arch.h	(revision da9d6cae9d1c35542e015f3d2826946a83fef587)
@@ -38,7 +38,7 @@
 
 #ifndef __ASM__
-	#define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
+#define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
 #else
-	#define PA2KA(addr)  ((addr) + 0x80000000)
+#define PA2KA(addr)  ((addr) + 0x80000000)
 #endif
 
Index: boot/arch/riscv64/include/arch/mm.h
===================================================================
--- boot/arch/riscv64/include/arch/mm.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ boot/arch/riscv64/include/arch/mm.h	(revision da9d6cae9d1c35542e015f3d2826946a83fef587)
@@ -34,9 +34,9 @@
 
 #ifndef __ASM__
-	#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
-	#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
 #else
-	#define KA2PA(x)  ((x) - 0xffff800000000000)
-	#define PA2KA(x)  ((x) + 0xffff800000000000)
+#define KA2PA(x)  ((x) - 0xffff800000000000)
+#define PA2KA(x)  ((x) + 0xffff800000000000)
 #endif
 
Index: boot/generic/include/printf.h
===================================================================
--- boot/generic/include/printf.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ boot/generic/include/printf.h	(revision da9d6cae9d1c35542e015f3d2826946a83fef587)
@@ -41,5 +41,5 @@
 extern int puts(const char *);
 extern int printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int vprintf(const char *, va_list);
 
Index: boot/generic/include/printf_verify.h
===================================================================
--- boot/generic/include/printf_verify.h	(revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f)
+++ boot/generic/include/printf_verify.h	(revision da9d6cae9d1c35542e015f3d2826946a83fef587)
@@ -33,14 +33,14 @@
 #define BOOT_PRINTF_VERIFY_H_
 
-#ifndef NVERIFY_PRINTF
+#ifndef _HELENOS_NVERIFY_PRINTF
 
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
 	__attribute__((format(gnu_printf, start, end)))
 
-#else /* NVERIFY_PRINTF */
+#else /* _HELENOS_NVERIFY_PRINTF */
 
-#define PRINTF_ATTRIBUTE(start, end)
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
 
-#endif /* NVERIFY_PRINTF */
+#endif /* _HELENOS_NVERIFY_PRINTF */
 
 #endif