diff --git a/include/psp2kern/avcodec/jpegenc.h b/include/psp2kern/jpegenc.h
similarity index 100%
rename from include/psp2kern/avcodec/jpegenc.h
rename to include/psp2kern/jpegenc.h
diff --git a/include/psp2kern/sblacmgr.h b/include/psp2kern/kernel/acmgr.h
similarity index 97%
rename from include/psp2kern/sblacmgr.h
rename to include/psp2kern/kernel/acmgr.h
index 9d9613d1b2..36e27d53d5 100644
--- a/include/psp2kern/sblacmgr.h
+++ b/include/psp2kern/kernel/acmgr.h
@@ -1,6 +1,6 @@
 /**
  * \kernelgroup{SceSblACMgr}
- * \usage{psp2kern/sblacmgr.h,SceSblACMgrForDriver_stub}
+ * \usage{psp2kern/kernel/acmgr.h,SceSblACMgrForDriver_stub}
  */
 
 #ifndef _PSP2KERN_SBLACMGR_H_
diff --git a/include/psp2kern/sblaimgr.h b/include/psp2kern/kernel/aimgr.h
similarity index 97%
rename from include/psp2kern/sblaimgr.h
rename to include/psp2kern/kernel/aimgr.h
index f1a281e4e7..94f916de9d 100644
--- a/include/psp2kern/sblaimgr.h
+++ b/include/psp2kern/kernel/aimgr.h
@@ -1,6 +1,6 @@
 /**
  * \kernelgroup{SceSblAIMgr}
- * \usage{psp2kern/sblaimgr.h,SceSblAIMgrForDriver_stub}
+ * \usage{psp2kern/kernel/aimgr.h,SceSblAIMgrForDriver_stub}
  */
 
 #ifndef _PSP2KERN_SBLAIMGR_H_
diff --git a/include/psp2kern/sblauthmgr.h b/include/psp2kern/kernel/authmgr.h
similarity index 85%
rename from include/psp2kern/sblauthmgr.h
rename to include/psp2kern/kernel/authmgr.h
index bacb117797..2b607547d7 100644
--- a/include/psp2kern/sblauthmgr.h
+++ b/include/psp2kern/kernel/authmgr.h
@@ -1,6 +1,6 @@
 /**
  * \kernelgroup{SceSblAuthMgr}
- * \usage{psp2kern/sblauthmgr.h,SceSblAuthMgrForKernel_stub}
+ * \usage{psp2kern/kernel/authmgr.h,SceSblAuthMgrForKernel_stub}
  */
 
 
diff --git a/include/psp2kern/syscon.h b/include/psp2kern/kernel/syscon.h
similarity index 99%
rename from include/psp2kern/syscon.h
rename to include/psp2kern/kernel/syscon.h
index 272f0c4ef6..511661680b 100644
--- a/include/psp2kern/syscon.h
+++ b/include/psp2kern/kernel/syscon.h
@@ -1,6 +1,6 @@
 /**
  * \kernelgroup{SceSyscon}
- * \usage{psp2kern/syscon.h,SceSysconForDriver_stub}
+ * \usage{psp2kern/kernel/syscon.h,SceSysconForDriver_stub}
  */
 
 #ifndef _PSP2KERN_SYSCON_H_
diff --git a/include/psp2kern/uart.h b/include/psp2kern/kernel/uart.h
similarity index 86%
rename from include/psp2kern/uart.h
rename to include/psp2kern/kernel/uart.h
index ec083fe1e1..6bcdec4c74 100644
--- a/include/psp2kern/uart.h
+++ b/include/psp2kern/kernel/uart.h
@@ -1,6 +1,6 @@
 /**
  * \kernelgroup{SceUart}
- * \usage{psp2kern/uart.h,SceUartForKernel_stub}
+ * \usage{psp2kern/kernel/uart.h,SceUartForKernel_stub}
  */
 
 #ifndef _PSP2KERN_UART_H_
diff --git a/include/psp2kern/net/net.h b/include/psp2kern/netps.h
similarity index 95%
rename from include/psp2kern/net/net.h
rename to include/psp2kern/netps.h
index f9fad936da..a0fad1ce7b 100644
--- a/include/psp2kern/net/net.h
+++ b/include/psp2kern/netps.h
@@ -1,6 +1,6 @@
 /**
  * \kernelgroup{SceNet}
- * \usage{psp2kern/net/net.h,SceNetPsForDriver_stub}
+ * \usage{psp2kern/netps.h,SceNetPsForDriver_stub}
  */
 
 
diff --git a/include/vitasdkkern.h b/include/vitasdkkern.h
index 5d2957d486..356c968974 100644
--- a/include/vitasdkkern.h
+++ b/include/vitasdkkern.h
@@ -9,29 +9,27 @@
 #include <psp2kern/fios2.h>
 #include <psp2kern/gpu_es4.h>
 #include <psp2kern/idstorage.h>
+#include <psp2kern/jpegenc.h>
+#include <psp2kern/netps.h>
 #include <psp2kern/npdrm.h>
 #include <psp2kern/pfsmgr.h>
 #include <psp2kern/post_ss_mgr.h>
 #include <psp2kern/power.h>
 #include <psp2kern/registrymgr.h>
-#include <psp2kern/sblacmgr.h>
-#include <psp2kern/sblaimgr.h>
-#include <psp2kern/sblauthmgr.h>
-#include <psp2kern/syscon.h>
 #include <psp2kern/touch.h>
-#include <psp2kern/uart.h>
 #include <psp2kern/udcd.h>
 #include <psp2kern/usbd.h>
 #include <psp2kern/usbserial.h>
 #include <psp2kern/usbserv.h>
 
-#include <psp2kern/avcodec/jpegenc.h>
-
 #include <psp2kern/io/devctl.h>
 #include <psp2kern/io/dirent.h>
 #include <psp2kern/io/fcntl.h>
 #include <psp2kern/io/stat.h>
 
+#include <psp2kern/kernel/acmgr.h>
+#include <psp2kern/kernel/aimgr.h>
+#include <psp2kern/kernel/authmgr.h>
 #include <psp2kern/kernel/cpu.h>
 #include <psp2kern/kernel/debug.h>
 #include <psp2kern/kernel/debugled.h>
@@ -50,10 +48,12 @@
 #include <psp2kern/kernel/ssmgr.h>
 #include <psp2kern/kernel/suspend.h>
 #include <psp2kern/kernel/sysclib.h>
+#include <psp2kern/kernel/syscon.h>
 #include <psp2kern/kernel/sysmem.h>
 #include <psp2kern/kernel/sysroot.h>
 #include <psp2kern/kernel/systimer.h>
 #include <psp2kern/kernel/threadmgr.h>
+#include <psp2kern/kernel/uart.h>
 #include <psp2kern/kernel/utils.h>
 #include <psp2kern/kernel/kbl/kbl.h>
 #include <psp2kern/kernel/sysmem/data_transfers.h>
@@ -69,6 +69,4 @@
 #include <psp2kern/lowio/iftu.h>
 #include <psp2kern/lowio/pervasive.h>
 
-#include <psp2kern/net/net.h>
-
 #endif /* _VITASDKKERN_H_ */