From 501260e23576e7e4045374b0ba373abe38cd5624 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Sat, 1 Aug 2026 23:46:57 +0200
Subject: [PATCH 1/2] Add top level convinience headers for all RPL libraries

---
 include/avm.h                                 | 12 ++++
 include/avm/avm.dox                           |  5 --
 include/camera.h                              |  3 +
 include/coreinit.h                            | 71 +++++++++++++++++++
 include/coreinit/coreinit.dox                 |  6 --
 include/dmae.h                                |  9 +++
 include/dmae/dmae.dox                         |  4 --
 include/gx2.h                                 | 28 ++++++++
 include/gx2/gx2.dox                           |  4 --
 include/gx2r.h                                | 14 ++++
 include/gx2r/gx2r.dox                         |  5 --
 include/h264.h                                | 10 +++
 include/mic.h                                 |  3 +
 include/{nfc/nfc.dox => nfc.h}                |  4 ++
 include/nsysccr.h                             | 14 ++++
 include/nsysccr/nsysccr.dox                   |  5 --
 include/{nsyshid/nsyshid.dox => nsyshid.h}    |  4 ++
 include/nsysnet.h                             | 11 +++
 include/nsysnet/nsysnet.dox                   |  5 --
 include/nsysuhs.h                             |  9 +++
 include/nsysuhs/nsysuhs.dox                   |  4 --
 include/{ntag/ntag.dox => ntag.h}             |  4 ++
 include/padscore.h                            | 12 ++++
 include/padscore/padscore.dox                 |  5 --
 include/{proc_ui/procui.dox => proc_ui.h}     |  5 ++
 include/sndcore2.h                            | 14 ++++
 include/sndcore2/sndcore2.dox                 |  5 --
 include/{sysapp/sysapp.dox => sysapp.h}       |  7 ++
 include/tve.h                                 | 10 +++
 include/tve/tve.dox                           |  5 --
 include/{vpad/vpad.dox => vpad.h}             |  4 ++
 include/{vpadbase/vpadbase.dox => vpadbase.h} |  4 ++
 .../test_compile_headers_list.h               | 21 ++++++
 33 files changed, 273 insertions(+), 53 deletions(-)
 create mode 100644 include/avm.h
 delete mode 100644 include/avm/avm.dox
 create mode 100644 include/camera.h
 create mode 100644 include/coreinit.h
 delete mode 100644 include/coreinit/coreinit.dox
 create mode 100644 include/dmae.h
 delete mode 100644 include/dmae/dmae.dox
 create mode 100644 include/gx2.h
 delete mode 100644 include/gx2/gx2.dox
 create mode 100644 include/gx2r.h
 delete mode 100644 include/gx2r/gx2r.dox
 create mode 100644 include/h264.h
 create mode 100644 include/mic.h
 rename include/{nfc/nfc.dox => nfc.h} (64%)
 create mode 100644 include/nsysccr.h
 delete mode 100644 include/nsysccr/nsysccr.dox
 rename include/{nsyshid/nsyshid.dox => nsyshid.h} (64%)
 create mode 100644 include/nsysnet.h
 delete mode 100644 include/nsysnet/nsysnet.dox
 create mode 100644 include/nsysuhs.h
 delete mode 100644 include/nsysuhs/nsysuhs.dox
 rename include/{ntag/ntag.dox => ntag.h} (73%)
 create mode 100644 include/padscore.h
 delete mode 100644 include/padscore/padscore.dox
 rename include/{proc_ui/procui.dox => proc_ui.h} (68%)
 create mode 100644 include/sndcore2.h
 delete mode 100644 include/sndcore2/sndcore2.dox
 rename include/{sysapp/sysapp.dox => sysapp.h} (53%)
 create mode 100644 include/tve.h
 delete mode 100644 include/tve/tve.dox
 rename include/{vpad/vpad.dox => vpad.h} (72%)
 rename include/{vpadbase/vpadbase.dox => vpadbase.h} (63%)

