Index: uspace/lib/c/include/ipc/adb.h
===================================================================
--- uspace/lib/c/include/ipc/adb.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/adb.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_IPC_ADB_H_
-#define LIBC_IPC_ADB_H_
+#ifndef _LIBC_IPC_ADB_H_
+#define _LIBC_IPC_ADB_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/bd.h
===================================================================
--- uspace/lib/c/include/ipc/bd.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/bd.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_BD_H_
-#define LIBC_IPC_BD_H_
+#ifndef _LIBC_IPC_BD_H_
+#define _LIBC_IPC_BD_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/chardev.h
===================================================================
--- uspace/lib/c/include/ipc/chardev.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/chardev.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_IPC_CHARDEV_H_
-#define LIBC_IPC_CHARDEV_H_
+#ifndef _LIBC_IPC_CHARDEV_H_
+#define _LIBC_IPC_CHARDEV_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/clipboard.h
===================================================================
--- uspace/lib/c/include/ipc/clipboard.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/clipboard.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_CLIPBOARD_H_
-#define LIBC_IPC_CLIPBOARD_H_
+#ifndef _LIBC_IPC_CLIPBOARD_H_
+#define _LIBC_IPC_CLIPBOARD_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/common.h
===================================================================
--- uspace/lib/c/include/ipc/common.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/common.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_COMMON_H_
-#define LIBC_IPC_COMMON_H_
+#ifndef _LIBC_IPC_COMMON_H_
+#define _LIBC_IPC_COMMON_H_
 
 #include <types/common.h>
Index: uspace/lib/c/include/ipc/console.h
===================================================================
--- uspace/lib/c/include/ipc/console.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/console.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_CONSOLE_H_
-#define LIBC_IPC_CONSOLE_H_
+#ifndef _LIBC_IPC_CONSOLE_H_
+#define _LIBC_IPC_CONSOLE_H_
 
 #include <ipc/vfs.h>
Index: uspace/lib/c/include/ipc/corecfg.h
===================================================================
--- uspace/lib/c/include/ipc/corecfg.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/corecfg.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_IPC_CORECFG_H_
-#define LIBC_IPC_CORECFG_H_
+#ifndef _LIBC_IPC_CORECFG_H_
+#define _LIBC_IPC_CORECFG_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/dev_iface.h
===================================================================
--- uspace/lib/c/include/ipc/dev_iface.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/dev_iface.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -27,6 +27,6 @@
  */
 
-#ifndef LIBC_IPC_DEV_IFACE_H_
-#define LIBC_IPC_DEV_IFACE_H_
+#ifndef _LIBC_IPC_DEV_IFACE_H_
+#define _LIBC_IPC_DEV_IFACE_H_
 
 #include <stdlib.h>
Index: uspace/lib/c/include/ipc/devman.h
===================================================================
--- uspace/lib/c/include/ipc/devman.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/devman.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_IPC_DEVMAN_H_
-#define LIBC_IPC_DEVMAN_H_
+#ifndef _LIBC_IPC_DEVMAN_H_
+#define _LIBC_IPC_DEVMAN_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/dhcp.h
===================================================================
--- uspace/lib/c/include/ipc/dhcp.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/dhcp.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_DHCP_H_
-#define LIBC_IPC_DHCP_H_
+#ifndef _LIBC_IPC_DHCP_H_
+#define _LIBC_IPC_DHCP_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/dnsr.h
===================================================================
--- uspace/lib/c/include/ipc/dnsr.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/dnsr.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_IPC_DNSR_H_
-#define LIBC_IPC_DNSR_H_
+#ifndef _LIBC_IPC_DNSR_H_
+#define _LIBC_IPC_DNSR_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/event.h
===================================================================
--- uspace/lib/c/include/ipc/event.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/event.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_EVENT_H_
-#define LIBC_IPC_EVENT_H_
+#ifndef _LIBC_IPC_EVENT_H_
+#define _LIBC_IPC_EVENT_H_
 
 #include <abi/ipc/event.h>
