diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d23e4cdc32..9115c379f6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,61 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-27 16:37 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * debian/dirs
+    * Changed en -> en-EN.
+
+  * external/sqlite3/Makefile
+  * external/sqlite3/_sqlite3.c
+    + Disabled warnings and forced C mode for sqlite3.
+    - Deleted no longer needed stub.
+
+  * include/hbsetup.h
+    + Added HB_PATH_MAX.
+
+  * source/compiler/genc.c
+    * Minor modification to recent addition to make code
+      more grep friendly.
+
+  * config/win/msvc.cf
+  * config/win/msvcce.cf
+    + Added HB_BUILD_MODE=c and HB_BUILD_MODE=cpp support
+      to force specific build mode.
+      ATTENTION: Don't use this for normal Harbour code,
+                 it's only meant for external libs hosted
+                 inside Harbour source tree.
+
+  * config/win/pocc.cf
+  * config/win/poccce.cf
+    + Added -w3 (default is -w2).
+
+  * config/darwin/gcc.cf
+  * config/hpux/gcc.cf
+  * config/dos/owatcom.cf
+  * config/dos/djgpp.cf
+  * config/win/mingwce.cf
+  * config/win/poccce.cf
+  * config/win/icc.cf
+  * config/win/cygwin.cf
+  * config/win/msvc.cf
+  * config/win/owatcom.cf
+  * config/win/msvcce.cf
+  * config/win/mingw.cf
+  * config/win/pocc.cf
+  * config/win/bcc.cf
+  * config/linux/owatcom.cf
+  * config/linux/gcc.cf
+  * config/linux/icc.cf
+  * config/os2/owatcom.cf
+  * config/os2/gcc.cf
+  * config/sunos/gcc.cf
+  * config/bsd/gcc.cf
+    + Added support for HB_BUILD_WARN=no to reset warning levels
+      to compiler defaults.
+      ATTENTION: Don't use this for normal Harbour code,
+                 it's only meant for external libs hosted
+                 inside Harbour source tree.
+
 2009-03-27 15:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * external/sqlite3/Makefile
     * Don't build it for linux and darwin.
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index 46c85dad8c..e16daad0c0 100644
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -13,7 +13,11 @@ CC = $(HB_CCACHE) gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Wall -W
+CFLAGS =
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index c9f0ad2aa1..89708026fc 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -29,7 +29,11 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CPPFLAGS += -no-cpp-precomp
 
 # -fno-common enables building .dylib files
-CFLAGS = -fno-common -Wall -W
+CFLAGS = -fno-common
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index 6a7a581010..a2037d61f6 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -13,7 +13,11 @@ CC = gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Wall -W
+CFLAGS =
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf
index 7c30f8fc60..4298e9306e 100644
--- a/harbour/config/dos/owatcom.cf
+++ b/harbour/config/dos/owatcom.cf
@@ -25,8 +25,12 @@ CC = wpp386
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -w3 -5s -5r -oehtz -s -zq -zt0 -bt=DOS
-CPPFLAGS = -w3 -zq -bt=DOS
+#CPPFLAGS = -j -5s -5r -oehtz -s -zq -zt0 -bt=DOS
+CPPFLAGS = -zq -bt=DOS
+
+ifneq ($(HB_BUILD_WARN),no)
+CPPFLAGS += -w3
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index f84c3614e2..d16df8fb59 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -14,9 +14,13 @@ CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 
-CFLAGS = -Wall -W
+CFLAGS =
 LDFLAGS =
 
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
+
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
 endif
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index a59c1f8fc3..56d0c9b8a7 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -24,9 +24,16 @@ ifeq ($(HB_COMPILER),icc)
 CFLAGS = -D_GNU_SOURCE
 #CFLAGS += -std=c99
 #CFLAGS += -xHOST
+else
+CFLAGS =
+endif
+
+ifneq ($(HB_BUILD_WARN),no)
+ifeq ($(HB_COMPILER),icc)
 #CFLAGS += -w2 -Wall
 else
