diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 806337925c..1c5a23e0e4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,19 @@
+20000331-01:02 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * include/hbapilng.h
+   * include/hbdate.h
+   * include/hberrors.h
+   * include/hbinit.h
+   * include/hbtrace.h
+     ! Added #include "hbsetup.h" before using HB_EXTERN_C.
+
+   * doc/howtomak.txt
+     ! Typo
+
+   * source/pp/pplib.c
+     ! One global compiler variable declaraion removed, because the same
+       variable was also declared in macro.lib.
+
 20000330-23:04 GMT+1 Maurilio Longo <maurilio.longo@libero.it>
 
 	* include/hbvmpub.h
@@ -57,7 +73,7 @@
        switch: -DHB_FUNC_CALLCONV=pascal
        Note that you can use any other preferred calling conventions supported
        by your compiler.
-     * HARBOUR_START_PROCEDURE moved to hbdefs.h since this is should not
+     * HARBOUR_START_PROCEDURE moved to hbdefs.h since this should not
        be a user configurable parameter, it's "MAIN" or nothing.
 
    * source/vm/cmdarg.c
diff --git a/harbour/doc/howtomak.txt b/harbour/doc/howtomak.txt
index c21477a6d6..567f19e35f 100644
--- a/harbour/doc/howtomak.txt
+++ b/harbour/doc/howtomak.txt
@@ -8,11 +8,13 @@ HOW TO BUILD HARBOUR FROM THE SOURCE
 You'll need these:
   - Flex
   - Bison (set BISON_SIMPLE envvar to point to bison.simple)
-  - A supported (check MAKE_TPL.BAT for a list) C compiler (with all the envvars set (path, lib, include, etc...))
+  - A supported (check MAKE_GNU.BAT for a list) C compiler
+    (with all the envvars set (PATH, LIB, INCLUDE, etc...))
   - GNU-make if you want to use it with some other C compiler than GCC
+    (as GCC already comes with GNU-make)
   - TASM for BCC
   - TASM32 for BCC32
-  - MASM for MSVC
+  - MASM for MSC/MSVC
   - Harbour source
   - Around 10-15MB of free disk space for each separate platform/compiler
     combinations.
diff --git a/harbour/include/hbapilng.h b/harbour/include/hbapilng.h
index 84df8d565d..7cdb6e689e 100644
--- a/harbour/include/hbapilng.h
+++ b/harbour/include/hbapilng.h
@@ -36,6 +36,8 @@
 #ifndef HB_APILNG_H_
 #define HB_APILNG_H_
 
+#include "hbsetup.h"
+
 #if defined(HB_EXTERN_C)
 extern "C" {
 #endif
diff --git a/harbour/include/hbdate.h b/harbour/include/hbdate.h
index e62df4fc14..a9c58dfaeb 100644
--- a/harbour/include/hbdate.h
+++ b/harbour/include/hbdate.h
@@ -36,6 +36,8 @@
 #ifndef HB_DATE_H_
 #define HB_DATE_H_
 
+#include "hbsetup.h"
+
 #if defined(HB_EXTERN_C)
 extern "C" {
 #endif
diff --git a/harbour/include/hberrors.h b/harbour/include/hberrors.h
index 99ca4b3de7..bbf3398d38 100644
--- a/harbour/include/hberrors.h
+++ b/harbour/include/hberrors.h
@@ -36,6 +36,8 @@
 #ifndef HB_ERRORS_H_
 #define HB_ERRORS_H_
 
+#include "hbsetup.h"
+
 #if defined(HB_EXTERN_C)
 extern "C" {
 #endif
diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h
index b866eaa852..6db66aecaa 100644
--- a/harbour/include/hbinit.h
+++ b/harbour/include/hbinit.h
@@ -36,6 +36,8 @@
 #ifndef HB_INIT_H_
 #define HB_INIT_H_
 
+#include "hbsetup.h"
+
 #if defined(HB_EXTERN_C)
 extern "C" {
 #endif
diff --git a/harbour/include/hbtrace.h b/harbour/include/hbtrace.h
index f0f8132d28..4e9dc91204 100644
--- a/harbour/include/hbtrace.h
+++ b/harbour/include/hbtrace.h
@@ -36,6 +36,8 @@
 #ifndef HB_TRACE_H_
 #define HB_TRACE_H_
 
+#include "hbsetup.h"
+
 #if defined(HB_EXTERN_C)
 extern "C" {
 #endif
diff --git a/harbour/source/pp/pplib.c b/harbour/source/pp/pplib.c
index 60d6f64b2f..fad6dcc26e 100644
--- a/harbour/source/pp/pplib.c
+++ b/harbour/source/pp/pplib.c
@@ -59,7 +59,9 @@ int         hb_comp_iLine;       /* currently parsed file line number */
 BOOL hb_comp_bPPO = FALSE;                      /* flag indicating, is ppo output needed */
 BOOL hb_comp_bStartProc = TRUE;                 /* holds if we need to create the starting procedure */
 BOOL hb_comp_bLineNumbers = TRUE;               /* holds if we need pcodes with line numbers */
+#if 0
 BOOL hb_comp_bShortCuts = TRUE;                 /* .and. & .or. expressions shortcuts */
+#endif
 int  hb_comp_iWarnings = 0;                     /* enable parse warnings */
 BOOL hb_comp_bAutoMemvarAssume = FALSE;         /* holds if undeclared variables are automatically assumed MEMVAR (-a)*/
 BOOL hb_comp_bForceMemvars = FALSE;             /* holds if memvars are assumed when accesing undeclared variable (-v)*/