diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 03b4dcdc01..3de2e1ac12 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-28 18:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/hbzlib/ChangeLog
+  * harbour/source/hbzlib/zutil.c
+  * harbour/source/hbzlib/gzio.c
+  * harbour/source/hbzlib/zutil.h
+  * harbour/source/hbzlib/zconf.h
+    * use _WINCE macro instead of _WIN32_WCE to detect WinCE builds
+      defining _WIN32_WCE interacts with header files and should be
+      left for user to specify exact WinCE version
+
 2008-05-28 16:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/harbour-ce-spec
   * harbour/harbour-w32-spec
diff --git a/harbour/source/hbzlib/ChangeLog b/harbour/source/hbzlib/ChangeLog
index cf2763bd61..4dd593750e 100644
--- a/harbour/source/hbzlib/ChangeLog
+++ b/harbour/source/hbzlib/ChangeLog
@@ -18,6 +18,15 @@
  *
  */
 
+2008-05-28 18:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/hbzlib/zutil.c
+  * harbour/source/hbzlib/gzio.c
+  * harbour/source/hbzlib/zutil.h
+  * harbour/source/hbzlib/zconf.h
+    * use _WINCE macro instead of _WIN32_WCE to detect WinCE builds
+      defining _WIN32_WCE interacts with header files and should be
+      left for user to specify exact WinCE version
+
 2008-02-18 04:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * adler32.c
   * compress.c
diff --git a/harbour/source/hbzlib/gzio.c b/harbour/source/hbzlib/gzio.c
index f518c9acac..374234c3bf 100644
--- a/harbour/source/hbzlib/gzio.c
+++ b/harbour/source/hbzlib/gzio.c
@@ -971,7 +971,7 @@ int ZEXPORT gzclose (
     return destroy((gz_stream*)file);
 }
 
-#if defined(STDC) && !defined(_WIN32_WCE)
+#if defined(STDC) && !defined(_WINCE)
 #  define zstrerror(errnum) strerror(errnum)
 #else
 #  define zstrerror(errnum) ""
diff --git a/harbour/source/hbzlib/zconf.h b/harbour/source/hbzlib/zconf.h
index fc03fc3f58..f530052ae5 100644
--- a/harbour/source/hbzlib/zconf.h
+++ b/harbour/source/hbzlib/zconf.h
@@ -69,17 +69,17 @@
 #  define WINDOWS
 #endif
 #if defined(__CEGCC__) || defined(__MINGW32CE__) || \
-    defined(UNDER_CE) || defined(_WINCE)
-#  ifndef _WIN32_WCE
-#    define _WIN32_WCE
+    defined(UNDER_CE) || defined(_WIN32_WCE)
+#  ifndef _WINCE
+#    define _WINCE
 #  endif
 #endif
-#if defined(_WIN32_WCE)
+#if defined(_WINCE)
 #  ifndef NO_ERRNO_H
 #    define NO_ERRNO_H
 #  endif
 #endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#if defined(_WIN32) || defined(_WINCE) || defined(__WIN32__)
 #  ifndef WIN32
 #    define WIN32
 #  endif
diff --git a/harbour/source/hbzlib/zutil.c b/harbour/source/hbzlib/zutil.c
index 34ad2ea692..b1aa60ec21 100644
--- a/harbour/source/hbzlib/zutil.c
+++ b/harbour/source/hbzlib/zutil.c
@@ -136,7 +136,7 @@ const char * ZEXPORT zError(
     return ERR_MSG(err);
 }
 
-#if defined(_WIN32_WCE)
+#if defined(_WINCE)
     /* The Microsoft C Run-Time Library for Windows CE doesn't have
      * errno.  We define it as a global variable to simplify porting.
      * Its value is always 0 and should not be used.
diff --git a/harbour/source/hbzlib/zutil.h b/harbour/source/hbzlib/zutil.h
index b7d5eff81b..e50b1692ca 100644
--- a/harbour/source/hbzlib/zutil.h
+++ b/harbour/source/hbzlib/zutil.h
@@ -17,14 +17,14 @@
 #include "zlib.h"
 
 #ifdef STDC
-#  ifndef _WIN32_WCE
+#  ifndef _WINCE
 #    include <stddef.h>
 #  endif
 #  include <string.h>
 #  include <stdlib.h>
 #endif
 #ifdef NO_ERRNO_H
-#   ifdef _WIN32_WCE
+#   ifdef _WINCE
       /* The Microsoft C Run-Time Library for Windows CE doesn't have
        * errno.  We define it as a global variable to simplify porting.
        * Its value is always 0 and should not be used.  We rename it to
@@ -34,7 +34,7 @@
 #   endif
     extern int errno;
 #else
-#  ifndef _WIN32_WCE
+#  ifndef _WINCE
 #    include <errno.h>
 #  endif
 #endif
@@ -152,7 +152,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #if (defined(_MSC_VER) && (_MSC_VER > 600))
-#  if defined(_WIN32_WCE)
+#  if defined(_WINCE)
 #    define fdopen(fd,mode) NULL /* No fdopen() */
 #    ifndef _PTRDIFF_T_DEFINED
        typedef int ptrdiff_t;