3 files changed, 2 insertions, 6 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 941ee5f9b4..4d370aa9cd 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -22,9 +22,7 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-#ifndef __PCTOOL__
 #include "autoconf.h"
-#endif
 
 /* symbolic names for multiple choice configurations: */
 
@@ -620,7 +618,7 @@ Lyre prototype 1*/
 /* Enable the directory cache and tagcache in RAM if we have
  * plenty of RAM. Both features can be enabled independently. */
 #if ((defined(MEMORYSIZE) && (MEMORYSIZE >= 8)) || MEM >= 8) && \
- !defined(BOOTLOADER)
+ !defined(BOOTLOADER) && !defined(__PCTOOL__)
 #define HAVE_DIRCACHE
 #ifdef HAVE_TAGCACHE
 #define HAVE_TC_RAMCACHE
diff --git a/firmware/include/errno.h b/firmware/include/errno.h
index 1843b56f1d..846cd0e339 100644
--- a/firmware/include/errno.h
+++ b/firmware/include/errno.h
@@ -2,7 +2,7 @@
    non-reentrant.  Instead, its address is returned by the function
    __errno.  */
    
-#if defined(SIMULATOR) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if (defined(SIMULATOR)||defined(__PCTOOL__)) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 
 #include "/usr/include/errno.h"  /* use the host system implementation */
 
diff --git a/firmware/include/rbunicode.h b/firmware/include/rbunicode.h
index a4a1c8b323..a97ebb469b 100644
--- a/firmware/include/rbunicode.h
+++ b/firmware/include/rbunicode.h
@@ -28,9 +28,7 @@
 #ifndef _RBUNICODE_H_
 #define _RBUNICODE_H_
  
-#ifndef __PCTOOL__
 #include "config.h"
-#endif
 
 #define MASK   0xC0 /* 11000000 */
 #define COMP   0x80 /* 10x      */