diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c6d12b7be4..2064305d4a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,18 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-01-29 14:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * source/rtl/gtwvt/gtwvt.c
+    ! Fixed to #undef _WIN32_WINNT before setting it.
+    ; TOFIX: hbwhat has this problem in almost all of its source
+             files.
+
+  * contrib/examples/uhttpd/modules/bldhrb.bat
+  * contrib/examples/uhttpd/modules/showcounter.prg
+  * contrib/examples/uhttpd/hbmk_b32.bat
+  * contrib/examples/uhttpd/hbmk_vc.bat
+    * Minor.
+
 2009-01-29 02:16 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/common/hbprintf.c
     * minor modification for easier future updating
diff --git a/harbour/contrib/examples/uhttpd/hbmk_b32.bat b/harbour/contrib/examples/uhttpd/hbmk_b32.bat
index b11ed812a3..dd790abe9e 100644
--- a/harbour/contrib/examples/uhttpd/hbmk_b32.bat
+++ b/harbour/contrib/examples/uhttpd/hbmk_b32.bat
@@ -1,9 +1,10 @@
 @echo off
-cls
 rem
 rem $Id$
 rem
 
+cls
+
 SET UHTTP_INET_SUPPORT=no
 SET UHTTP_INET_DEF=
 SET UHTTP_INET_SOCKET=
diff --git a/harbour/contrib/examples/uhttpd/hbmk_vc.bat b/harbour/contrib/examples/uhttpd/hbmk_vc.bat
index 4bd001c4a5..45bee2fc01 100644
--- a/harbour/contrib/examples/uhttpd/hbmk_vc.bat
+++ b/harbour/contrib/examples/uhttpd/hbmk_vc.bat
@@ -1,9 +1,10 @@
 @echo off
-cls
 rem
 rem $Id$
 rem
 
+cls
+
 SET UHTTP_INET_SUPPORT=no
 SET UHTTP_INET_DEF=
 SET UHTTP_INET_SOCKET=
diff --git a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat b/harbour/contrib/examples/uhttpd/modules/bldhrb.bat
index d87f85c0b7..a83b992af6 100644
--- a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat
+++ b/harbour/contrib/examples/uhttpd/modules/bldhrb.bat
@@ -1,4 +1,8 @@
 @echo off
+rem
+rem $Id$
+rem
+
 rem Saving current HB_MT state
 set OLDENVMT=%HB_MT%
 set OLDENVGT=%HB_GT_LIB%
@@ -25,7 +29,7 @@ GOTO COMPILEOK
 echo.
 echo.Error on compiling ...
 echo.
-echo.Running notepad, please close to end this batch file ...
+echo.Running Notepad, please close to end this batch file ...
 echo.
 notepad bldtest.log
 echo.
@@ -60,4 +64,3 @@ set BLDDEFAULT=
 set OLD_HB_ARCHITECTURE=
 set OLD_HB_COMPILER=
 set OLD_HB_USER_LIBS=
-
diff --git a/harbour/contrib/examples/uhttpd/modules/showcounter.prg b/harbour/contrib/examples/uhttpd/modules/showcounter.prg
index a168890bd2..48dcbb7f0d 100644
--- a/harbour/contrib/examples/uhttpd/modules/showcounter.prg
+++ b/harbour/contrib/examples/uhttpd/modules/showcounter.prg
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  */
@@ -216,4 +215,3 @@ STATIC FUNCTION CreateCounter( cValue, cBaseImage )
 
 //RETURN cFile
 RETURN oI:ToStringGif()
-
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index 1d334f874b..d922d157f2 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -84,6 +84,7 @@
 
 #define HB_OS_WIN_32_USED
 
+#undef _WIN32_WINNT
 #define _WIN32_WINNT   0x0500 /* Set to Windows 2000 for WS_EX_LAYERED */
 
 #include "gtwvt.h"