Index: abi/doc/doxygroups.h
===================================================================
--- abi/doc/doxygroups.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/doc/doxygroups.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -8,2 +8,7 @@
  * @ingroup abi
  */
+
+/**
+ * @defgroup abi_generic Generic shared definitions
+ * @ingroup abi
+ */
Index: abi/include/abi/cap.h
===================================================================
--- abi/include/abi/cap.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/cap.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/ddi/arg.h
===================================================================
--- abi/include/abi/ddi/arg.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/ddi/arg.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericddi
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/ddi/irq.h
===================================================================
--- abi/include/abi/ddi/irq.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/ddi/irq.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericddi
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/elf.h
===================================================================
--- abi/include/abi/elf.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/elf.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/ipc/event.h
===================================================================
--- abi/include/abi/ipc/event.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/ipc/event.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/ipc/interfaces.h
===================================================================
--- abi/include/abi/ipc/interfaces.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/ipc/interfaces.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericipc
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/ipc/ipc.h
===================================================================
--- abi/include/abi/ipc/ipc.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/ipc/ipc.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericipc
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/ipc/methods.h
===================================================================
--- abi/include/abi/ipc/methods.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/ipc/methods.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericipc
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/kio.h
===================================================================
--- abi/include/abi/kio.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/kio.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/klog.h
===================================================================
--- abi/include/abi/klog.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/klog.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/mm/as.h
===================================================================
--- abi/include/abi/mm/as.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/mm/as.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericmm
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/proc/task.h
===================================================================
--- abi/include/abi/proc/task.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/proc/task.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericproc
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/proc/thread.h
===================================================================
--- abi/include/abi/proc/thread.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/proc/thread.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericproc
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/proc/uarg.h
===================================================================
--- abi/include/abi/proc/uarg.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/proc/uarg.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup genericproc
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/syscall.h
===================================================================
--- abi/include/abi/syscall.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/syscall.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/sysinfo.h
===================================================================
--- abi/include/abi/sysinfo.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/sysinfo.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */
Index: abi/include/abi/udebug.h
===================================================================
--- abi/include/abi/udebug.h	(revision 3f7fe9e91d327467121a08ebb9f0aca902ff737a)
+++ abi/include/abi/udebug.h	(revision 21751785b96d50c71310a8d9b941dda5399bd88a)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup abi_generic
  * @{
  */