Index: boot/generic/include/printf.h
===================================================================
--- boot/generic/include/printf.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ boot/generic/include/printf.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -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 18bb1983592d82d44c5be98e815382d3a694e726)
+++ boot/generic/include/printf_verify.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -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
Index: kernel/generic/include/interrupt.h
===================================================================
--- kernel/generic/include/interrupt.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ kernel/generic/include/interrupt.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -61,7 +61,7 @@
 
 extern void fault_from_uspace(istate_t *, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern void fault_if_from_uspace(istate_t *, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern istate_t *istate_get(thread_t *);
 extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
Index: kernel/generic/include/log.h
===================================================================
--- kernel/generic/include/log.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ kernel/generic/include/log.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -48,7 +48,7 @@
 extern int log_vprintf(const char *, va_list);
 extern int log_printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int log(log_facility_t, log_level_t, const char *, ...)
-    PRINTF_ATTRIBUTE(3, 4);
+    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 
 extern sys_errno_t sys_klog(sysarg_t, void *buf, size_t size,
Index: kernel/generic/include/panic.h
===================================================================
--- kernel/generic/include/panic.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ kernel/generic/include/panic.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -66,5 +66,5 @@
 extern void panic_common(panic_category_t, struct istate *, int,
     uintptr_t, const char *, ...) __attribute__ ((noreturn))
-    PRINTF_ATTRIBUTE(5, 6);
+    _HELENOS_PRINTF_ATTRIBUTE(5, 6);
 
 #endif
Index: kernel/generic/include/print.h
===================================================================
--- kernel/generic/include/print.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ kernel/generic/include/print.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -44,7 +44,7 @@
 extern int puts(const char *s);
 extern int printf(const char *fmt, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int snprintf(char *str, size_t size, const char *fmt, ...)
-    PRINTF_ATTRIBUTE(3, 4);
+    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 
 extern int vprintf(const char *fmt, va_list ap);
Index: kernel/generic/include/printf/verify.h
===================================================================
--- kernel/generic/include/printf/verify.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ kernel/generic/include/printf/verify.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -36,20 +36,20 @@
 #define KERN_PRINTF_VERIFY_H_
 
-#ifndef NVERIFY_PRINTF
+#ifndef _HELENOS_NVERIFY_PRINTF
 
 #ifdef __clang__
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
 	__attribute__((format(__printf__, start, end)))
 #else
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
 	__attribute__((format(gnu_printf, start, end)))
 #endif
 
 
-#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
Index: kernel/test/print/print5.c
===================================================================
--- kernel/test/print/print5.c	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ kernel/test/print/print5.c	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -37,5 +37,5 @@
  *
  */
-#define NVERIFY_PRINTF
+#define _HELENOS_NVERIFY_PRINTF
 
 #include <print.h>
Index: uspace/app/bdsh/errors.h
===================================================================
--- uspace/app/bdsh/errors.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/app/bdsh/errors.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -49,5 +49,5 @@
 
 extern void cli_error(int, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 
 #endif
Index: uspace/app/fontviewer/fontviewer.c
===================================================================
--- uspace/app/fontviewer/fontviewer.c	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/app/fontviewer/fontviewer.c	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -139,5 +139,5 @@
 
 static int text(drawctx_t *, font_t *, source_t *, surface_coord_t x,
-    surface_coord_t , const char *, ...) PRINTF_ATTRIBUTE(6, 7);
+    surface_coord_t , const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(6, 7);
 static int text(drawctx_t *drawctx, font_t *font, source_t *source,
     surface_coord_t x, surface_coord_t y, const char *fmt, ...)
Index: uspace/app/tester/print/print5.c
===================================================================
--- uspace/app/tester/print/print5.c	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/app/tester/print/print5.c	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -37,5 +37,5 @@
  *
  */
-#define NVERIFY_PRINTF
+#define _HELENOS_NVERIFY_PRINTF
 
 #include <stdio.h>
Index: uspace/app/top/screen.h
===================================================================
--- uspace/app/top/screen.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/app/top/screen.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -45,5 +45,5 @@
 extern void print_data(data_t *);
 extern void show_warning(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 
 extern int tgetchar(unsigned int);
Index: uspace/dist/src/c/demos/top/screen.h
===================================================================
--- uspace/dist/src/c/demos/top/screen.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/dist/src/c/demos/top/screen.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -45,5 +45,5 @@
 extern void print_data(data_t *);
 extern void show_warning(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 
 extern errno_t tgetchar(unsigned int);
Index: uspace/lib/c/include/io/kio.h
===================================================================
--- uspace/lib/c/include/io/kio.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/lib/c/include/io/kio.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -44,5 +44,5 @@
 extern void kio_command(const void *, size_t);
 extern int kio_printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int kio_vprintf(const char *, va_list);
 
Index: uspace/lib/c/include/io/log.h
===================================================================
--- uspace/lib/c/include/io/log.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/lib/c/include/io/log.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -60,5 +60,5 @@
 
 extern void log_msg(log_t, log_level_t, const char *, ...)
-    PRINTF_ATTRIBUTE(3, 4);
+    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 extern void log_msgv(log_t, log_level_t, const char *, va_list);
 
Index: uspace/lib/c/include/io/verify.h
===================================================================
--- uspace/lib/c/include/io/verify.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/lib/c/include/io/verify.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -36,19 +36,19 @@
 #define LIBC_IO_VERIFY_H_
 
-#ifndef NVERIFY_PRINTF
+#ifndef _HELENOS_NVERIFY_PRINTF
 
 #ifdef __clang__
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
 	__attribute__((format(__printf__, start, end)))
 #else
-#define PRINTF_ATTRIBUTE(start, end) \
+#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
 	__attribute__((format(gnu_printf, start, end)))
 #endif
 
-#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
Index: uspace/lib/c/include/stdio.h
===================================================================
--- uspace/lib/c/include/stdio.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/lib/c/include/stdio.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -112,20 +112,20 @@
 /* Formatted string output functions */
 extern int fprintf(FILE *, const char*, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern int vfprintf(FILE *, const char *, va_list);
 
 extern int printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int vprintf(const char *, va_list);
 
 extern int snprintf(char *, size_t , const char *, ...)
-    PRINTF_ATTRIBUTE(3, 4);
+    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 extern int vasprintf(char **, const char *, va_list);
 extern int asprintf(char **, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern int vsnprintf(char *, size_t, const char *, va_list);
 
 extern int printf_size(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
+    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int vprintf_size(const char *, va_list);
 
Index: uspace/lib/drv/include/ddf/log.h
===================================================================
--- uspace/lib/drv/include/ddf/log.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/lib/drv/include/ddf/log.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -39,5 +39,5 @@
 extern errno_t ddf_log_init(const char *);
 extern void ddf_msg(log_level_t, const char *, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 
 extern void ddf_dump_buffer(char *, size_t, const void *, size_t, size_t,
Index: uspace/lib/posix/include/posix/stdio.h
===================================================================
--- uspace/lib/posix/include/posix/stdio.h	(revision 18bb1983592d82d44c5be98e815382d3a694e726)
+++ uspace/lib/posix/include/posix/stdio.h	(revision 09d13c8e567316acfec91989df4a5d961f8fb644)
@@ -99,14 +99,14 @@
 extern int puts(const char *);
 
-extern int fprintf(FILE *, const char*, ...) PRINTF_ATTRIBUTE(2, 3);
+extern int fprintf(FILE *, const char*, ...) _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern int vfprintf(FILE *, const char *, va_list);
 
-extern int printf(const char *, ...) PRINTF_ATTRIBUTE(1, 2);
+extern int printf(const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(1, 2);
 extern int vprintf(const char *, va_list);
 
-extern int snprintf(char *, size_t , const char *, ...) PRINTF_ATTRIBUTE(3, 4);
+extern int snprintf(char *, size_t , const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(3, 4);
 #ifdef _GNU_SOURCE
 extern int vasprintf(char **, const char *, va_list);
-extern int asprintf(char **, const char *, ...) PRINTF_ATTRIBUTE(2, 3);
+extern int asprintf(char **, const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 #endif
 extern int vsnprintf(char *, size_t, const char *, va_list);
@@ -176,8 +176,8 @@
 /* Formatted Output */
 extern int __POSIX_DEF__(dprintf)(int fildes, const char *__restrict__ format, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern int __POSIX_DEF__(vdprintf)(int fildes, const char *__restrict__ format, va_list ap);
 extern int __POSIX_DEF__(sprintf)(char *__restrict__ s, const char *__restrict__ format, ...)
-    PRINTF_ATTRIBUTE(2, 3);
+    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
 extern int __POSIX_DEF__(vsprintf)(char *__restrict__ s, const char *__restrict__ format, va_list ap);