Index: uspace/lib/device/include/ipc/adb.h
===================================================================
--- uspace/lib/device/include/ipc/adb.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/adb.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libdevice
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef _LIBC_IPC_ADB_H_
-#define _LIBC_IPC_ADB_H_
+#ifndef LIBDEVICE_IPC_ADB_H
+#define LIBDEVICE_IPC_ADB_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/ipc/bd.h
===================================================================
--- uspace/lib/device/include/ipc/bd.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/bd.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_BD_H_
-#define _LIBC_IPC_BD_H_
+#ifndef LIBDEVICE_IPC_BD_H
+#define LIBDEVICE_IPC_BD_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/ipc/chardev.h
===================================================================
--- uspace/lib/device/include/ipc/chardev.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/chardev.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libdevice
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef _LIBC_IPC_CHARDEV_H_
-#define _LIBC_IPC_CHARDEV_H_
+#ifndef LIBDEVICE_IPC_CHARDEV_H
+#define LIBDEVICE_IPC_CHARDEV_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/ipc/devman.h
===================================================================
--- uspace/lib/device/include/ipc/devman.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/devman.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -31,6 +31,6 @@
  */
 
-#ifndef _LIBC_IPC_DEVMAN_H_
-#define _LIBC_IPC_DEVMAN_H_
+#ifndef LIBDEVICE_IPC_DEVMAN_H
+#define LIBDEVICE_IPC_DEVMAN_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/ipc/irc.h
===================================================================
--- uspace/lib/device/include/ipc/irc.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/irc.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_IRC_H_
-#define _LIBC_IPC_IRC_H_
+#ifndef LIBDEVICE_IPC_IRC_H
+#define LIBDEVICE_IPC_IRC_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/ipc/pci.h
===================================================================
--- uspace/lib/device/include/ipc/pci.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/pci.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_PCI_H_
-#define _LIBC_IPC_PCI_H_
+#ifndef LIBDEVICE_IPC_PCI_H
+#define LIBDEVICE_IPC_PCI_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/ipc/serial_ctl.h
===================================================================
--- uspace/lib/device/include/ipc/serial_ctl.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/serial_ctl.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,6 +27,6 @@
  */
 
-#ifndef _LIBC_IPC_SERIAL_CTL_H_
-#define _LIBC_IPC_SERIAL_CTL_H_
+#ifndef LIBDEVICE_IPC_SERIAL_CTL_H
+#define LIBDEVICE_IPC_SERIAL_CTL_H
 
 #include <ipc/chardev.h>
Index: uspace/lib/device/include/ipc/vbd.h
===================================================================
--- uspace/lib/device/include/ipc/vbd.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/vbd.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,10 +27,10 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libdevice
  * @{
  */
 
-#ifndef _LIBC_IPC_VBD_H_
-#define _LIBC_IPC_VBD_H_
+#ifndef LIBDEVICE_IPC_VBD_H
+#define LIBDEVICE_IPC_VBD_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/ipc/vol.h
===================================================================
--- uspace/lib/device/include/ipc/vol.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ipc/vol.h	(revision ea50e6715564d0b1b526855dda7bc8f2f776dab7)
@@ -27,10 +27,10 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libdevice
  * @{
  */
 
-#ifndef _LIBC_IPC_VOL_H_
-#define _LIBC_IPC_VOL_H_
+#ifndef LIBDEVICE_IPC_VOL_H
+#define LIBDEVICE_IPC_VOL_H
 
 #include <ipc/common.h>