diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 192f4cdabd..3205d8bc1a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,28 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-20 04:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbxbp/xbp.ch
+  * contrib/hbxbp/xbpscrollbar.prg
+  * contrib/hbxbp/xbpsle.prg
+  * contrib/hbxbp/xbplistbox.prg
+  * contrib/hbxbp/xbpcheckbox.prg
+  * contrib/hbxbp/xbpradiobutton.prg
+  * contrib/hbxbp/xbptabpage.prg
+  * contrib/hbxbp/xbpwindow.prg
+  * contrib/hbxbp/xbpstatusbar.prg
+  * contrib/hbxbp/xbppushbutton.prg
+    * Moved these constants to HBXBP_ namespace as they
+      don't seem to be defined by Xbase++:
+      - EVENT_HANDELLED   -> HBXBP_EVENT_HANDLED
+      - EVENT_UNHANDELLED -> HBXBP_EVENT_UNHANDLED
+    ! Using manifest constants instead of literals.
+    ; TOFIX: AFAICS these macros and headers are also not Xbase++ ones:
+             - apig.ch
+             - DA_MODE
+             - objType*
+             If so, these should be resolved.
+
 2009-06-20 04:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt_slots.cpp
     ! Deleted readded windows.h.
diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch
index e128aa202c..666ca3827a 100644
--- a/harbour/contrib/hbxbp/xbp.ch
+++ b/harbour/contrib/hbxbp/xbp.ch
@@ -38,8 +38,8 @@
 
 /*----------------------------------------------------------------------*/
 
-#define EVENT_HANDELLED                           0
-#define EVENT_UNHANDELLED                         1
+#define HBXBP_EVENT_HANDLED                       0
+#define HBXBP_EVENT_UNHANDLED                     1
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbpcheckbox.prg b/harbour/contrib/hbxbp/xbpcheckbox.prg
index 4c1ec3c9bb..c57f157f0a 100644
--- a/harbour/contrib/hbxbp/xbpcheckbox.prg
+++ b/harbour/contrib/hbxbp/xbpcheckbox.prg
@@ -150,7 +150,7 @@ METHOD XbpCheckBox:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbplistbox.prg b/harbour/contrib/hbxbp/xbplistbox.prg
index f1cbc999a8..1dd41055e6 100644
--- a/harbour/contrib/hbxbp/xbplistbox.prg
+++ b/harbour/contrib/hbxbp/xbplistbox.prg
@@ -227,7 +227,7 @@ METHOD XbpListBox:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg
index 2529564f7d..31df76ee63 100644
--- a/harbour/contrib/hbxbp/xbppushbutton.prg
+++ b/harbour/contrib/hbxbp/xbppushbutton.prg
@@ -159,7 +159,7 @@ METHOD XbpPushButton:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbpradiobutton.prg b/harbour/contrib/hbxbp/xbpradiobutton.prg
index f46f50654c..93bfd4c3c6 100644
--- a/harbour/contrib/hbxbp/xbpradiobutton.prg
+++ b/harbour/contrib/hbxbp/xbpradiobutton.prg
@@ -149,7 +149,7 @@ METHOD XbpRadioButton:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbpscrollbar.prg b/harbour/contrib/hbxbp/xbpscrollbar.prg
index 040b6fa04c..4983aad165 100644
--- a/harbour/contrib/hbxbp/xbpscrollbar.prg
+++ b/harbour/contrib/hbxbp/xbpscrollbar.prg
@@ -182,7 +182,7 @@ METHOD XbpScrollBar:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbpsle.prg b/harbour/contrib/hbxbp/xbpsle.prg
index fa9e2e8743..93e10869ae 100644
--- a/harbour/contrib/hbxbp/xbpsle.prg
+++ b/harbour/contrib/hbxbp/xbpsle.prg
@@ -226,7 +226,7 @@ METHOD XbpSLE:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbpstatusbar.prg b/harbour/contrib/hbxbp/xbpstatusbar.prg
index f240a46ff7..94812d8936 100644
--- a/harbour/contrib/hbxbp/xbpstatusbar.prg
+++ b/harbour/contrib/hbxbp/xbpstatusbar.prg
@@ -144,7 +144,7 @@ METHOD XbpStatusBar:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbptabpage.prg b/harbour/contrib/hbxbp/xbptabpage.prg
index 4ab15e7ca6..00a4b44ee4 100644
--- a/harbour/contrib/hbxbp/xbptabpage.prg
+++ b/harbour/contrib/hbxbp/xbptabpage.prg
@@ -179,7 +179,7 @@ METHOD XbpTabPage:handleEvent( nEvent, mp1, mp2 )
    HB_SYMBOL_UNUSED( mp1    )
    HB_SYMBOL_UNUSED( mp2    )
 
-   RETURN EVENT_UNHANDELLED
+   RETURN HBXBP_EVENT_UNHANDLED
 
 /*----------------------------------------------------------------------*/
 
diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg
index f7ddaff061..46c53fad0c 100644
--- a/harbour/contrib/hbxbp/xbpwindow.prg
+++ b/harbour/contrib/hbxbp/xbpwindow.prg
@@ -272,7 +272,7 @@ EXPORTED:
    DATA     nWndProc
 
    DATA     oMenu
-   METHOD   HandleEvent()                         INLINE ( 1 )
+   METHOD   HandleEvent()                         INLINE ( HBXBP_EVENT_UNHANDLED )
    METHOD   ControlWndProc()
    METHOD   findObjectByHandle( hWnd )
 
@@ -1354,8 +1354,8 @@ METHOD XbpWindow:ControlWndProc( hWnd, nMessage, nwParam, nlParam )
    CASE QWM_NOTIFY
       IF ( nObj := ascan( ::aChildren, {| o | o:nID == nwParam } ) ) > 0
          nReturn := ::aChildren[ nObj ]:handleEvent( HB_GTE_NOTIFY, { nwParam, nlParam } )
-         IF hb_isNumeric( nReturn ) .and. nReturn == EVENT_HANDELLED
-            RETURN EVENT_HANDELLED
+         IF hb_isNumeric( nReturn ) .and. nReturn == HBXBP_EVENT_HANDLED
+            RETURN HBXBP_EVENT_HANDLED
          ENDIF
       ENDIF
       EXIT
@@ -1386,7 +1386,7 @@ METHOD XbpWindow:ControlWndProc( hWnd, nMessage, nwParam, nlParam )
 
    CASE QWM_VSCROLL
       nReturn := ::handleEvent( HB_GTE_VSCROLL, { Qtc_LoWord( nwParam ), Qtc_HiWord( nwParam ), nlParam } )
-      IF nReturn == EVENT_HANDELLED
+      IF nReturn == HBXBP_EVENT_HANDLED
          RETURN 0
       ENDIF
       EXIT
@@ -1429,7 +1429,7 @@ METHOD XbpWindow:ControlWndProc( hWnd, nMessage, nwParam, nlParam )
 CLASS XbpObject
 
    METHOD INIT
-   METHOD HandleEvent()  INLINE ( 1 )
+   METHOD HandleEvent()  INLINE ( HBXBP_EVENT_UNHANDLED )
 
    ENDCLASS