diff --git a/include/avm.h b/include/avm.h
new file mode 100644
index 000000000..aa5303ecb
--- /dev/null
+++ b/include/avm.h
@@ -0,0 +1,12 @@
+#pragma once
+
+/**
+ * \defgroup avm avm
+ *
+ * Audio/Video Manager
+ */
+
+#include <avm/cec.h>
+#include <avm/config.h>
+#include <avm/drc.h>
+#include <avm/tv.h>
diff --git a/include/avm/avm.dox b/include/avm/avm.dox
deleted file mode 100644
index d20a31078..000000000
--- a/include/avm/avm.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * \defgroup avm avm
- *
- * Audio/Video Manager
- */
diff --git a/include/camera.h b/include/camera.h
new file mode 100644
index 000000000..2f1c3fe24
--- /dev/null
+++ b/include/camera.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <camera/camera.h>
diff --git a/include/coreinit.h b/include/coreinit.h
new file mode 100644
index 000000000..1cb70558f
--- /dev/null
+++ b/include/coreinit.h
@@ -0,0 +1,71 @@
+#pragma once
+
+/**
+ * \defgroup coreinit coreinit
+ *
+ * Contains all core operating system functions such as threads, synchronisation
+ * objects, filesystem, memory, exception handling, etc...
+ */
+
+#include <coreinit/alarm.h>
+#include <coreinit/atomic.h>
+#include <coreinit/atomic64.h>
+#include <coreinit/bsp.h>
+#include <coreinit/cache.h>
+#include <coreinit/codegen.h>
+#include <coreinit/condition.h>
+#include <coreinit/context.h>
+#include <coreinit/copydata.h>
+#include <coreinit/core.h>
+#include <coreinit/coroutine.h>
+#include <coreinit/cosreport.h>
+#include <coreinit/debug.h>
+#include <coreinit/dynload.h>
+#include <coreinit/energysaver.h>
+#include <coreinit/event.h>
+#include <coreinit/exception.h>
+#include <coreinit/exit.h>
+#include <coreinit/fastcondition.h>
+#include <coreinit/fastmutex.h>
+#include <coreinit/fiber.h>
+#include <coreinit/filesystem.h>
+#include <coreinit/filesystem_fsa.h>
+#include <coreinit/foreground.h>
+#include <coreinit/im.h>
+#include <coreinit/internal.h>
+#include <coreinit/interrupts.h>
+#include <coreinit/ios.h>
+#include <coreinit/ipcbufpool.h>
+#include <coreinit/kernel.h>
+#include <coreinit/launch.h>
+#include <coreinit/mcp.h>
+#include <coreinit/memallocator.h>
+#include <coreinit/memblockheap.h>
+#include <coreinit/memdefaultheap.h>
+#include <coreinit/memexpheap.h>
+#include <coreinit/memfrmheap.h>
+#include <coreinit/memheap.h>
+#include <coreinit/memlist.h>
+#include <coreinit/memory.h>
+#include <coreinit/memorymap.h>
+#include <coreinit/memunitheap.h>
+#include <coreinit/messagequeue.h>
+#include <coreinit/mutex.h>
+#include <coreinit/performancemonitor.h>
+#include <coreinit/rendezvous.h>
+#include <coreinit/savedframe.h>
+#include <coreinit/scheduler.h>
+#include <coreinit/screen.h>
+#include <coreinit/semaphore.h>
+#include <coreinit/smd.h>
+#include <coreinit/spinlock.h>
+#include <coreinit/stopwatch.h>
+#include <coreinit/stopwatchatomic.h>
+#include <coreinit/systeminfo.h>
+#include <coreinit/taskqueue.h>
+#include <coreinit/thread.h>
+#include <coreinit/threadqueue.h>
+#include <coreinit/time.h>
+#include <coreinit/title.h>
+#include <coreinit/transition.h>
+#include <coreinit/userconfig.h>
diff --git a/include/coreinit/coreinit.dox b/include/coreinit/coreinit.dox
deleted file mode 100644
index 45599de4f..000000000
--- a/include/coreinit/coreinit.dox
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * \defgroup coreinit coreinit
- *
- * Contains all core operating system functions such as threads, synchronisation
- * objects, filesystem, memory, exception handling, etc...
- */
diff --git a/include/dmae.h b/include/dmae.h
new file mode 100644
index 000000000..c6bb7eb17
--- /dev/null
+++ b/include/dmae.h
@@ -0,0 +1,9 @@
+#pragma once
+
+/**
+ * \defgroup dmae dmae
+ * DMA Engine.
+*/
+
+#include <dmae/mem.h>
+#include <dmae/sync.h>
diff --git a/include/dmae/dmae.dox b/include/dmae/dmae.dox
deleted file mode 100644
index 547426abf..000000000
--- a/include/dmae/dmae.dox
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * \defgroup dmae dmae
- * DMA Engine.
-*/
diff --git a/include/gx2.h b/include/gx2.h
new file mode 100644
index 000000000..a52c3f2b6
--- /dev/null
+++ b/include/gx2.h
@@ -0,0 +1,28 @@
+#pragma once
+
+/**
+ * \defgroup gx2 gx2
+ * Graphics driver.
+ */
+
+#include <gx2/aperture.h>
+#include <gx2/clear.h>
+#include <gx2/context.h>
+#include <gx2/debug.h>
+#include <gx2/display.h>
+#include <gx2/displaylist.h>
+#include <gx2/draw.h>
+#include <gx2/enum.h>
+#include <gx2/event.h>
+#include <gx2/mem.h>
+#include <gx2/registers.h>
+#include <gx2/sampler.h>
+#include <gx2/semaphore.h>
+#include <gx2/shaders.h>
+#include <gx2/state.h>
+#include <gx2/surface.h>
+#include <gx2/swap.h>
+#include <gx2/temp.h>
+#include <gx2/tessellation.h>
+#include <gx2/texture.h>
+#include <gx2/utils.h>
diff --git a/include/gx2/gx2.dox b/include/gx2/gx2.dox
deleted file mode 100644
index c4671097e..000000000
--- a/include/gx2/gx2.dox
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * \defgroup gx2 gx2
- * Graphics driver.
- */
diff --git a/include/gx2r.h b/include/gx2r.h
new file mode 100644
index 000000000..48c2daa3b
--- /dev/null
+++ b/include/gx2r.h
@@ -0,0 +1,14 @@
+#pragma once
+
+/**
+ * \defgroup gx2r gx2r
+ *
+ * Contains utilities to help manage memory invalidation for gx2.
+ */
+
+#include <gx2r/buffer.h>
+#include <gx2r/displaylist.h>
+#include <gx2r/draw.h>
+#include <gx2r/mem.h>
+#include <gx2r/resource.h>
+#include <gx2r/surface.h>
diff --git a/include/gx2r/gx2r.dox b/include/gx2r/gx2r.dox
deleted file mode 100644
index c7c6016d0..000000000
--- a/include/gx2r/gx2r.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * \defgroup gx2r gx2r
- *
- * Contains utilities to help manage memory invalidation for gx2.
- */
diff --git a/include/h264.h b/include/h264.h
new file mode 100644
index 000000000..591cd0a45
--- /dev/null
+++ b/include/h264.h
@@ -0,0 +1,10 @@
+#pragma once
+
+/**
+ * \defgroup h264 h264
+ *
+ * H264 Decoder.
+ */
+
+#include <h264/decode.h>
+#include <h264/stream.h>
diff --git a/include/mic.h b/include/mic.h
new file mode 100644
index 000000000..01d076052
--- /dev/null
+++ b/include/mic.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <mic/mic.h>
diff --git a/include/nfc/nfc.dox b/include/nfc.h
similarity index 64%
rename from include/nfc/nfc.dox
rename to include/nfc.h
index 4bc71c862..d6a23e1d0 100644
--- a/include/nfc/nfc.dox
+++ b/include/nfc.h
@@ -1,4 +1,8 @@
+#pragma once
+
 /**
  * \defgroup nfc nfc
  * Near Field Communication (NFC).
  */