-CFLAGS = -Wall -W
+CFLAGS += -Wall -W
+endif
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf
index 315eea5c5b..1bfa51a636 100644
--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -21,7 +21,10 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 #CFLAGS = -xHOST
 CFLAGS = -D_GNU_SOURCE
 #CFLAGS += -std=c99
+
+ifneq ($(HB_BUILD_WARN),no)
 #CFLAGS += -w2 -Wall
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf
index 53f92ac819..4fd9fa85d5 100644
--- a/harbour/config/linux/owatcom.cf
+++ b/harbour/config/linux/owatcom.cf
@@ -15,8 +15,12 @@ CC = wpp386
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -w3 -5s -5r -fp5 -oehtz -s -zq -zt0 -bt=linux
-CPPFLAGS = -w3 -zq -bt=linux
+#CPPFLAGS = -j -5s -5r -oehtz -zq -bt=linux
+CPPFLAGS = -zq -bt=linux
+
+ifneq ($(HB_BUILD_WARN),no)
+CPPFLAGS += -w3
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index 7f91fbc1dc..66a7eddb76 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -13,7 +13,11 @@ CC = gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Wall -W
+CFLAGS =
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/os2/owatcom.cf b/harbour/config/os2/owatcom.cf
index af76fdfffc..f32a0ad68d 100644
--- a/harbour/config/os2/owatcom.cf
+++ b/harbour/config/os2/owatcom.cf
@@ -15,8 +15,12 @@ CC = wpp386
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2
-CPPFLAGS = -w3 -zq -bt=OS2
+#CPPFLAGS = -j -5s -5r -oxehtz -zq -mf -bt=OS2
+CPPFLAGS = -zq -bt=OS2
+
+ifneq ($(HB_BUILD_WARN),no)
+CPPFLAGS += -w3
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index dc9afef336..195a6bd1a0 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -14,7 +14,11 @@ CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 
-CFLAGS = -Wall -W
+CFLAGS =
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf
index a7ce8dc09f..94d50ca1ef 100644
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -16,7 +16,11 @@ CC = bcc32.exe
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -q -Q -w -w-sig- -tWM
+CFLAGS = -q -tWM
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -w -w-sig- -Q
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -d -4 -O2 -OS -Ov -Oi -Oc
diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf
index d7634096cb..d89b478353 100644
--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -13,7 +13,11 @@ CC = gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Wall -W
+CFLAGS =
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf
index 292f0bbfa0..55df116e0e 100644
--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -16,7 +16,11 @@ CC = icl.exe
 CC_IN = -c
 CC_OUT = -Fo
 CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE)
-CFLAGS = -W3 -Gs
+CFLAGS = -Gs
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -W3
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # maximum optimizations
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index 32d8e3121c..cb0ee127af 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -13,7 +13,11 @@ CC = $(HB_CCPREFIX)gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Wall -W
+CFLAGS =
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -O3
diff --git a/harbour/config/win/mingwce.cf b/harbour/config/win/mingwce.cf
index d008036b36..10e446f5f8 100644
--- a/harbour/config/win/mingwce.cf
+++ b/harbour/config/win/mingwce.cf
@@ -16,7 +16,11 @@ CC = $(HB_CCPREFIX)gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Wall -W
+CFLAGS =
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -Wall -W
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # Use -O2 instead of -O3 here.
diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf
index c5208b1236..5c3b1f7663 100644
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -12,7 +12,22 @@ LIB_EXT = .lib
 CC = cl.exe
 CC_IN = -c
 CC_OUT = -Fo
