4 files changed, 4 insertions, 3 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 1ab15f82f2..b60e2d6768 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -598,7 +598,7 @@ static const struct plugin_api rockbox_api = {
 #endif
 
     /* misc */
-#if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if !defined(SIMULATOR)
     &errno,
 #endif
     srand,
diff --git a/apps/plugin.h b/apps/plugin.h
index 584c146b94..5aaa6380b7 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -737,7 +737,7 @@ struct plugin_api {
 #endif
 
     /* misc */
-#if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if !defined(SIMULATOR)
     int* __errno;
 #endif
     void (*srand)(unsigned int seed);
diff --git a/apps/plugins/frotz/frotzplugin.h b/apps/plugins/frotz/frotzplugin.h
index 1a52bdb913..f975fc8c22 100644
--- a/apps/plugins/frotz/frotzplugin.h
+++ b/apps/plugins/frotz/frotzplugin.h
@@ -27,6 +27,7 @@
  * pretend stdio.h is implemented. references to FILE * still have to be
  * changed to int, and references to NULL into -1, but there are less of those
  */
+#undef ferror
 #define fread(ptr, size, nmemb, stream) rb->read(stream, ptr, size*nmemb)
 #define fwrite(ptr, size, nmemb, stream) rb->write(stream, ptr, size*nmemb)
 #define fclose(stream) rb->close(stream)
diff --git a/apps/plugins/lua/rockaux.c b/apps/plugins/lua/rockaux.c
index ea95f232ab..1f832d4cc7 100644
--- a/apps/plugins/lua/rockaux.c
+++ b/apps/plugins/lua/rockaux.c
@@ -24,7 +24,7 @@
 #define _ROCKCONF_H_ /* Protect against unwanted include */
 #include "lua.h"
 
-#if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if !defined(SIMULATOR)
 int errno = 0;
 #endif