+
+#include <nfc/nfc.h>
diff --git a/include/nsysccr.h b/include/nsysccr.h
new file mode 100644
index 000000000..b2ef17659
--- /dev/null
+++ b/include/nsysccr.h
@@ -0,0 +1,14 @@
+#pragma once
+
+/**
+ * \defgroup nsysccr nsysccr
+ *
+ * 
+ */
+
+#include <nsysccr/ccr.h>
+#include <nsysccr/cdc.h>
+#include <nsysccr/cfg.h>
+#include <nsysccr/hid.h>
+#include <nsysccr/irda.h>
+#include <nsysccr/nfc.h>
diff --git a/include/nsysccr/nsysccr.dox b/include/nsysccr/nsysccr.dox
deleted file mode 100644
index 1195ca5cc..000000000
--- a/include/nsysccr/nsysccr.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * \defgroup nsysccr nsysccr
- *
- * 
- */
diff --git a/include/nsyshid/nsyshid.dox b/include/nsyshid.h
similarity index 64%
rename from include/nsyshid/nsyshid.dox
rename to include/nsyshid.h
index a4907d234..482457477 100644
--- a/include/nsyshid/nsyshid.dox
+++ b/include/nsyshid.h
@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup nsyshid nsyshid
  *
  * Human Input Device functions.
  */
