4 files changed, 11 insertions, 27 deletions

diff --git a/uisimulator/win32/file-win32.c b/uisimulator/win32/dir-win32.c
index 57431e92a2..3a30d57ae1 100644
--- a/uisimulator/win32/file-win32.c
+++ b/uisimulator/win32/dir-win32.c
@@ -19,8 +19,8 @@
 
 #include <io.h>
 #include <malloc.h>
-#include "file-win32.h"
-#include "file.h"
+#include "dir-win32.h"
+#include "dir.h"
 
 // Directory operations
 //
@@ -36,7 +36,7 @@ DIR *opendir (
     if ((p->handle = _findfirst (dirname, &fd)) == -1)
     {
         free (p);
-        return NULL;
+        return 0;
     }
     return p;
 }
@@ -53,14 +53,13 @@ int closedir (
 
 // read dir
 // read next entry in directory
-dirent *readdir (
-                 DIR *dir
-                 )
+struct dirent *readdir (
+                        DIR *dir
+                        )
 {
     struct _finddata_t fd;
     if (_findnext (dir->handle, &fd) == -1)
-        return NULL;
+        return 0;
     memcpy (dir->fd.d_name, fd.name, 256);
-    dir->fd.d_reclen = sizeof (dirent);
     return &dir->fd;
 }
\ No newline at end of file
diff --git a/uisimulator/win32/file-win32.h b/uisimulator/win32/dir-win32.h
index a89ee4319d..e51dfba747 100644
--- a/uisimulator/win32/file-win32.h
+++ b/uisimulator/win32/dir-win32.h
@@ -21,22 +21,7 @@
 #define __FILE_WIN32_H__
 
 #include <io.h>
+#include "dir.h"
 
-struct direnttag
-{
-    long            d_ino; /* inode number */
-    long            d_off; /* offset to the next dirent */
-    unsigned short  d_reclen;/* length of this record */
-    unsigned char   d_type; /* type of file */
-    char            d_name[256]; /* filename */
-};
-typedef struct direnttag dirent;
-
-struct DIRtag
-{
-    dirent          fd;
-    intptr_t        handle;
-};
-typedef struct DIRtag DIR;
 
 #endif // #ifndef __FILE_WIN32_H__
\ No newline at end of file
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo
index fa961efe48..b14fa23728 100644
--- a/uisimulator/win32/uisw32.suo
+++ b/uisimulator/win32/uisw32.suo
diff --git a/uisimulator/win32/uisw32.vcproj b/uisimulator/win32/uisw32.vcproj
index 00d87f610b..4419bef715 100644
--- a/uisimulator/win32/uisw32.vcproj
+++ b/uisimulator/win32/uisw32.vcproj
@@ -116,6 +116,9 @@
                                 RelativePath="..\..\firmware\chartables.c">
                         </File>
                         <File
+                                RelativePath="dir-win32.c">
+                        </File>
+                        <File
                                 RelativePath="kernel.c">
                         </File>
                         <File
@@ -135,9 +138,6 @@
                         Name="Header Files"
                         Filter="h;hpp;hxx;hm;inl;inc">
                         <File
-                                RelativePath="file-win32.h">
-                        </File>
-                        <File
                                 RelativePath="lcd-win32.h">
                         </File>
                         <File