diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 473582cc9b..e9fcedbbff 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-08-25 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * make_vcce.mak
+     ! Do not explicitly #define HB_WINCE. This should be 
+       autodetected in hbsetup.h.
+
+   * include/hbsetup.h
+     % Minor cleanup.
+
 2008-08-25 22:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * include/hbsetup.h
    * source/common/hbver.c
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 375c36fcdc..62e60d3379 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -288,9 +288,10 @@
    #endif
 #endif
 
-#if !defined(HB_WINCE) && \
-    ( defined(_WINCE) || defined(__CEGCC__) || defined(__MINGW32CE__) )
-   #define HB_WINCE
+#ifndef HB_WINCE
+   #if defined(_WINCE) || defined(__CEGCC__) || defined(__MINGW32CE__)
+      #define HB_WINCE
+   #endif
 #endif
 
 #ifndef HB_OS_LINUX
diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak
index 1f88173b96..3cfececc74 100644
--- a/harbour/make_vcce.mak
+++ b/harbour/make_vcce.mak
@@ -135,7 +135,7 @@ CFLAGS         = -I$(INCLUDE_DIR) -I$(CFLAGS_VER) -T$(HB_BUILD_MODE) -W3 -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" \
-                 -DHB_WINCE $(C_USR) $(CFLAGS) -D_UWIN -I$(OBJ_DIR)
+                 $(C_USR) $(CFLAGS) -D_UWIN -I$(OBJ_DIR)
 #     -D"_CONSOLE"
 
 #-----------