Index: uspace/lib/c/include/ipc/graph.h
===================================================================
--- uspace/lib/c/include/ipc/graph.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/graph.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_GRAPH_H_
-#define LIBC_IPC_GRAPH_H_
+#ifndef _LIBC_IPC_GRAPH_H_
+#define _LIBC_IPC_GRAPH_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/inet.h
===================================================================
--- uspace/lib/c/include/ipc/inet.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/inet.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_INET_H_
-#define LIBC_IPC_INET_H_
+#ifndef _LIBC_IPC_INET_H_
+#define _LIBC_IPC_INET_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/input.h
===================================================================
--- uspace/lib/c/include/ipc/input.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/input.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_INPUT_H_
-#define LIBC_IPC_INPUT_H_
+#ifndef _LIBC_IPC_INPUT_H_
+#define _LIBC_IPC_INPUT_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/ipc.h
===================================================================
--- uspace/lib/c/include/ipc/ipc.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/ipc.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,10 +33,10 @@
  */
 
-#if ((defined(LIBC_ASYNC_H_)) && (!defined(LIBC_ASYNC_C_)))
+#if ((defined(_LIBC_ASYNC_H_)) && (!defined(_LIBC_ASYNC_C_)))
 #error Do not intermix low-level IPC interface and async framework
 #endif
 
-#ifndef LIBC_IPC_H_
-#define LIBC_IPC_H_
+#ifndef _LIBC_IPC_H_
+#define _LIBC_IPC_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/ipc_test.h
===================================================================
--- uspace/lib/c/include/ipc/ipc_test.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/ipc_test.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_IPC_TEST_H_
-#define LIBC_IPC_IPC_TEST_H_
+#ifndef _LIBC_IPC_IPC_TEST_H_
+#define _LIBC_IPC_IPC_TEST_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/iplink.h
===================================================================
--- uspace/lib/c/include/ipc/iplink.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/iplink.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_IPLINK_H_
-#define LIBC_IPC_IPLINK_H_
+#ifndef _LIBC_IPC_IPLINK_H_
+#define _LIBC_IPC_IPLINK_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/irc.h
===================================================================
--- uspace/lib/c/include/ipc/irc.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/irc.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_IRC_H_
-#define LIBC_IPC_IRC_H_
+#ifndef _LIBC_IPC_IRC_H_
+#define _LIBC_IPC_IRC_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/irq.h
===================================================================
--- uspace/lib/c/include/ipc/irq.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/irq.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_IRQ_H_
-#define LIBC_IPC_IRQ_H_
+#ifndef _LIBC_IPC_IRQ_H_
+#define _LIBC_IPC_IRQ_H_
 
 #include <types/common.h>
Index: uspace/lib/c/include/ipc/kbdev.h
===================================================================
--- uspace/lib/c/include/ipc/kbdev.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/kbdev.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_KBDEV_H_
-#define LIBC_IPC_KBDEV_H_
+#ifndef _LIBC_IPC_KBDEV_H_
+#define _LIBC_IPC_KBDEV_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/loader.h
===================================================================
--- uspace/lib/c/include/ipc/loader.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/loader.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_LOADER_H_
-#define LIBC_IPC_LOADER_H_
+#ifndef _LIBC_IPC_LOADER_H_
+#define _LIBC_IPC_LOADER_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/loc.h
===================================================================
--- uspace/lib/c/include/ipc/loc.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/loc.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -32,6 +32,6 @@
  */
 
