diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9fffa7a014..734a53252a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-10 02:14 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * config/w32/poccce.cf
+    + Added -D_WINCE to C compiler options.
+
+  * source/pp/hbpp.c
+  * source/main/harbour.c
+    ! Reenabled hbwmain.c for __POCC__.
+
+  * source/pp/hbpp.c
+    * WinCE cleanup. (__MINGW32CE__ is always defined 
+      when HB_WINCE is, so checking for HB_WINCE seems enough)
+    % Removed #include <windows.h>.
+    ; Please verify me.
+
 2008-11-10 01:24 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * source/hbzlib/zconf.h
     * Removed commented Harbour additions.
diff --git a/harbour/config/w32/poccce.cf b/harbour/config/w32/poccce.cf
index 7e899d6c3f..11429af9b7 100644
--- a/harbour/config/w32/poccce.cf
+++ b/harbour/config/w32/poccce.cf
@@ -26,7 +26,7 @@ CPPFLAGS += -Ze -Go
 CPPFLAGS += -Ot -Ox
 
 # For Pocket PC and ARM processors (including XScale)
-CPPFLAGS += -Tarm-coff
+CPPFLAGS += -Tarm-coff -D_WINCE
 
 ifneq ($(HB_INC_COMPILE),)
 CPPFLAGS += -I$(HB_INC_COMPILE)
diff --git a/harbour/source/main/harbour.c b/harbour/source/main/harbour.c
index 744ca248f7..2946624c61 100644
--- a/harbour/source/main/harbour.c
+++ b/harbour/source/main/harbour.c
@@ -622,6 +622,6 @@ int main( int argc, char * argv[] )
    return iResult;
 }
 
-#if defined( HB_WINCE ) && !defined( __CEGCC__ ) && !defined( __POCC__ )
+#if defined( HB_WINCE ) && !defined( __CEGCC__ )
 #  include "hbwmain.c"
 #endif
diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c
index bb769dbfa6..06233e1c4e 100644
--- a/harbour/source/pp/hbpp.c
+++ b/harbour/source/pp/hbpp.c
@@ -54,10 +54,6 @@
 
 #include "hbset.h"
 
-#if defined(__MINGW32CE__) || defined(HB_WINCE)
-#include <windows.h>
-#endif
-
 /*
  * library functions used by PP core code
  * necessary to create standalone binaries
@@ -289,7 +285,7 @@ static int hb_pp_preprocesfile( PHB_PP_STATE pState, const char * szRuleFile )
       foutr = hb_fopen( szRuleFile, "w" );
       if( !foutr )
       {
-#if !defined(__MINGW32CE__) && !defined(HB_WINCE)
+#if !defined(HB_WINCE)
          perror( szRuleFile );
 #endif
          iResult = 1;
@@ -348,7 +344,7 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL
    fout = hb_fopen( szVerFile, "w" );
    if( !fout )
    {
-#if !defined(__MINGW32CE__) && !defined(HB_WINCE)
+#if !defined(HB_WINCE)
       perror( szVerFile );
 #endif
       iResult = 1;
@@ -442,7 +438,7 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName,
    {
          if( !fQuiet )
          {
-#if !defined(__MINGW32CE__) && !defined(HB_WINCE)
+#if !defined(HB_WINCE)
             perror( pszFile );
 #else
             fprintf( stderr, "Cannot open the %s file.\n", pszFile );
@@ -738,6 +734,6 @@ int main( int argc, char * argv[] )
    return iResult;
 }
 
-#if defined( HB_WINCE ) && !defined( __CEGCC__ ) && !defined( __POCC__ )
+#if defined( HB_WINCE ) && !defined( __CEGCC__ )
 #  include "hbwmain.c"
 #endif