-CPPFLAGS = -nologo -W4 -wd4127 -Gs -I. -I$(HB_INC_COMPILE) -TP
+CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE) -Gs
+
+ifeq ($(HB_BUILD_MODE),c)
+CPPFLAGS += -TC
+endif
+ifeq ($(HB_BUILD_MODE),cpp)
+CPPFLAGS += -TP
+endif
+# Build in C++ mode by default
+ifeq ($(HB_BUILD_MODE),)
+CPPFLAGS += -TP
+endif
+
+ifneq ($(HB_BUILD_WARN),no)
+CPPFLAGS += -W4 -wd4127
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 ifeq ($(HB_VISUALC_VER_PRE80),)
diff --git a/harbour/config/win/msvcce.cf b/harbour/config/win/msvcce.cf
index 48399568fb..660051fb3b 100644
--- a/harbour/config/win/msvcce.cf
+++ b/harbour/config/win/msvcce.cf
@@ -22,7 +22,18 @@ endif
 CC_IN = -c
 CC_OUT = -Fo
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -nologo -W4 -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN
+CFLAGS = -nologo -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" -D_UWIN
+
+ifeq ($(HB_BUILD_MODE),c)
+CFLAGS += -TC
+endif
+ifeq ($(HB_BUILD_MODE),cpp)
+CFLAGS += -TP
+endif
+
+ifneq ($(HB_BUILD_WARN),no)
+CFLAGS += -W4
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 ifeq ($(HB_VISUALC_VER_PRE80),)
diff --git a/harbour/config/win/owatcom.cf b/harbour/config/win/owatcom.cf
index 23bcd0c272..47e4a62984 100644
--- a/harbour/config/win/owatcom.cf
+++ b/harbour/config/win/owatcom.cf
@@ -15,8 +15,12 @@ CC = wpp386
 CC_IN =
 CC_OUT = -fo=
 
-#CPPFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT
-CPPFLAGS = -w3 -zq -bt=NT -bm
+#CPPFLAGS = -j -5r -oxehtz -zq -mf -bt=NT
+CPPFLAGS = -zq -bt=NT -bm
+
+ifneq ($(HB_BUILD_WARN),no)
+CPPFLAGS += -w3
+endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf
index a76d0f83fd..b19ebe6474 100644
--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -18,6 +18,10 @@ CPPFLAGS = -I.
 
 CPPFLAGS += -Ze -Go -MT
 
+ifneq ($(HB_BUILD_WARN),no)
+CPPFLAGS += -W2
+endif
+
 ifneq ($(HB_BUILD_OPTIM),no)
 CPPFLAGS += -Ot
 # -Ox: can cause GPF in 4.50/5.00, so it's disabled.
diff --git a/harbour/config/win/poccce.cf b/harbour/config/win/poccce.cf
index 907a7f88e7..57eac0e699 100644
--- a/harbour/config/win/poccce.cf
+++ b/harbour/config/win/poccce.cf
@@ -22,6 +22,10 @@ CPPFLAGS = -I.
 
 CPPFLAGS += -Ze -Go
 
+ifneq ($(HB_BUILD_WARN),no)
+CPPFLAGS += -W2
+endif
+
 ifneq ($(HB_BUILD_OPTIM),no)
 CPPFLAGS += -Ot
 # -Ox: can cause GPF in 4.50/5.00, so it's disabled.
diff --git a/harbour/debian/dirs b/harbour/debian/dirs
index f40328cc39..bc8aff1e86 100644
--- a/harbour/debian/dirs
+++ b/harbour/debian/dirs
@@ -3,4 +3,4 @@ usr/bin
 usr/lib/harbour
 usr/include/harbour
 usr/share/doc/harbour
-usr/share/doc/harbour/en
+usr/share/doc/harbour/en-EN
diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile
index becfe5a423..da7a749a36 100644
--- a/harbour/external/sqlite3/Makefile
+++ b/harbour/external/sqlite3/Makefile
@@ -2,31 +2,25 @@
 # $Id$
 #
 
+HB_BUILD_WARN = no
+HB_BUILD_MODE = c
+
 ROOT = ../../
 
 LIBNAME=sqlite3
 
-ifeq ($(HB_WITHOUT_SQLIT3),)
-ifeq ($(HB_ARCHITECTURE),dos)
-HB_WITHOUT_SQLIT3=yes
+ifeq ($(HB_WITH_SQLITE3),)
+ifeq ($(HB_ARCHITECTURE),win)
+HB_WITH_SQLITE3=yes
 endif
-ifeq ($(HB_ARCHITECTURE),bsd)
-HB_WITHOUT_SQLIT3=yes
-endif
-ifeq ($(HB_ARCHITECTURE),hpux)
-HB_WITHOUT_SQLIT3=yes
-endif
-ifeq ($(HB_ARCHITECTURE),linux)
-HB_WITHOUT_SQLIT3=yes
-endif
-ifeq ($(HB_ARCHITECTURE),darwin)
-HB_WITHOUT_SQLIT3=yes
+ifeq ($(HB_ARCHITECTURE),os2)
+HB_WITH_SQLITE3=yes
 endif
 endif
 
