3 files changed, 3 insertions, 42 deletions

diff --git a/include/user/kernel/iofilemgr/async.h b/include/user/kernel/iofilemgr/async.h
index d60f7ca..77fac3d 100644
--- a/include/user/kernel/iofilemgr/async.h
+++ b/include/user/kernel/iofilemgr/async.h
@@ -1,6 +1,7 @@
 #ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_ASYNC_H_
 #define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_ASYNC_H_
 
+#include <psp2common/kernel/iofilemgr/async.h>
 #include <psp2/kernel/threadmgr.h>
 
 #ifdef __cplusplus
diff --git a/include/user/kernel/iofilemgr/dirent.h b/include/user/kernel/iofilemgr/dirent.h
index 1d06ffd..c518a08 100644
--- a/include/user/kernel/iofilemgr/dirent.h
+++ b/include/user/kernel/iofilemgr/dirent.h
@@ -1,21 +1,13 @@
 #ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_DIRENT_H_
 #define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_DIRENT_H_
 
+#include <psp2common/kernel/iofilemgr/dirent.h>
 #include <psp2/kernel/iofilemgr/async.h>
-#include <psp2/kernel/iofilemgr/stat.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/** Describes a single directory entry */
-typedef struct SceIoDirent {
-	SceIoStat d_stat;      //!< File status
-	char      d_name[256]; //!< File name (not file path)
-	void      *d_private;  //!< Reserved (set to 0)
-	int       dummy;       //!< Padding
-} SceIoDirent;
-
 /**
   * Open a directory
   *
diff --git a/include/user/kernel/iofilemgr/stat.h b/include/user/kernel/iofilemgr/stat.h
index e2fa913..b0b57f6 100644
--- a/include/user/kernel/iofilemgr/stat.h
+++ b/include/user/kernel/iofilemgr/stat.h
@@ -1,45 +1,13 @@
 #ifndef _DOLCESDK_PSP2_KERNEL_IOFILEMGR_STAT_H_
 #define _DOLCESDK_PSP2_KERNEL_IOFILEMGR_STAT_H_
 
-#include <psp2/kernel/types.h>
+#include <psp2common/kernel/iofilemgr/stat.h>
 #include <psp2/kernel/iofilemgr/async.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Filetypes and Protection bits */
-#define SCE_STM_FMT         (0xf << 12)
-#define SCE_STM_FREG        (0x2 << 12)    /* regular file */
-#define SCE_STM_FDIR        (0x1 << 12)    /* directory */
-#define SCE_STM_ISREG(m)    (((m) & SCE_STM_FMT) == SCE_STM_FREG)
-#define SCE_STM_ISDIR(m)    (((m) & SCE_STM_FMT) == SCE_STM_FDIR)
-
-/* for SceMode */
-#define SCE_STM_RWU         00600
-#define SCE_STM_RU          00400
-
-/* for chstat cbit */
-#define SCE_CST_MODE        0x0001
-#define SCE_CST_ATTR        0x0000    /* not supported */
-#define SCE_CST_SIZE        0x0004
-#define SCE_CST_CT          0x0008
-#define SCE_CST_AT          0x0010
-#define SCE_CST_MT          0x0020
-
-/**
- * See sceIoChstat(), sceIoGetstat(), sceIoChstatByFd(), sceIoGetstatByFd()
- */
-typedef struct SceIoStat {
-	SceIoMode    st_mode;        //!< File access mode
-	unsigned int st_attr;        //!< Device-specific attribute
-	SceOff       st_size;        //!< File size
-	SceDateTime  st_ctime;       //!< File creation time
-	SceDateTime  st_atime;       //!< File last accessed time
-	SceDateTime  st_mtime;       //!< File last modified time
-	unsigned int st_private[6];  //!< Reserved
-} SceIoStat;
-
 /**
   * Change the status of a file.
   *