+
+#include <nsyshid/hid.h>
diff --git a/include/nsysnet.h b/include/nsysnet.h
new file mode 100644
index 000000000..1ca574111
--- /dev/null
+++ b/include/nsysnet.h
@@ -0,0 +1,11 @@
+#pragma once
+
+/**
+ * \defgroup nsysnet nsysnet
+ *
+ * Network functions.
+ */
+
+#include <nsysnet/misc.h>
+#include <nsysnet/netconfig.h>
+#include <nsysnet/nssl.h>
diff --git a/include/nsysnet/nsysnet.dox b/include/nsysnet/nsysnet.dox
deleted file mode 100644
index 3d5c49e1f..000000000
--- a/include/nsysnet/nsysnet.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * \defgroup nsysnet nsysnet
- *
- * Network functions.
- */
diff --git a/include/nsysuhs.h b/include/nsysuhs.h
new file mode 100644
index 000000000..a539b2008
--- /dev/null
+++ b/include/nsysuhs.h
@@ -0,0 +1,9 @@
+#pragma once
+
+/**
+ * \defgroup nsysuhs nsysuhs
+ *
+ */
+
+#include <nsysuhs/uhs.h>
+#include <nsysuhs/uhs_usbspec.h>
diff --git a/include/nsysuhs/nsysuhs.dox b/include/nsysuhs/nsysuhs.dox
deleted file mode 100644
index 358d8f23e..000000000
--- a/include/nsysuhs/nsysuhs.dox
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * \defgroup nsysuhs nsysuhs
- *
- */
diff --git a/include/ntag/ntag.dox b/include/ntag.h
similarity index 73%
rename from include/ntag/ntag.dox
rename to include/ntag.h
index 69333d7dd..94abd04af 100644
--- a/include/ntag/ntag.dox
+++ b/include/ntag.h
@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup ntag ntag
  * Nintendo? Tag (NTAG).
  * NFC library for Amiibo and Pokemon Rumble U.
  */
+
+#include <ntag/ntag.h>
diff --git a/include/padscore.h b/include/padscore.h
new file mode 100644
index 000000000..02f8009ea
--- /dev/null
+++ b/include/padscore.h
@@ -0,0 +1,12 @@
+#pragma once
+
+/**
+ * \defgroup padscore padscore
+ *
+ * Input library for Wii controllers.
+ */
+
+#include <padscore/kpad.h>
+#include <padscore/wbc.h>
+#include <padscore/wpad.h>
+#include <padscore/wud.h>
diff --git a/include/padscore/padscore.dox b/include/padscore/padscore.dox
deleted file mode 100644
index 8edf404da..000000000
--- a/include/padscore/padscore.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * \defgroup padscore padscore
- *
- * Input library for Wii controllers.
- */
diff --git a/include/proc_ui/procui.dox b/include/proc_ui.h
similarity index 68%
rename from include/proc_ui/procui.dox
rename to include/proc_ui.h
index efeccd876..f8de40ecd 100644
--- a/include/proc_ui/procui.dox
+++ b/include/proc_ui.h
@@ -1,6 +1,11 @@
+#pragma once
+
 /**
  * \defgroup proc_ui proc_ui
  *
  * Process management library used for managing transitions between foreground
  * and background applications.
  */
