diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a0e45bec76..195d8c7793 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,21 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-14 16:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbgt/strasint.c
+    % Using HB_ISDIGIT()
+    ! Fixed to not include hbtrace.h directly.
+
+  * make_gnu.bat
+    % make clean and install phases merged in HB_BUILD_DLL mode.
+
+  * bin/postinst.bat
+    ! Fix to recent change.
+
+  * include/hbdefs.h
+    ! Moved #include hbtrace.h after HB_EXPORT is defined.
+      (hack)
+
 2009-03-14 15:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/hbfimage/fi_winfu.c
   * contrib/hbfimage/fi_wrp.c
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index e4774ba203..52ebc07fc3 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -27,7 +27,7 @@ goto inst_%HB_ARCHITECTURE%
 rem Windows post install part
 if not "%OS%" == "Windows_NT" goto end
 
-if "%HB_BUILD_DLL%" == "yes" call %~dp0hb-mkdyn.bat
+if "%HB_DYNLIB%" == "yes" call %~dp0hb-mkdyn.bat
 
 set _HB_BIN_INSTALL=%HB_BIN_INSTALL%
 if not "%HB_BIN_COMPILE%" == "" set HB_BIN_INSTALL=%HB_BIN_COMPILE%
diff --git a/harbour/contrib/hbgt/strasint.c b/harbour/contrib/hbgt/strasint.c
index 80094235bf..26dd9d3e56 100644
--- a/harbour/contrib/hbgt/strasint.c
+++ b/harbour/contrib/hbgt/strasint.c
@@ -9,9 +9,7 @@
 * By......: David A Pearson                                                  *
 *****************************************************************************/
 
-#include "hbtrace.h"
-
-#define ISDIGIT(c)      ((c) >= '0' && (c) <= '9')
+#include "hbapi.h"
 
 int _GT_Internal_StringAsInt(char *String, int Start, int End)
 {
@@ -20,10 +18,10 @@ int _GT_Internal_StringAsInt(char *String, int Start, int End)
    int  Value   = 0;
 
    HB_TRACE(HB_TR_DEBUG, ("_GT_Internal_StringAsInt(%s, %d, %d)", String, Start, End));
-   
+
    for (Digit = End; Digit >= Start; Digit--)
      {
-       if (ISDIGIT(String[Digit]))
+       if (HB_ISDIGIT(String[Digit]))
          {
            Value   += (String[Digit] - 0x30) * Decimal;
            Decimal *= 0xA;
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 1bc40ede26..5f32f27498 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -60,7 +60,6 @@
 #include <limits.h>
 
 #include "hbsetup.h"
-#include "hbtrace.h"
 #include "hbver.h"
 
 /* Compatibility. Do not use HB_OS_WIN_32_USED anymore. */
@@ -1382,4 +1381,6 @@ typedef BYTE HB_COLOR;
 #define HB_ISFIRSTIDCHAR( c )   ( HB_ISALPHA( c ) || ( c ) == '_' )
 #define HB_ISNEXTIDCHAR( c )    ( HB_ISFIRSTIDCHAR(c) || HB_ISDIGIT( c ) )
 
+#include "hbtrace.h"
+
 #endif /* HB_DEFS_H_ */
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index a4ec70df42..86fb6d1c2e 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -122,15 +122,13 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL%
    set HB_DYNLIB=yes
    set HB_CONTRIBLIBS=no
    set HB_CONTRIB_ADDONS=
-   %_HB_MAKE% clean   %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
-   %_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
+   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
    set HB_DYNLIB=no
    set HB_CONTRIBLIBS=%_HB_CONTRIBLIBS%
    set HB_CONTRIB_ADDONS=%_HB_CONTRIB_ADDONS%
    set _HB_CONTRIBLIBS=
    set _HB_CONTRIB_ADDONS=
-   %_HB_MAKE% clean   %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
-   %_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
+   %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
    goto MAKE_DONE
 
 :SKIP_WINDLL