diff --git a/include/linux/sched.h b/include/linux/sched.h
index bb23790fd2d39f7cb17cc72018dc774650875a62..321abdc384da937a8f310dbb72b20dc06c154b55 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -42,7 +42,7 @@
 #include <linux/kabi.h>
 
 #ifdef CONFIG_XCU_SCHEDULER
-#include <linux/xsched_types.h>
+#include <uapi/linux/xsched/types.h>
 #endif
 
 /* task_struct member predeclarations (sorted alphabetically): */
diff --git a/include/linux/vstream.h b/include/linux/vstream.h
index 7d99e416624fc74106893c205492282fdfad4c4e..227bbf77085e65aaee857a6f49089144d732723c 100644
--- a/include/linux/vstream.h
+++ b/include/linux/vstream.h
@@ -2,7 +2,7 @@
 #ifndef _LINUX_VSTREAM_H
 #define _LINUX_VSTREAM_H
 
-#include <uapi/linux/xcu_vstream.h>
+#include <uapi/linux/xsched/xcu_vstream.h>
 #include <linux/ktime.h>
 
 #define MAX_VSTREAM_SIZE 2048
diff --git a/include/linux/xcu_group.h b/include/linux/xcu_group.h
index c129dca32c518e7f35f6b10a74f01e681e547574..d7d6972e7f5cd80cb2f2b5a3186f353d77989cc4 100644
--- a/include/linux/xcu_group.h
+++ b/include/linux/xcu_group.h
@@ -3,7 +3,7 @@
 #define __XSCHED_XCU_GROUP_H__
 
 #include <linux/idr.h>
-#include <uapi/linux/xcu_vstream.h>
+#include <uapi/linux/xsched/xcu_vstream.h>
 
 #ifndef CONFIG_XSCHED_NR_CUS
 #define CONFIG_XSCHED_NR_CUS 128
diff --git a/include/linux/xsched.h b/include/linux/xsched.h
index 46fe6ae2bc770c412b51cf30ffb3ccc46d55bb3b..86b248a18f97a94d1dcf87b2bf68065d6f82da0b 100644
--- a/include/linux/xsched.h
+++ b/include/linux/xsched.h
@@ -4,10 +4,10 @@
 
 #include <linux/cgroup.h>
 #include <linux/kref.h>
+#include <linux/math64.h>
 #include <linux/vstream.h>
 #include <linux/xcu_group.h>
-#include <linux/xsched_types.h>
-#include <linux/math64.h>
+#include <uapi/linux/xsched/types.h>
 
 #define XSCHED_LOG_PREFIX "XSched"
 #define XSCHED_INFO(fmt, ...)                                                  \
diff --git a/include/linux/xsched_types.h b/include/uapi/linux/xsched/types.h
similarity index 59%
rename from include/linux/xsched_types.h
rename to include/uapi/linux/xsched/types.h
index f52fe32d519840bb0fb0dc8f74aa863ce6a4953d..e5f11a2973e8974b15b1c42a8c6d95f5fd33b2be 100644
--- a/include/linux/xsched_types.h
+++ b/include/uapi/linux/xsched/types.h
@@ -1,13 +1,15 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _XSCHED_TYPE_H
-#define _XSCHED_TYPE_H
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_XSCHED_TYPES_H
+#define _UAPI_LINUX_XSCHED_TYPES_H
+
+#include <linux/types.h>
 
 struct xsched_attr {
 	/* Scheduling class type, from enum xcu_sched_class */
-	unsigned int xsched_class;
+	__u32 xsched_class;
 
 	/* RT scheduling priority, from enum xse_prio */
-	unsigned int xsched_priority;
+	__u32 xsched_priority;
 };
 
 enum xcu_sched_class {
@@ -24,4 +26,4 @@ enum xse_prio {
 	XSE_PRIO_DFLT = XSE_PRIO_LOW
 };
 
-#endif /* ! _XSCHED_TYPE_H */
+#endif /* _UAPI_LINUX_XSCHED_TYPES_H */
diff --git a/include/uapi/linux/xcu_vstream.h b/include/uapi/linux/xsched/xcu_vstream.h
similarity index 92%
rename from include/uapi/linux/xcu_vstream.h
rename to include/uapi/linux/xsched/xcu_vstream.h
index b60c0e0e15f575ceb4c224ef2e53719ab4e921e7..4b3abf386a1ccee4185c471641745d026e58fd5e 100644
--- a/include/uapi/linux/xcu_vstream.h
+++ b/include/uapi/linux/xsched/xcu_vstream.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI_XCU_VSTREAM_H
-#define _UAPI_XCU_VSTREAM_H
+#ifndef _UAPI_LINUX_XSCHED_XCU_VSTREAM_H
+#define _UAPI_LINUX_XSCHED_XCU_VSTREAM_H
 
 #include <linux/types.h>
 
@@ -74,4 +74,4 @@ typedef struct vstream_args {
 	KABI_RESERVE_BYTES(2, 8);
 } vstream_args_t;
 
-#endif /* _UAPI_LINUX_SCHED_H */
+#endif /* _UAPI_LINUX_XSCHED_XCU_VSTREAM_H */
diff --git a/init/init_task.c b/init/init_task.c
index 61a6345708c80d73f9670d9a5607353be1662dcf..9fd44251b8b7c7401613200f8bf2c6cbf59fbe31 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -15,7 +15,7 @@
 
 #include <linux/uaccess.h>
 #ifdef CONFIG_XCU_SCHEDULER
-#include <linux/xsched_types.h>
+#include <uapi/linux/xsched/types.h>
 #endif
 
 static struct signal_struct init_signals = {