4 files changed, 15 insertions, 4 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index a1a68af6ba..1ab15f82f2 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -434,7 +434,9 @@ static const struct plugin_api rockbox_api = {
     memset,
     memcpy,
     memmove,
+#ifndef SIMULATOR
     _ctype_,
+#endif
     atoi,
     strchr,
     strcat,
diff --git a/apps/plugin.h b/apps/plugin.h
index 26d17a2637..584c146b94 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -548,7 +548,9 @@ struct plugin_api {
     void* (*memset)(void *dst, int c, size_t length);
     void* (*memcpy)(void *out, const void *in, size_t n);
     void* (*memmove)(void *out, const void *in, size_t n);
+#ifndef SIMULATOR
     const unsigned char *_rbctype_;
+#endif
     int (*atoi)(const char *str);
     char *(*strchr)(const char *s, int c);
     char *(*strcat)(char *s1, const char *s2);
diff --git a/firmware/SOURCES b/firmware/SOURCES
index b155a9f03d..3327fbbce6 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -21,12 +21,13 @@ timer.c
 panic.c
 debug.c
 
-/* Common */
-#if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__)
+/* Standard library */
+#if !defined(SIMULATOR)
+#if defined(__MINGW32__) || defined(__CYGWIN__)
 libc/errno.c
 /* alsa on linux requires a more advanced sprintf, i.e. not ours */
 libc/sprintf.c
-#endif /* !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) */
+#endif /* defined(__MINGW32__) || defined(__CYGWIN__) */
 libc/atoi.c
 libc/ctype.c
 libc/memcmp.c
@@ -42,6 +43,9 @@ libc/strrchr.c
 libc/strtok.c
 libc/strstr.c
 libc/mktime.c
+#endif /* !defined(SIMULATOR)*/
+
+/* Common */
 common/config.c
 common/crc32.c
 #ifdef MI4_FORMAT
diff --git a/firmware/firmware.make b/firmware/firmware.make
index 115bfacad0..52b5a19cc6 100644
--- a/firmware/firmware.make
+++ b/firmware/firmware.make
@@ -7,7 +7,10 @@
 # $Id$
 #
 
-INCLUDES += -I$(FIRMDIR)/libc/include -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include
+INCLUDES += -I$(FIRMDIR) -I$(FIRMDIR)/export -I$(FIRMDIR)/drivers -I$(FIRMDIR)/include
+ifndef SIMVER
+INCLUDES += -I$(FIRMDIR)/libc/include
+endif
 
 FIRMLIB_SRC += $(call preprocess, $(FIRMDIR)/SOURCES)
 FIRMLIB_OBJ := $(call c2obj, $(FIRMLIB_SRC))