diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4d12930461..5e862072a4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-06 23:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * include/hbpp.h
+    * Minor rearrangement of previous state.
+      Still referencing HB_ISDIGIT() and HB_TOUPPER(), one time
+      each.
+
+  * contrib/xhb/hbxml.c
+    * isspace() -> HB_ISSPACE(). HB_ISSPACE() should be
+      revised in the future if Unicode is used, but until
+      then this is fine here.
+
+  * ChangeLog
+    * Marked one TODO as [CANCELLED].
+
 2009-02-06 22:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/make_b32_all.bat
   * contrib/make_gcc_all.sh
@@ -213,7 +227,7 @@
   ; TODO: Remove DJGPP to*() hack. (or should we keep it to
           support foreign code, like hbpcre and hbzlib?)
   ; TODO: Replace HB_PP_UPPER(), HB_PP_ISDIGIT() with equivalent
-          new macros.
+          new macros. [CANCELLED]
   ; TODO: Remove remaining #include <ctype.h> lines. [DONE]
 
   ; TOFIX: Some of the above macros should better be replaced
diff --git a/harbour/contrib/xhb/hbxml.c b/harbour/contrib/xhb/hbxml.c
index 51d6556c9c..759bac2c09 100644
--- a/harbour/contrib/xhb/hbxml.c
+++ b/harbour/contrib/xhb/hbxml.c
@@ -68,7 +68,6 @@
 * Giancarlo Niccolai <giancarlo@niccolai.org>
 */
 
-#include <ctype.h>
 #include <stdio.h>
 
 #include "hbapi.h"
@@ -848,7 +847,7 @@ static void mxml_node_read_data( MXML_REFIL *ref, PHB_ITEM pNode, PHB_ITEM doc,
    }
 
    /* trimming unneded spaces */
-   while ( iPos >1 && isspace( (BYTE) buf[iPos-1] ) )
+   while ( iPos >1 && HB_ISSPACE( (BYTE) buf[iPos-1] ) )
    {
       iPos--;
    }
diff --git a/harbour/include/hbpp.h b/harbour/include/hbpp.h
index 801df8da66..625c9dd553 100644
--- a/harbour/include/hbpp.h
+++ b/harbour/include/hbpp.h
@@ -440,7 +440,7 @@ HB_PP_TOKEN, * PHB_PP_TOKEN;
 #define HB_PP_ISTEXTCHAR(c)      ( (unsigned char) (c) >= 128 )
 #define HB_PP_ISBLANK(c)         ( (c) == ' ' || (c) == '\t' )
 #define HB_PP_ISDIGIT(c)         HB_ISDIGIT( c )
-#define HB_PP_ISHEX(c)           ( HB_ISDIGIT(c) || \
+#define HB_PP_ISHEX(c)           ( HB_PP_ISDIGIT(c) || \
                                    ( (c) >= 'A' && (c) <= 'F' ) || \
                                    ( (c) >= 'a' && (c) <= 'f' ) )
 #define HB_PP_ISTRUE(c)          ( (c) == 'T' || (c) == 't' || \
@@ -449,7 +449,7 @@ HB_PP_TOKEN, * PHB_PP_TOKEN;
                                    (c) == 'N' || (c) == 'n' )
 #define HB_PP_ISFIRSTIDCHAR(c)   ( ( (c) >= 'A' && (c) <= 'Z' ) || \
                                    ( (c) >= 'a' && (c) <= 'z' ) || (c) == '_' )
-#define HB_PP_ISNEXTIDCHAR(c)    ( HB_PP_ISFIRSTIDCHAR(c) || HB_ISDIGIT(c) )
+#define HB_PP_ISNEXTIDCHAR(c)    ( HB_PP_ISFIRSTIDCHAR(c) || HB_PP_ISDIGIT(c) )
 #define HB_PP_UPPER(c)           HB_TOUPPER( c )
 
 typedef struct _HB_PP_RESULT