3 files changed, 22 insertions, 2 deletions

diff --git a/firmware/include/dir.h b/firmware/include/dir.h
index 8dcbb8e900..12ec724692 100644
--- a/firmware/include/dir.h
+++ b/firmware/include/dir.h
@@ -22,8 +22,6 @@
 #include <stdbool.h>
 #include <file.h>
 
-#ifndef DIRENT_DEFINED
-
 #define ATTR_READ_ONLY   0x01
 #define ATTR_HIDDEN      0x02
 #define ATTR_SYSTEM      0x04
@@ -32,6 +30,8 @@
 #define ATTR_ARCHIVE     0x20
 #define ATTR_VOLUME      0x40 /* this is a volume, not a real directory */
 
+#ifndef DIRENT_DEFINED
+
 struct dirent {
     unsigned char d_name[MAX_PATH];
     int attribute;
diff --git a/firmware/include/stdio.h b/firmware/include/stdio.h
index b98f01c729..968bd59aab 100644
--- a/firmware/include/stdio.h
+++ b/firmware/include/stdio.h
@@ -36,4 +36,13 @@
 int snprintf (char *buf, size_t size, const char *fmt, ...);
 int vsnprintf (char *buf, int size, const char *fmt, __VALIST ap);
 
+#ifdef SIMULATOR
+typedef void FILE;
+int vfprintf(FILE *stream, const char *format, __VALIST ap);
+#ifdef WIN32
+#define FILENAME_MAX 260 /* ugly hard-coded value of a limit that is set
+                            in file.h */
+#endif
+#endif
+
 #endif /* _STDIO_H_ */
diff --git a/firmware/include/time.h b/firmware/include/time.h
index 5213468662..267face71b 100644
--- a/firmware/include/time.h
+++ b/firmware/include/time.h
@@ -20,5 +20,16 @@ struct tm
   int   tm_isdst;
 };
 
+#if defined(SIMULATOR) && !defined(_TIME_T_DEFINED)
+/* for non-win32 simulators */
+typedef long time_t;
+
+/* this define below is used by the mingw headers to prevent duplicate
+   typedefs */
+#define _TIME_T_DEFINED
+time_t time(time_t *t);
+
+#endif
+
 #endif /* _TIME_H_ */