Index: uspace/lib/device/include/bd.h
===================================================================
--- uspace/lib/device/include/bd.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/bd.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_BD_H_
-#define _LIBC_BD_H_
+#ifndef LIBDEVICE_BD_H
+#define LIBDEVICE_BD_H
 
 #include <async.h>
Index: uspace/lib/device/include/bd_srv.h
===================================================================
--- uspace/lib/device/include/bd_srv.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/bd_srv.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_BD_SRV_H_
-#define _LIBC_BD_SRV_H_
+#ifndef LIBDEVICE_BD_SRV_H
+#define LIBDEVICE_BD_SRV_H
 
 #include <adt/list.h>
Index: uspace/lib/device/include/device/led_dev.h
===================================================================
--- uspace/lib/device/include/device/led_dev.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/device/led_dev.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_DEVICE_LED_DEV_H_
-#define _LIBC_DEVICE_LED_DEV_H_
+#ifndef LIBDEVICE_DEVICE_LED_DEV_H
+#define LIBDEVICE_DEVICE_LED_DEV_H
 
 #include <async.h>
Index: uspace/lib/device/include/devman.h
===================================================================
--- uspace/lib/device/include/devman.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/devman.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef _LIBC_DEVMAN_H_
-#define _LIBC_DEVMAN_H_
+#ifndef LIBDEVICE_DEVMAN_H
+#define LIBDEVICE_DEVMAN_H
 
 #include <ipc/devman.h>
Index: uspace/lib/device/include/ieee80211/ieee80211.h
===================================================================
--- uspace/lib/device/include/ieee80211/ieee80211.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/ieee80211/ieee80211.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  *  @{
  */
@@ -35,6 +35,6 @@
  */
 
-#ifndef _LIBC_IEEE80211_H_
-#define _LIBC_IEEE80211_H_
+#ifndef LIBDEVICE_IEEE80211_H
+#define LIBDEVICE_IEEE80211_H
 
 #include <adt/list.h>
Index: uspace/lib/device/include/io/chardev.h
===================================================================
--- uspace/lib/device/include/io/chardev.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/io/chardev.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,10 +27,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
 
-#ifndef _LIBC_IO_CHARDEV_H_
-#define _LIBC_IO_CHARDEV_H_
+#ifndef LIBDEVICE_IO_CHARDEV_H
+#define LIBDEVICE_IO_CHARDEV_H
 
 #include <async.h>
Index: uspace/lib/device/include/io/chardev_srv.h
===================================================================
--- uspace/lib/device/include/io/chardev_srv.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/io/chardev_srv.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IO_CHARDEV_SRV_H_
-#define _LIBC_IO_CHARDEV_SRV_H_
+#ifndef LIBDEVICE_IO_CHARDEV_SRV_H
+#define LIBDEVICE_IO_CHARDEV_SRV_H
 
 #include <adt/list.h>
Index: uspace/lib/device/include/io/label.h
===================================================================
--- uspace/lib/device/include/io/label.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/io/label.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IO_LABEL_H_
-#define _LIBC_IO_LABEL_H_
+#ifndef LIBDEVICE_IO_LABEL_H
+#define LIBDEVICE_IO_LABEL_H
 
 #include <types/label.h>
Index: uspace/lib/device/include/io/serial.h
===================================================================
--- uspace/lib/device/include/io/serial.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/io/serial.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IO_SERIAL_H_
-#define _LIBC_IO_SERIAL_H_
+#ifndef LIBDEVICE_IO_SERIAL_H
+#define LIBDEVICE_IO_SERIAL_H
 
 #include <async.h>
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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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 cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -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>
Index: uspace/lib/device/include/irc.h
===================================================================
--- uspace/lib/device/include/irc.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/irc.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IRC_H_
-#define _LIBC_IRC_H_
+#ifndef LIBDEVICE_IRC_H
+#define LIBDEVICE_IRC_H
 
 extern errno_t irc_enable_interrupt(int);
Index: uspace/lib/device/include/nic/eth_phys.h
===================================================================
--- uspace/lib/device/include/nic/eth_phys.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/nic/eth_phys.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -28,6 +28,6 @@
  */
 
-#ifndef _LIBC_NIC_ETH_PHYS_H_
-#define _LIBC_NIC_ETH_PHYS_H_
+#ifndef LIBDEVICE_NIC_ETH_PHYS_H
+#define LIBDEVICE_NIC_ETH_PHYS_H
 
 #include <stdint.h>
Index: uspace/lib/device/include/nic/nic.h
===================================================================
--- uspace/lib/device/include/nic/nic.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/nic/nic.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -36,6 +36,6 @@
  */
 
-#ifndef _LIBC_NIC_H_
-#define _LIBC_NIC_H_
+#ifndef LIBDEVICE_NIC_H
+#define LIBDEVICE_NIC_H
 
 #include <nic/eth_phys.h>
@@ -269,5 +269,5 @@
 	/** The mask of all modes which the device can advertise
 	 *
-	 *  see ETH_AUTONEG_ macros in nic/eth_phys.h of libc
+	 *  see ETH_AUTONEG_ macros in nic/eth_phys.h of libdevice
 	 */
 	uint32_t autoneg_support;
Index: uspace/lib/device/include/pci.h
===================================================================
--- uspace/lib/device/include/pci.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/pci.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_PCI_H_
-#define _LIBC_PCI_H_
+#ifndef LIBDEVICE_PCI_H
+#define LIBDEVICE_PCI_H
 
 #include <errno.h>
Index: uspace/lib/device/include/types/io/chardev.h
===================================================================
--- uspace/lib/device/include/types/io/chardev.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/types/io/chardev.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -26,10 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
 
-#ifndef _LIBC_TYPES_IO_CHARDEV_H_
-#define _LIBC_TYPES_IO_CHARDEV_H_
+#ifndef LIBDEVICE_TYPES_IO_CHARDEV_H
+#define LIBDEVICE_TYPES_IO_CHARDEV_H
 
 /** Chardev read/write operation flags */
Index: uspace/lib/device/include/types/label.h
===================================================================
--- uspace/lib/device/include/types/label.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/types/label.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_TYPES_LABEL_H_
-#define _LIBC_TYPES_LABEL_H_
+#ifndef LIBDEVICE_TYPES_LABEL_H
+#define LIBDEVICE_TYPES_LABEL_H
 
 #include <types/uuid.h>
Index: uspace/lib/device/include/types/pci.h
===================================================================
--- uspace/lib/device/include/types/pci.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/types/pci.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_TYPES_PCI_H_
-#define _LIBC_TYPES_PCI_H_
+#ifndef LIBDEVICE_TYPES_PCI_H
+#define LIBDEVICE_TYPES_PCI_H
 
 #include <async.h>
Index: uspace/lib/device/include/types/vol.h
===================================================================
--- uspace/lib/device/include/types/vol.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/types/vol.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_TYPES_VOL_H_
-#define _LIBC_TYPES_VOL_H_
+#ifndef LIBDEVICE_TYPES_VOL_H
+#define LIBDEVICE_TYPES_VOL_H
 
 #include <async.h>
Index: uspace/lib/device/include/vbd.h
===================================================================
--- uspace/lib/device/include/vbd.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/vbd.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_VBD_H_
-#define _LIBC_VBD_H_
+#ifndef LIBDEVICE_VBD_H
+#define LIBDEVICE_VBD_H
 
 #include <async.h>
Index: uspace/lib/device/include/vol.h
===================================================================
--- uspace/lib/device/include/vol.h	(revision 5fc82448bbd01f2950b893989095ed4c1b1c99b3)
+++ uspace/lib/device/include/vol.h	(revision cb747b3b787df15184afceecdeef820cfe7e4226)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_VOL_H_
-#define _LIBC_VOL_H_
+#ifndef LIBDEVICE_VOL_H
+#define LIBDEVICE_VOL_H
 
 #include <async.h>