diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6c9ce8d4fa..1727722a00 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,16 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-03-16 19:54 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * include/hbapifs.h
+  * src/rtl/filebuf.c
+    * move HB_FILE_TYPE_MAX definition to header file
+    % include C stat() header only in *nix builds
+
+  * src/pp/ppcore.c
+    ! force stringify when illegal characters are included inside
+      square brackets []
+
 2014-03-13 18:40 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * contrib/rddads/adsx.c
     * implemented intermediate index creation in case ADS can process index
diff --git a/include/hbapifs.h b/include/hbapifs.h
index e62524b97b..354c8961ad 100644
--- a/include/hbapifs.h
+++ b/include/hbapifs.h
@@ -304,6 +304,9 @@ extern HB_EXPORT HB_WCHAR *   hb_fsNameConvU16( const char * pszFileName );
  */
 
 #if defined( _HB_FILE_IMPLEMENTATION_ ) || defined( _HB_FILE_INTERNAL_ )
+
+#  define HB_FILE_TYPE_MAX    64
+
    struct _HB_FILE;
    typedef struct _HB_FILE * PHB_FILE;
 
diff --git a/src/pp/ppcore.c b/src/pp/ppcore.c
index 20670a00e9..3bba61b53a 100644
--- a/src/pp/ppcore.c
+++ b/src/pp/ppcore.c
@@ -769,6 +769,8 @@ static HB_BOOL hb_pp_canQuote( HB_BOOL fQuote, char * pBuffer, HB_SIZE nLen,
             cQuote = '\'';
          else if( pBuffer[ n ] == '\'' || pBuffer[ n ] == '"' )
             cQuote = pBuffer[ n ];
+         else if( HB_PP_ISILLEGAL( pBuffer[ n ] ) )
+            fQuote = HB_TRUE;
       }
       ++n;
    }
diff --git a/src/rtl/filebuf.c b/src/rtl/filebuf.c
index 2383291241..101505980f 100644
--- a/src/rtl/filebuf.c
+++ b/src/rtl/filebuf.c
@@ -56,12 +56,10 @@
 #include "hbthread.h"
 #include "hbvm.h"
 
-#if ! defined( HB_OS_WIN_CE )
+#if defined( HB_OS_UNIX )
 #  include <sys/types.h>
 #  include <sys/stat.h>
-#  if defined( HB_OS_UNIX )
-#     include <unistd.h>
-#  endif
+#  include <unistd.h>
 #endif
 
 
@@ -898,8 +896,6 @@ static PHB_FILE hb_fileposNew( PHB_FILE pFile )
 
 #endif /* HB_OS_UNIX */
 
-#define HB_FILE_TYPE_MAX  64
-
 static const HB_FILE_FUNCS * s_pFileTypes[ HB_FILE_TYPE_MAX ];
 static int s_iFileTypes = 0;