7 files changed, 6 insertions, 24 deletions
diff --git a/include/user/gxm.h b/include/user/gxm.h
deleted file mode 100644
index 60f3e11..0000000
--- a/include/user/gxm.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _DOLCESDK_PSP2_GXM_INTERNAL_H_
-#define _DOLCESDK_PSP2_GXM_INTERNAL_H_
-
-/** @file
-
-  	Helper include file that includes all public headers.
-*/
-
-#include <psp2/gxm.h>
-
-#include <psp2/gxm/context_internal.h>
-#include <psp2/gxm/init_internal.h>
-#include <psp2/gxm/memory_internal.h>
-#include <psp2/gxm/render_target_internal.h>
-#include <psp2/gxm/shader_patcher_internal.h>
-#include <psp2/gxm/sync_object_internal.h>
-
-#endif /* _DOLCESDK_PSP2_GXM_INTERNAL_H_ */
diff --git a/include/user/gxm/context.h b/include/user/gxm/context.h
index 3897677..e644610 100644
--- a/include/user/gxm/context.h
+++ b/include/user/gxm/context.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/context.h>
+#include_next <gxm/context.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/init.h b/include/user/gxm/init.h
index 8f27a79..76841d4 100644
--- a/include/user/gxm/init.h
+++ b/include/user/gxm/init.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/init.h>
+#include_next <gxm/init.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/memory.h b/include/user/gxm/memory.h
index cc4125a..889c57c 100644
--- a/include/user/gxm/memory.h
+++ b/include/user/gxm/memory.h
@@ -6,7 +6,7 @@
   	Memory mapping API for the GPU.
 */
 
-#include <psp2/gxm/memory.h>
+#include_next <gxm/memory.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/render_target.h b/include/user/gxm/render_target.h
index 44a38a3..e129bf0 100644
--- a/include/user/gxm/render_target.h
+++ b/include/user/gxm/render_target.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/render_target.h>
+#include_next <gxm/render_target.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/shader_patcher.h b/include/user/gxm/shader_patcher.h
index 7ae47dd..a5adfd9 100644
--- a/include/user/gxm/shader_patcher.h
+++ b/include/user/gxm/shader_patcher.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/shader_patcher.h>
+#include_next <gxm/shader_patcher.h>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/include/user/gxm/sync_object.h b/include/user/gxm/sync_object.h
index 811560c..a78d992 100644
--- a/include/user/gxm/sync_object.h
+++ b/include/user/gxm/sync_object.h
@@ -4,7 +4,7 @@
 /** @file
 */
 
-#include <psp2/gxm/sync_object.h>
+#include_next <gxm/sync_object.h>
 
 #ifdef	__cplusplus
 extern "C" {