diff --git a/include/gx2.h b/include/gx2.h
new file mode 100644
index 000000000..ba4b4f19a
--- /dev/null
+++ b/include/gx2.h
@@ -0,0 +1,28 @@
+#pragma once
+
+/**
+ * \ingroup gx2
+ * This is a convenience header to include all gx2 headers at once.
+ */
+
+#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/gx2r.h b/include/gx2r.h
new file mode 100644
index 000000000..aed4a185f
--- /dev/null
+++ b/include/gx2r.h
@@ -0,0 +1,13 @@
+#pragma once
+
+/**
+ * \ingroup gx2r
+ * This is a convenience header to include all gx2r headers at once.
+ */
+
+#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/tests/test_compile_headers_common/test_compile_headers_list.h b/tests/test_compile_headers_common/test_compile_headers_list.h
index 25da7d9f3..78ba559ea 100644
--- a/tests/test_compile_headers_common/test_compile_headers_list.h
+++ b/tests/test_compile_headers_common/test_compile_headers_list.h
@@ -69,6 +69,7 @@
 #include <coreinit/userconfig.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,6 +90,7 @@
 #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>