-ifneq ($(HB_WITHOUT_SQLIT3),yes)
+ifeq ($(HB_WITH_SQLITE3),yes)
 C_SOURCES =\
-	_sqlite3.c \
+	sqlite3.c \
 
 include $(TOP)$(ROOT)config/header.cf
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
diff --git a/harbour/external/sqlite3/_sqlite3.c b/harbour/external/sqlite3/_sqlite3.c
deleted file mode 100644
index e339ed0f4e..0000000000
--- a/harbour/external/sqlite3/_sqlite3.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * Harbour Project source code:
- * SQLite3 stub
- *
- * Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
- * www - http://www.harbour-project.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
- *
- * As a special exception, the Harbour Project gives permission for
- * additional uses of the text contained in its release of Harbour.
- *
- * The exception is that, if you link the Harbour libraries with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the Harbour library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the Harbour
- * Project under the name Harbour.  If you copy code from other
- * Harbour Project or Free Software Foundation releases into a copy of
- * Harbour, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for Harbour, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- *
- */
-
-#if !( defined( __WATCOMC__ ) || (defined(__POCC__) && __POCC__ <= 450) )
-   #if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
-      #pragma GCC diagnostic ignored "-Wunused"
-      #pragma GCC diagnostic ignored "-Wsign-compare"
-      #pragma GCC diagnostic ignored "-Wuninitialized"
-   #elif defined( __BORLANDC__ )
-      #pragma warn -aus
-      #pragma warn -use
-      #pragma warn -par
-      #pragma warn -prc
-      #pragma warn -eff
-      #pragma warn -amp
-   #elif defined( _MSC_VER )
-      #pragma warning( disable: 4018 4244 )
-   #endif
-   #include "sqlite3.c"
-   #if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
-      #pragma GCC diagnostic warning "-Wunused"
-      #pragma GCC diagnostic warning "-Wsign-compare"
-      #pragma GCC diagnostic warning "-Wuninitialized"
-   #elif defined( __BORLANDC__ )
-      #pragma warn +aus
-   /* #pragma warn +use */ /* This affects the whole file, so don't turn it back on. */
-      #pragma warn +par
-      #pragma warn +prc
-      #pragma warn +eff
-      #pragma warn +amp
-   #elif defined( _MSC_VER )
-      #pragma warning( default: 4018 4244 )
-   #endif
-#endif
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index c76fdce44b..6075e8497c 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -229,6 +229,8 @@
    #define _POSIX_PATH_MAX    255
 #endif
 
+#define HB_PATH_MAX     264 /* with trailing 0 byte */
+
 /* NOTE:
    Compiler                                _MSC_VER value
    --------                                --------------
diff --git a/harbour/source/compiler/genc.c b/harbour/source/compiler/genc.c
index 687d0da540..a8fa6029ab 100644
--- a/harbour/source/compiler/genc.c
+++ b/harbour/source/compiler/genc.c
@@ -247,9 +247,9 @@ void hb_compGenCCode( HB_COMP_DECL, PHB_FNAME pFileName )       /* generates the
          if( ( pFuncall->cScope & ( HB_FS_DEFERRED | HB_FS_LOCAL ) ) == 0 &&
              hb_compFunctionFind( HB_COMP_PARAM, pFuncall->szName ) == NULL &&
              hb_compInlineFind( HB_COMP_PARAM, pFuncall->szName ) == NULL )
-            fprintf( yyc, "HB_FUNC_%s( %s );\n",
-                     ( pFuncall->cScope & HB_FS_STATIC ) ? "STATIC" : "EXTERN",
-                     pFuncall->szName );
+            fprintf( yyc, ( pFuncall->cScope & HB_FS_STATIC ) ?
+                             "HB_FUNC_STATIC( %s );\n" :
+                             "HB_FUNC_EXTERN( %s );\n", pFuncall->szName );
          pFuncall = pFuncall->pNext;
       }