diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0cd19c032f..a88b5c2510 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-12 20:53 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/filesys.c
+    * do not redefine LongToHandle() for __XCC__ and __POCC__ WinCE builds
+
+  * harbour/utils/hbver/hbverfix.c
+    ! fixed typos in previous commit
+
 2007-11-12 19:22 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   + harbour/include/hbassert.h
   * harbour/include/hb_io.h
diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index 9c9564fb15..bfe021bd6a 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -261,10 +261,11 @@ static BOOL s_fUseWaitLocks = TRUE;
 
 #if defined(HB_WIN32_IO)
 
-   #if defined( __LCC__ ) || ( defined( _MSC_VER ) && defined( HB_WINCE ) )
+   #if defined( __LCC__ ) || ( defined( _MSC_VER ) && defined( HB_WINCE ) && \
+                               !defined( __POCC__ ) && !defined( __XCC__ ) )
       __inline void * LongToHandle( const long h )
       {
-          return((void *) (INT_PTR) h );
+          return( ( void * ) ( INT_PTR ) h );
       }
    #endif
 
diff --git a/harbour/utils/hbver/hbverfix.c b/harbour/utils/hbver/hbverfix.c
index 5018caecc5..cbf5207e0c 100644
--- a/harbour/utils/hbver/hbverfix.c
+++ b/harbour/utils/hbver/hbverfix.c
@@ -74,10 +74,10 @@
 #define MAX_BUF_LEN 4096
 
 #if defined(HB_WINCE)
-wchar_t *hb_mbtowc( const char *srcA )
+wchar_t *hb_mbtowc( const char * srcA )
 {
    DWORD length;
-   wchar_t *dstW;
+   wchar_t * dstW;
 
    length = MultiByteToWideChar( CP_ACP, 0, srcA, -1, NULL, 0 );
    dstW = ( wchar_t * ) malloc( ( length + 1 ) * sizeof( wchar_t ) );
@@ -86,9 +86,9 @@ wchar_t *hb_mbtowc( const char *srcA )
    return dstW;
 }
 
-int remove( const char *filename )
+int remove( const char * path )
 {
-   wchar_t *wpath;
+   wchar_t * wpath;
    int result;
 
    wpath = hb_mbtowc( path );
@@ -103,9 +103,9 @@ void perror( const char *szError )
    fprintf( stderr, "error: %s\n", szError );
 }
 
-int rename( const char *oldname, const char *newname )
+int rename( const char * fn1, const char * fn2 )
 {
-   wchar_t wfn1, wfn2;
+   wchar_t * wfn1, * wfn2;
    int result;
 
    wfn1 = hb_mbtowc( fn1 );