diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 493f4211f6..cce70a40b6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,9 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-18 16:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbrun/hbrun.hbp
+  * contrib/hbrun/pullext.prg
+    + include hbxpp
+
+  * src/rdd/dbcmd53.c
+    * formatting
+
 2011-05-18 16:57 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/contrib/rddads/adsx.c
-    ! fixed DBORDERINFO() and ORDNUMBER(), etc. behaviour, for order 
+    ! fixed DBORDERINFO() and ORDNUMBER(), etc. behaviour, for order
       specified using tag parameter
 
 2011-05-18 09:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/hbrun/hbrun.hbp b/harbour/contrib/hbrun/hbrun.hbp
index 28878fce63..1c88eed77d 100644
--- a/harbour/contrib/hbrun/hbrun.hbp
+++ b/harbour/contrib/hbrun/hbrun.hbp
@@ -41,6 +41,7 @@ hbrun.rc
 #   (not in the public SVN that is)
 
 hbct.hbc
+hbxpp.hbc
 hbexpat.hbc
 hbmemio.hbc
 hbmzip.hbc
diff --git a/harbour/contrib/hbrun/pullext.prg b/harbour/contrib/hbrun/pullext.prg
index 90fb2d821c..6b7d5a0f65 100644
--- a/harbour/contrib/hbrun/pullext.prg
+++ b/harbour/contrib/hbrun/pullext.prg
@@ -56,6 +56,7 @@ FUNCTION __hbrun_extensions()
    #xtranslate PULLEXT <cName> => REQUEST __HBEXTERN__<cName>__ ; AAdd( aList, Lower( <"cName"> ) )
 
    PULLEXT hbct
+   PULLEXT hbxpp
    PULLEXT hbexpat
    PULLEXT hbmemio
    PULLEXT hbmzip
diff --git a/harbour/src/rdd/dbcmd53.c b/harbour/src/rdd/dbcmd53.c
index 8d0a94eec1..35f9fc130a 100644
--- a/harbour/src/rdd/dbcmd53.c
+++ b/harbour/src/rdd/dbcmd53.c
@@ -223,7 +223,7 @@ HB_FUNC( ORDKEYADD )
          pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* Either or both may be NIL */
-      pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_ANY );
+      pOrderInfo.itmNewVal = hb_param( 3, HB_IT_ANY );
       pOrderInfo.itmResult = hb_itemPutNL( NULL, 0 );
       SELF_ORDINFO( pArea, DBOI_KEYADD, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
@@ -245,7 +245,7 @@ HB_FUNC( ORDKEYDEL )
          pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* Either or both may be NIL */
-      pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_ANY );
+      pOrderInfo.itmNewVal = hb_param( 3, HB_IT_ANY );
       pOrderInfo.itmResult = hb_itemPutNL( NULL, 0 );
       SELF_ORDINFO( pArea, DBOI_KEYDELETE, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
@@ -267,7 +267,7 @@ HB_FUNC( ORDDESCEND )
          pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* Either or both may be NIL */
-      pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_LOGICAL );
+      pOrderInfo.itmNewVal = hb_param( 3, HB_IT_LOGICAL );
       pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_ISDESC, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
@@ -289,7 +289,7 @@ HB_FUNC( ORDISUNIQUE )
          pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* HARBOUR extension: NewVal to set/reset unique flag */
-      pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_LOGICAL );
+      pOrderInfo.itmNewVal = hb_param( 3, HB_IT_LOGICAL );
       pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_UNIQUE, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
@@ -311,7 +311,7 @@ HB_FUNC( ORDCUSTOM )
          pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC );
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* Either or both may be NIL */
-      pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_LOGICAL );
+      pOrderInfo.itmNewVal = hb_param( 3, HB_IT_LOGICAL );
       pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_CUSTOM, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );