Index: uspace/lib/ddev/include/ipc/ddev.h
===================================================================
--- uspace/lib/ddev/include/ipc/ddev.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/ddev/include/ipc/ddev.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_DDEV_H_
-#define _LIBC_IPC_DDEV_H_
+#ifndef LIBDDEV_IPC_DDEV_H
+#define LIBDDEV_IPC_DDEV_H
 
 #include <ipc/common.h>
Index: uspace/lib/device/include/bd.h
===================================================================
--- uspace/lib/device/include/bd.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/bd.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/bd_srv.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/device/led_dev.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/devman.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ieee80211/ieee80211.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/io/chardev.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/io/chardev_srv.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/io/label.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/io/serial.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/adb.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/bd.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/chardev.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/devman.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/irc.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/pci.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/serial_ctl.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/vbd.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/ipc/vol.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/irc.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/nic/eth_phys.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/nic/nic.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/pci.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/types/io/chardev.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/types/label.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/types/pci.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/types/vol.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/vbd.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/include/vol.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -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>
Index: uspace/lib/device/src/bd.c
===================================================================
--- uspace/lib/device/src/bd.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/bd.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/bd_srv.c
===================================================================
--- uspace/lib/device/src/bd_srv.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/bd_srv.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/device/led_dev.c
===================================================================
--- uspace/lib/device/src/device/led_dev.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/device/led_dev.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/devman.c
===================================================================
--- uspace/lib/device/src/devman.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/devman.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -29,5 +29,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/io/chardev.c
===================================================================
--- uspace/lib/device/src/io/chardev.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/io/chardev.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/io/chardev_srv.c
===================================================================
--- uspace/lib/device/src/io/chardev_srv.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/io/chardev_srv.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/io/label.c
===================================================================
--- uspace/lib/device/src/io/label.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/io/label.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/irc.c
===================================================================
--- uspace/lib/device/src/irc.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/irc.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/pci.c
===================================================================
--- uspace/lib/device/src/pci.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/pci.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/vbd.c
===================================================================
--- uspace/lib/device/src/vbd.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/vbd.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/device/src/vol.c
===================================================================
--- uspace/lib/device/src/vol.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/device/src/vol.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdevice
  * @{
  */
Index: uspace/lib/display/include/ipc/display.h
===================================================================
--- uspace/lib/display/include/ipc/display.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/display/include/ipc/display.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_DISPLAY_H_
-#define _LIBC_IPC_DISPLAY_H_
+#ifndef LIBDISPLAY_IPC_DISPLAY_H
+#define LIBDISPLAY_IPC_DISPLAY_H
 
 #include <ipc/common.h>
Index: uspace/lib/drv/include/battery_iface.h
===================================================================
--- uspace/lib/drv/include/battery_iface.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/drv/include/battery_iface.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdrv
  * @{
  */
Index: uspace/lib/drv/include/ieee80211_iface.h
===================================================================
--- uspace/lib/drv/include/ieee80211_iface.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/drv/include/ieee80211_iface.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdrv
  * @{
  */
Index: uspace/lib/drv/include/nic_iface.h
===================================================================
--- uspace/lib/drv/include/nic_iface.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/drv/include/nic_iface.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libdrv
  * @{
  */
Index: uspace/lib/inet/include/inet/addr.h
===================================================================
--- uspace/lib/inet/include/inet/addr.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/addr.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_ADDR_H_
-#define _LIBC_INET_ADDR_H_
+#ifndef LIBINET_INET_ADDR_H
+#define LIBINET_INET_ADDR_H
 
 #include <errno.h>
Index: uspace/lib/inet/include/inet/dhcp.h
===================================================================
--- uspace/lib/inet/include/inet/dhcp.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/dhcp.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_DHCP_H_
-#define _LIBC_INET_DHCP_H_
+#ifndef LIBINET_INET_DHCP_H
+#define LIBINET_INET_DHCP_H
 
 #include <types/common.h>
Index: uspace/lib/inet/include/inet/dnsr.h
===================================================================
--- uspace/lib/inet/include/inet/dnsr.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/dnsr.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_DNSR_H_
-#define _LIBC_INET_DNSR_H_
+#ifndef LIBINET_INET_DNSR_H
+#define LIBINET_INET_DNSR_H
 
 #include <inet/inet.h>
Index: uspace/lib/inet/include/inet/endpoint.h
===================================================================
--- uspace/lib/inet/include/inet/endpoint.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/endpoint.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_ENDPOINT_H_
-#define _LIBC_INET_ENDPOINT_H_
+#ifndef LIBINET_INET_ENDPOINT_H
+#define LIBINET_INET_ENDPOINT_H
 
 #include <stdint.h>
Index: uspace/lib/inet/include/inet/eth_addr.h
===================================================================
--- uspace/lib/inet/include/inet/eth_addr.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/eth_addr.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup libinet
  * @{
  */
@@ -35,6 +35,6 @@
  */
 
-#ifndef _LIBC_INET_ETH_ADDR_H_
-#define _LIBC_INET_ETH_ADDR_H_
+#ifndef LIBINET_INET_ETH_ADDR_H
+#define LIBINET_INET_ETH_ADDR_H
 
 #include <stdint.h>
Index: uspace/lib/inet/include/inet/host.h
===================================================================
--- uspace/lib/inet/include/inet/host.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/host.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_HOST_H_
-#define _LIBC_INET_HOST_H_
+#ifndef LIBINET_INET_HOST_H
+#define LIBINET_INET_HOST_H
 
 #include <inet/addr.h>
Index: uspace/lib/inet/include/inet/hostname.h
===================================================================
--- uspace/lib/inet/include/inet/hostname.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/hostname.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_HOSTNAME_H_
-#define _LIBC_INET_HOSTNAME_H_
+#ifndef LIBINET_INET_HOSTNAME_H
+#define LIBINET_INET_HOSTNAME_H
 
 extern errno_t inet_hostname_parse(const char *, char **, char **);
Index: uspace/lib/inet/include/inet/hostport.h
===================================================================
--- uspace/lib/inet/include/inet/hostport.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/hostport.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_HOSTPORT_H_
-#define _LIBC_INET_HOSTPORT_H_
+#ifndef LIBINET_INET_HOSTPORT_H
+#define LIBINET_INET_HOSTPORT_H
 
 #include <inet/addr.h>
Index: uspace/lib/inet/include/inet/inet.h
===================================================================
--- uspace/lib/inet/include/inet/inet.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/inet.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_INET_H_
-#define _LIBC_INET_INET_H_
+#ifndef LIBINET_INET_INET_H
+#define LIBINET_INET_INET_H
 
 #include <inet/addr.h>
Index: uspace/lib/inet/include/inet/inetcfg.h
===================================================================
--- uspace/lib/inet/include/inet/inetcfg.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/inetcfg.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_INETCFG_H_
-#define _LIBC_INET_INETCFG_H_
+#ifndef LIBINET_INET_INETCFG_H
+#define LIBINET_INET_INETCFG_H
 
 #include <inet/inet.h>
Index: uspace/lib/inet/include/inet/inetping.h
===================================================================
--- uspace/lib/inet/include/inet/inetping.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/inetping.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_INETPING_H_
-#define _LIBC_INET_INETPING_H_
+#ifndef LIBINET_INET_INETPING_H
+#define LIBINET_INET_INETPING_H
 
 #include <inet/inet.h>
Index: uspace/lib/inet/include/inet/iplink.h
===================================================================
--- uspace/lib/inet/include/inet/iplink.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/iplink.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_IPLINK_H_
-#define _LIBC_INET_IPLINK_H_
+#ifndef LIBINET_INET_IPLINK_H
+#define LIBINET_INET_IPLINK_H
 
 #include <async.h>
Index: uspace/lib/inet/include/inet/iplink_srv.h
===================================================================
--- uspace/lib/inet/include/inet/iplink_srv.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/iplink_srv.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_IPLINK_SRV_H_
-#define _LIBC_INET_IPLINK_SRV_H_
+#ifndef LIBINET_INET_IPLINK_SRV_H
+#define LIBINET_INET_IPLINK_SRV_H
 
 #include <async.h>
Index: uspace/lib/inet/include/inet/tcp.h
===================================================================
--- uspace/lib/inet/include/inet/tcp.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/tcp.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_TCP_H_
-#define _LIBC_INET_TCP_H_
+#ifndef LIBINET_INET_TCP_H
+#define LIBINET_INET_TCP_H
 
 #include <fibril_synch.h>
Index: uspace/lib/inet/include/inet/udp.h
===================================================================
--- uspace/lib/inet/include/inet/udp.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/inet/udp.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_INET_UDP_H_
-#define _LIBC_INET_UDP_H_
+#ifndef LIBINET_INET_UDP_H
+#define LIBINET_INET_UDP_H
 
 #include <async.h>
Index: uspace/lib/inet/include/ipc/dhcp.h
===================================================================
--- uspace/lib/inet/include/ipc/dhcp.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/ipc/dhcp.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_DHCP_H_
-#define _LIBC_IPC_DHCP_H_
+#ifndef LIBINET_IPC_DHCP_H
+#define LIBINET_IPC_DHCP_H
 
 #include <ipc/common.h>
Index: uspace/lib/inet/include/ipc/dnsr.h
===================================================================
--- uspace/lib/inet/include/ipc/dnsr.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/ipc/dnsr.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,10 +27,10 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libinet
  * @{
  */
 
-#ifndef _LIBC_IPC_DNSR_H_
-#define _LIBC_IPC_DNSR_H_
+#ifndef LIBINET_IPC_DNSR_H
+#define LIBINET_IPC_DNSR_H
 
 #include <ipc/common.h>
Index: uspace/lib/inet/include/ipc/inet.h
===================================================================
--- uspace/lib/inet/include/ipc/inet.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/ipc/inet.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_INET_H_
-#define _LIBC_IPC_INET_H_
+#ifndef LIBINET_IPC_INET_H
+#define LIBINET_IPC_INET_H
 
 #include <ipc/common.h>
Index: uspace/lib/inet/include/ipc/iplink.h
===================================================================
--- uspace/lib/inet/include/ipc/iplink.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/ipc/iplink.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_IPLINK_H_
-#define _LIBC_IPC_IPLINK_H_
+#ifndef LIBINET_IPC_IPLINK_H
+#define LIBINET_IPC_IPLINK_H
 
 #include <ipc/common.h>
Index: uspace/lib/inet/include/ipc/tcp.h
===================================================================
--- uspace/lib/inet/include/ipc/tcp.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/ipc/tcp.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_TCP_H_
-#define _LIBC_IPC_TCP_H_
+#ifndef LIBINET_IPC_TCP_H
+#define LIBINET_IPC_TCP_H
 
 #include <ipc/common.h>
Index: uspace/lib/inet/include/ipc/udp.h
===================================================================
--- uspace/lib/inet/include/ipc/udp.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/ipc/udp.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_IPC_UDP_H_
-#define _LIBC_IPC_UDP_H_
+#ifndef LIBINET_IPC_UDP_H
+#define LIBINET_IPC_UDP_H
 
 #include <ipc/common.h>
Index: uspace/lib/inet/include/types/inet.h
===================================================================
--- uspace/lib/inet/include/types/inet.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/types/inet.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_TYPES_INET_H_
-#define _LIBC_TYPES_INET_H_
+#ifndef LIBINET_TYPES_INET_H
+#define LIBINET_TYPES_INET_H
 
 #include <inet/addr.h>
Index: uspace/lib/inet/include/types/inet/host.h
===================================================================
--- uspace/lib/inet/include/types/inet/host.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/types/inet/host.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_TYPES_INET_HOST_H_
-#define _LIBC_TYPES_INET_HOST_H_
+#ifndef LIBINETTYPES_INET_HOST_H
+#define LIBINETTYPES_INET_HOST_H
 
 #include <inet/addr.h>
Index: uspace/lib/inet/include/types/inet/hostport.h
===================================================================
--- uspace/lib/inet/include/types/inet/hostport.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/types/inet/hostport.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_TYPES_INET_HOSTPORT_H_
-#define _LIBC_TYPES_INET_HOSTPORT_H_
+#ifndef LIBINET_TYPES_INET_HOSTPORT_H
+#define LIBINET_TYPES_INET_HOSTPORT_H
 
 #include <inet/addr.h>
Index: uspace/lib/inet/include/types/inetcfg.h
===================================================================
--- uspace/lib/inet/include/types/inetcfg.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/types/inetcfg.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef _LIBC_TYPES_INETCFG_H_
-#define _LIBC_TYPES_INETCFG_H_
+#ifndef LIBINET_TYPES_INETCFG_H
+#define LIBINET_TYPES_INETCFG_H
 
 #include <inet/eth_addr.h>
Index: uspace/lib/inet/include/types/inetping.h
===================================================================
--- uspace/lib/inet/include/types/inetping.h	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/include/types/inetping.h	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -35,6 +35,6 @@
  */
 
-#ifndef _LIBC_TYPES_INETPING_H_
-#define _LIBC_TYPES_INETPING_H_
+#ifndef LIBINET_TYPES_INETPING_H
+#define LIBINET_TYPES_INETPING_H
 
 #include <inet/addr.h>
Index: uspace/lib/inet/src/addr.c
===================================================================
--- uspace/lib/inet/src/addr.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/addr.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -28,5 +28,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/dhcp.c
===================================================================
--- uspace/lib/inet/src/dhcp.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/dhcp.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/endpoint.c
===================================================================
--- uspace/lib/inet/src/endpoint.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/endpoint.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/eth_addr.c
===================================================================
--- uspace/lib/inet/src/eth_addr.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/eth_addr.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/host.c
===================================================================
--- uspace/lib/inet/src/host.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/host.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/hostname.c
===================================================================
--- uspace/lib/inet/src/hostname.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/hostname.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/hostport.c
===================================================================
--- uspace/lib/inet/src/hostport.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/hostport.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/iplink.c
===================================================================
--- uspace/lib/inet/src/iplink.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/iplink.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/iplink_srv.c
===================================================================
--- uspace/lib/inet/src/iplink_srv.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/iplink_srv.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/tcp.c
===================================================================
--- uspace/lib/inet/src/tcp.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/tcp.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
Index: uspace/lib/inet/src/udp.c
===================================================================
--- uspace/lib/inet/src/udp.c	(revision 241ab7e11a995ede41fed730b4b8dab9b700c38c)
+++ uspace/lib/inet/src/udp.c	(revision edeee9ff19d63d97e85f6ecbd93e661f2b5ff66d)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */