diff --git a/include/coreinit/debug.h b/include/coreinit/debug.h
index 70b0c9361..e545811ec 100644
--- a/include/coreinit/debug.h
+++ b/include/coreinit/debug.h
@@ -16,6 +16,7 @@ typedef struct OSFatalError OSFatalError;
 typedef void (*DisassemblyPrintFn)(const char *fmt, ...);
 
 typedef uint32_t (*DisassemblyFindSymbolFn)(uint32_t addr, char *symbolNameBuf, uint32_t symbolNameBufSize);
+typedef void (*OSPanicCallback)(void *userData);
 
 typedef enum DisassemblePPCFlags
 {
@@ -41,8 +42,11 @@ typedef enum OSFatalErrorMessageType
 struct OSFatalError
 {
    OSFatalErrorMessageType messageType;
+   //! Error code, displayed on screen as unsigned, and printed in log as signed
    uint32_t errorCode;
+   //! See \link OSGetUPID \endlink
    uint32_t processId;
+   //! Internal error code printed in log
    uint32_t internalErrorCode;
    uint32_t line;
    char functionName[64];
@@ -83,22 +87,49 @@ void
 OSReportWarn(const char *fmt, ...)
    WUT_FORMAT_PRINTF(1, 2);
 
-
+/**
+ * Halts the system and logs the cause, traps if debugger is present
+ * \param file name of the file where the panic occurred
+ * \param line position in the file where the panic occurred
+ * \param fmt printf-style format string for logging
+ *
+ * \sa OSSetPanicCallback
+ */
 void
 OSPanic(const char *file,
         uint32_t line,
         const char *fmt,
         ...)
-   WUT_FORMAT_PRINTF(3, 4);
+   WUT_FORMAT_PRINTF(3, 4) WUT_NORETURN;
 
+/**
+ * Set a callback to be triggered when an \link OSPanic \endlink occurs
+ * \param userData data to pass to the callback
+ */
+void
+OSSetPanicCallback(OSPanicCallback callback,
+                   void *userData);
 
+/**
+ * Displays a message on TV and gamepad screens via OSScreen, and halts the system via \link OSPanic \endlink
+ * \param msg message to be displayed and logged
+ * \sa coreinit_screen
+ */
 void
-OSFatal(const char *msg);
+OSFatal(const char *msg) WUT_NORETURN;
 
+/**
+ * Switch to the fatal error process ("An error has occured." screen)
+ * \param error structure describing the error
+ * \param functionName function name printed in log
+ * \param line line number printed in log
+ *
+ * The fatal error process displays the error code, firmware version, Wii U model, serial number and status code
+ */
 void
 OSSendFatalError(OSFatalError *error,
                  const char *functionName,
-                 uint32_t line);
+                 uint32_t line) WUT_NORETURN;
 
 uint32_t
 OSGetSymbolName(uint32_t addr,
diff --git a/include/wut.h b/include/wut.h
index c280cc113..f721a9bfb 100644
--- a/include/wut.h
+++ b/include/wut.h
@@ -10,6 +10,7 @@
 
 #define WUT_DEPRECATED(reason)       __attribute__((__deprecated__(reason)))
 #define WUT_FORMAT_PRINTF(fmt, args) __attribute__((__format__(__printf__, fmt, args)))
+#define WUT_NORETURN __attribute__((noreturn))
 
 #else // not __GNUC__ and not __clang__