+
+#include <proc_ui/memory.h>
+#include <proc_ui/procui.h>
diff --git a/include/sndcore2.h b/include/sndcore2.h
new file mode 100644
index 000000000..9275228a0
--- /dev/null
+++ b/include/sndcore2.h
@@ -0,0 +1,14 @@
+#pragma once
+
+/**
+ * \defgroup sndcore2 sndcore2
+ *
+ * Sound playback and utility library.
+ */
+
+#include <sndcore2/core.h>
+#include <sndcore2/device.h>
+#include <sndcore2/drcvs.h>
+#include <sndcore2/result.h>
+#include <sndcore2/rmt.h>
+#include <sndcore2/voice.h>
diff --git a/include/sndcore2/sndcore2.dox b/include/sndcore2/sndcore2.dox
deleted file mode 100644
index d38ebe6f8..000000000
--- a/include/sndcore2/sndcore2.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * \defgroup sndcore2 sndcore2
- *
- * Sound playback and utility library.
- */
diff --git a/include/sysapp/sysapp.dox b/include/sysapp.h
similarity index 53%
rename from include/sysapp/sysapp.dox
rename to include/sysapp.h
index 9ebae197d..a99ce251b 100644
--- a/include/sysapp/sysapp.dox
+++ b/include/sysapp.h
@@ -1,6 +1,13 @@
+#pragma once
+
 /**
  * \defgroup sysapp sysapp
  *
  * Functions to switch applications, launch overlay apps and perform other
  * multitasking functions.
  */
+
+#include <sysapp/args.h>
+#include <sysapp/launch.h>
+#include <sysapp/switch.h>
+#include <sysapp/title.h>
diff --git a/include/tve.h b/include/tve.h
new file mode 100644
index 000000000..b7cd62401
--- /dev/null
+++ b/include/tve.h
@@ -0,0 +1,10 @@
+#pragma once
+
+/**
+ * \defgroup tve tve
+ *
+ * TV Encoder
+ */
+
+#include <tve/cec.h>
+#include <tve/tve.h>
diff --git a/include/tve/tve.dox b/include/tve/tve.dox
deleted file mode 100644
index 509e9c4fa..000000000
--- a/include/tve/tve.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * \defgroup tve tve
- *
- * TV Encoder
- */
diff --git a/include/vpad/vpad.dox b/include/vpad.h
similarity index 72%
rename from include/vpad/vpad.dox
rename to include/vpad.h
index 665d0d8a6..fb4462b7b 100644
--- a/include/vpad/vpad.dox
+++ b/include/vpad.h
@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup vpad vpad
  *
  * Input library for the Wii U Gamepad (Display Remote Controller).
  */
+
+#include <vpad/input.h>
diff --git a/include/vpadbase/vpadbase.dox b/include/vpadbase.h
similarity index 63%
rename from include/vpadbase/vpadbase.dox
rename to include/vpadbase.h
index fb4e5c5d2..d51484487 100644
--- a/include/vpadbase/vpadbase.dox
+++ b/include/vpadbase.h
@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup vpadbase vpadbase
  *
  * Wii U Gamepad base library.
  */
+
+#include <vpadbase/base.h>
diff --git a/tests/test_compile_headers_common/test_compile_headers_list.h b/tests/test_compile_headers_common/test_compile_headers_list.h
index 25da7d9f3..d395a1969 100644
--- a/tests/test_compile_headers_common/test_compile_headers_list.h
+++ b/tests/test_compile_headers_common/test_compile_headers_list.h
@@ -1,11 +1,14 @@
 #include <wut.h>
 #include <wut_structsize.h>
 #include <wut_types.h>
+#include <avm.h>
 #include <avm/cec.h>
 #include <avm/config.h>
 #include <avm/drc.h>
 #include <avm/tv.h>
+#include <camera.h>
 #include <camera/camera.h>
+#include <coreinit.h>
 #include <coreinit/alarm.h>
 #include <coreinit/atomic.h>
 #include <coreinit/atomic64.h>
@@ -67,8 +70,10 @@
 #include <coreinit/title.h>
 #include <coreinit/transition.h>
 #include <coreinit/userconfig.h>