-#ifndef LIBC_IPC_LOC_H_
-#define LIBC_IPC_LOC_H_
+#ifndef _LIBC_IPC_LOC_H_
+#define _LIBC_IPC_LOC_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/logger.h
===================================================================
--- uspace/lib/c/include/ipc/logger.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/logger.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_IPC_LOGGER_H_
-#define LIBC_IPC_LOGGER_H_
+#ifndef _LIBC_IPC_LOGGER_H_
+#define _LIBC_IPC_LOGGER_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/mouseev.h
===================================================================
--- uspace/lib/c/include/ipc/mouseev.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/mouseev.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_IPC_MOUSEEV_H_
-#define LIBC_IPC_MOUSEEV_H_
+#ifndef _LIBC_IPC_MOUSEEV_H_
+#define _LIBC_IPC_MOUSEEV_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/ns.h
===================================================================
--- uspace/lib/c/include/ipc/ns.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/ns.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_NS_H_
-#define LIBC_IPC_NS_H_
+#ifndef _LIBC_IPC_NS_H_
+#define _LIBC_IPC_NS_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/output.h
===================================================================
--- uspace/lib/c/include/ipc/output.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/output.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_OUTPUT_H_
-#define LIBC_IPC_OUTPUT_H_
+#ifndef _LIBC_IPC_OUTPUT_H_
+#define _LIBC_IPC_OUTPUT_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/pci.h
===================================================================
--- uspace/lib/c/include/ipc/pci.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/pci.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_PCI_H_
-#define LIBC_IPC_PCI_H_
+#ifndef _LIBC_IPC_PCI_H_
+#define _LIBC_IPC_PCI_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/serial_ctl.h
===================================================================
--- uspace/lib/c/include/ipc/serial_ctl.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/serial_ctl.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -27,6 +27,6 @@
  */
 
-#ifndef LIBC_IPC_SERIAL_CTL_H_
-#define LIBC_IPC_SERIAL_CTL_H_
+#ifndef _LIBC_IPC_SERIAL_CTL_H_
+#define _LIBC_IPC_SERIAL_CTL_H_
 
 #include <ipc/chardev.h>
Index: uspace/lib/c/include/ipc/services.h
===================================================================
--- uspace/lib/c/include/ipc/services.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/services.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -35,6 +35,6 @@
  */
 
-#ifndef LIBC_SERVICES_H_
-#define LIBC_SERVICES_H_
+#ifndef _LIBC_SERVICES_H_
+#define _LIBC_SERVICES_H_
 
 #include <abi/fourcc.h>
Index: uspace/lib/c/include/ipc/tcp.h
===================================================================
--- uspace/lib/c/include/ipc/tcp.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/tcp.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_TCP_H_
-#define LIBC_IPC_TCP_H_
+#ifndef _LIBC_IPC_TCP_H_
+#define _LIBC_IPC_TCP_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/udp.h
===================================================================
--- uspace/lib/c/include/ipc/udp.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/udp.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_UDP_H_
-#define LIBC_IPC_UDP_H_
+#ifndef _LIBC_IPC_UDP_H_
+#define _LIBC_IPC_UDP_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/vbd.h
===================================================================
--- uspace/lib/c/include/ipc/vbd.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/vbd.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_IPC_VBD_H_
-#define LIBC_IPC_VBD_H_
+#ifndef _LIBC_IPC_VBD_H_
+#define _LIBC_IPC_VBD_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/vfs.h
===================================================================
--- uspace/lib/c/include/ipc/vfs.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/vfs.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_VFS_H_
-#define LIBC_IPC_VFS_H_
+#ifndef _LIBC_IPC_VFS_H_
+#define _LIBC_IPC_VFS_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/vol.h
===================================================================
--- uspace/lib/c/include/ipc/vol.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/vol.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_IPC_VOL_H_
-#define LIBC_IPC_VOL_H_
+#ifndef _LIBC_IPC_VOL_H_
+#define _LIBC_IPC_VOL_H_
 
 #include <ipc/common.h>
Index: uspace/lib/c/include/ipc/window.h
===================================================================
--- uspace/lib/c/include/ipc/window.h	(revision 7acd787ef6db58d28e222cd14600149ac8c9ff72)
+++ uspace/lib/c/include/ipc/window.h	(revision 9e7406a2a39bbff4e859b08f08ee4427c1384ab3)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_IPC_WINDOW_H_
-#define LIBC_IPC_WINDOW_H_
+#ifndef _LIBC_IPC_WINDOW_H_
+#define _LIBC_IPC_WINDOW_H_
 
 #include <ipc/vfs.h>