+#include <dmae.h>
 #include <dmae/mem.h>
 #include <dmae/sync.h>
+#include <gx2.h>
 #include <gx2/aperture.h>
 #include <gx2/clear.h>
 #include <gx2/context.h>
@@ -89,15 +94,19 @@
 #include <gx2/tessellation.h>
 #include <gx2/texture.h>
 #include <gx2/utils.h>
+#include <gx2r.h>
 #include <gx2r/buffer.h>
 #include <gx2r/displaylist.h>
 #include <gx2r/draw.h>
 #include <gx2r/mem.h>
 #include <gx2r/resource.h>
 #include <gx2r/surface.h>
+#include <h264.h>
 #include <h264/decode.h>
 #include <h264/stream.h>
+#include <mic.h>
 #include <mic/mic.h>
+#include <nfc.h>
 #include <nfc/nfc.h>
 #include <nn/ac.h>
 #include <nn/ac/ac_c.h>
@@ -142,37 +151,49 @@
 #include <nn/temp.h>
 #include <nn/temp/temp.h>
 #include <nn/uds.h>
+#include <nsysccr.h>
 #include <nsysccr/ccr.h>
 #include <nsysccr/cdc.h>
 #include <nsysccr/cfg.h>
 #include <nsysccr/hid.h>
 #include <nsysccr/irda.h>
 #include <nsysccr/nfc.h>
+#include <nsyshid.h>
 #include <nsyshid/hid.h>
 #include <nsyskbd/nsyskbd.h>
+#include <nsysnet.h>
 #include <nsysnet/_socket.h>
 #include <nsysnet/misc.h>
 #include <nsysnet/netconfig.h>
 #include <nsysnet/nssl.h>
+#include <nsysuhs.h>
 #include <nsysuhs/uhs.h>
+#include <ntag.h>
 #include <ntag/ntag.h>
+#include <padscore.h>
 #include <padscore/kpad.h>
 #include <padscore/wbc.h>
 #include <padscore/wpad.h>
 #include <padscore/wud.h>
+#include <proc_ui.h>
 #include <proc_ui/memory.h>
 #include <proc_ui/procui.h>
+#include <sndcore2.h>
 #include <sndcore2/core.h>
 #include <sndcore2/device.h>
 #include <sndcore2/drcvs.h>
 #include <sndcore2/result.h>
 #include <sndcore2/voice.h>
 #include <swkbd/rpl_interface.h>
+#include <sysapp.h>
 #include <sysapp/args.h>
 #include <sysapp/launch.h>
 #include <sysapp/switch.h>
 #include <sysapp/title.h>
+#include <tve.h>
 #include <tve/cec.h>
 #include <tve/tve.h>
+#include <vpad.h>
 #include <vpad/input.h>
+#include <vpadbase.h>
 #include <vpadbase/base.h>

From 8f6f16b0e886fe1187f8b8f904e02799727f33bb Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Mon, 3 Aug 2026 18:13:50 +0200
Subject: [PATCH 2/2] Add nsyskbd to group and add top level header

---
 include/nsyskbd.h         | 9 +++++++++
 include/nsyskbd/nsyskbd.h | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 include/nsyskbd.h

diff --git a/include/nsyskbd.h b/include/nsyskbd.h
new file mode 100644
index 000000000..e9972cea1
--- /dev/null
+++ b/include/nsyskbd.h
@@ -0,0 +1,9 @@
+#pragma once
+
+/**
+ * \defgroup nsyskbd nsyskbd
+ *
+ * USB HID keyboard.
+ */
+
+#include <nsyskbd/nsyskbd.h>
diff --git a/include/nsyskbd/nsyskbd.h b/include/nsyskbd/nsyskbd.h
index 970418648..9e7f7c78e 100644
--- a/include/nsyskbd/nsyskbd.h
+++ b/include/nsyskbd/nsyskbd.h
@@ -2,6 +2,13 @@
 
 #include <wut.h>
 
+/**
+ * \defgroup nsyskbd_nsyskbd
+ * \ingroup nsyskbd
+ *
+ * @{
+ */
+
 #ifdef __cplusplus
 extern "C" {
 #endif