diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 26f4f7044e..ac93db8241 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,29 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-30 23:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rdd/dbf1.c
+  * harbour/source/rdd/delim1.c
+  * harbour/source/rdd/sdf1.c
+  * harbour/source/rdd/dbffpt/dbffpt1.c
+  * harbour/source/rdd/dbfntx/dbfntx1.c
+  * harbour/source/rdd/dbfnsx/dbfnsx1.c
+  * harbour/source/rdd/dbfcdx/dbfcdx1.c
+  * harbour/contrib/rddads/ads1.c
+  * harbour/contrib/rddads/adsx.c
+  * harbour/contrib/rddsql/sqlbase.c
+  * harbour/contrib/rddsql/sqlmix.c
+  * harbour/contrib/rddsql/sddmy/mysqldd.c
+  * harbour/contrib/rddsql/sddpg/pgsqldd.c
+  * harbour/contrib/rddsql/sddfb/fbirddd.c
+  * harbour/contrib/rddsql/sddodbc/odbcdd.c
+    * removed some old xHarbour macros
+
+  * harbour/source/rdd/dbfcdx/dbfcdx1.c
+    ! fixed sorting with code pages using accented characters with the
+      same weight - it's necessary to disable some optimizations for
+      such CPs. Thanks to Jaroslav Janik for the information and example.
+
 2009-09-30 13:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * INSTALL
     + Added links to several new components.
diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c
index 6aac91f824..585c4bd9dd 100644
--- a/harbour/contrib/rddads/ads1.c
+++ b/harbour/contrib/rddads/ads1.c
@@ -3523,7 +3523,7 @@ static HB_ERRCODE adsForceRel( ADSAREAP pArea )
 
       hb_adsUpdateAreaFlags( pArea );
    }
-   fflush(stdout);
+
    return HB_SUCCESS;
 }
 
@@ -4996,13 +4996,6 @@ HB_FUNC_STATIC( ADSVFP_GETFUNCTABLE )
 
 HB_FUNC( ADS ) { ; }
 
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 static void hb_adsRddInit( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
diff --git a/harbour/contrib/rddads/adsx.c b/harbour/contrib/rddads/adsx.c
index 4fa6e17e50..7c4e34ec9c 100644
--- a/harbour/contrib/rddads/adsx.c
+++ b/harbour/contrib/rddads/adsx.c
@@ -1492,14 +1492,6 @@ HB_FUNC( ADSX_GETFUNCTABLE )
 
 HB_FUNC( ADSX ) { ; }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC_EXTERN( ADS );
 
 static void hb_adsxRddInit( void * cargo )
diff --git a/harbour/contrib/rddsql/sddfb/fbirddd.c b/harbour/contrib/rddsql/sddfb/fbirddd.c
index c75f55cea7..01fca4a385 100644
--- a/harbour/contrib/rddsql/sddfb/fbirddd.c
+++ b/harbour/contrib/rddsql/sddfb/fbirddd.c
@@ -99,7 +99,6 @@ static SDDNODE firebirddd = {
 
 HB_FUNC_EXTERN( SQLBASE );
 
-
 static void hb_firebirddd_init( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
@@ -111,14 +110,6 @@ static void hb_firebirddd_init( void * cargo )
    }
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC( SDDFB ) {;}
 
 HB_INIT_SYMBOLS_BEGIN( firebirddd__InitSymbols )
diff --git a/harbour/contrib/rddsql/sddmy/mysqldd.c b/harbour/contrib/rddsql/sddmy/mysqldd.c
index 2700f6bcf9..4d21f7e5e6 100644
--- a/harbour/contrib/rddsql/sddmy/mysqldd.c
+++ b/harbour/contrib/rddsql/sddmy/mysqldd.c
@@ -118,7 +118,6 @@ static SDDNODE mysqldd =
 
 HB_FUNC_EXTERN( SQLBASE );
 
-
 static void hb_mysqldd_init( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
@@ -130,14 +129,6 @@ static void hb_mysqldd_init( void * cargo )
    }
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC( SDDMY ) {;}
 
 HB_INIT_SYMBOLS_BEGIN( mysqldd__InitSymbols )
diff --git a/harbour/contrib/rddsql/sddodbc/odbcdd.c b/harbour/contrib/rddsql/sddodbc/odbcdd.c
index 8e61203970..b2df9afecd 100644
--- a/harbour/contrib/rddsql/sddodbc/odbcdd.c
+++ b/harbour/contrib/rddsql/sddodbc/odbcdd.c
@@ -105,7 +105,6 @@ static SDDNODE odbcdd =
 
 HB_FUNC_EXTERN( SQLBASE );
 
-
 static void hb_odbcdd_init( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
@@ -117,14 +116,6 @@ static void hb_odbcdd_init( void * cargo )
    }
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC( SDDODBC ) {;}
 
 HB_INIT_SYMBOLS_BEGIN( odbcdd__InitSymbols )
diff --git a/harbour/contrib/rddsql/sddpg/pgsqldd.c b/harbour/contrib/rddsql/sddpg/pgsqldd.c
index 1012875f1e..57b5bbc443 100644
--- a/harbour/contrib/rddsql/sddpg/pgsqldd.c
+++ b/harbour/contrib/rddsql/sddpg/pgsqldd.c
@@ -118,7 +118,6 @@ static SDDNODE pgsqldd = {
 
 HB_FUNC_EXTERN( SQLBASE );
 
-
 static void hb_pgsqldd_init( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
@@ -130,14 +129,6 @@ static void hb_pgsqldd_init( void * cargo )
    }
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC( SDDPG ) {;}
 
 HB_INIT_SYMBOLS_BEGIN( sddpostgre__InitSymbols )
diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c
index 14e6865082..e0beead25d 100644
--- a/harbour/contrib/rddsql/sqlbase.c
+++ b/harbour/contrib/rddsql/sqlbase.c
@@ -1209,18 +1209,8 @@ static void hb_sqlbaseInit( void * cargo )
    }
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
-
 HB_FUNC( SQLBASE ) {;}
 
-
 HB_FUNC( SQLBASE_GETFUNCTABLE )
 {
    RDDFUNCS * pTable;
diff --git a/harbour/contrib/rddsql/sqlmix.c b/harbour/contrib/rddsql/sqlmix.c
index 97aa213d1d..3a0ffecda8 100644
--- a/harbour/contrib/rddsql/sqlmix.c
+++ b/harbour/contrib/rddsql/sqlmix.c
@@ -2281,21 +2281,10 @@ HB_FUNC( SQLMIX_GETFUNCTABLE )
    }
 }
 
-
 HB_FUNC( SQLMIX ) { ; }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
-
 HB_FUNC_EXTERN( SQLBASE );
 
-
 static void hb_sqlmixRddInit( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c
index 204dc3499b..d112f38db2 100644
--- a/harbour/source/rdd/dbf1.c
+++ b/harbour/source/rdd/dbf1.c
@@ -2665,9 +2665,9 @@ static HB_ERRCODE hb_dbfRecCount( DBFAREAP pArea, ULONG * pRecCount )
 /*
  * Obtain physical row number at current WorkArea cursor position.
  */
-static HB_ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * ulRecNo )
+static HB_ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * pulRecNo )
 {
-   HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecNo(%p, %p)", pArea, ulRecNo));
+   HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecNo(%p, %p)", pArea, pulRecNo));
 
    if( pArea->lpdbPendingRel )
    {
@@ -2675,7 +2675,7 @@ static HB_ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * ulRecNo )
          return HB_FAILURE;
    }
 
-   *ulRecNo = pArea->ulRecNo;
+   *pulRecNo = pArea->ulRecNo;
    return HB_SUCCESS;
 }
 
@@ -2685,7 +2685,7 @@ static HB_ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * ulRecNo )
 static HB_ERRCODE hb_dbfRecId( DBFAREAP pArea, PHB_ITEM pRecNo )
 {
    HB_ERRCODE errCode;
-   ULONG ulRecNo;
+   ULONG ulRecNo = 0;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecId(%p, %p)", pArea, pRecNo));
 
@@ -5904,14 +5904,6 @@ HB_FUNC( DBF_GETFUNCTABLE )
       hb_retni( HB_FAILURE );
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 static void hb_dbfRddInit( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c
index c483b49d06..aa1d994d65 100644
--- a/harbour/source/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c
@@ -2279,7 +2279,8 @@ static int hb_cdxPageLeafAddKey( LPCDXPAGE pPage, LPCDXKEY pKey )
    iPos = iKey * iLen;
    if( iKey < pPage->iKeys )
    {
-      iDup = pPage->pKeyBuf[ iPos + iNum + 4 ];
+      if( !pPage->TagParent->pIndex->pArea->fSortCDP )
+         iDup = pPage->pKeyBuf[ iPos + iNum + 4 ];
       memmove( &pPage->pKeyBuf[ iPos + iLen ], &pPage->pKeyBuf[ iPos ],
                iLen * ( pPage->iKeys - iKey ) );
    }
@@ -9781,12 +9782,6 @@ static void hb_cdxTagDoIndex( LPCDXTAG pTag, BOOL fReindex )
 #endif
 }
 
-#define __PRG_SOURCE__ __FILE__
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC_EXTERN( _DBF );
 
 #if defined( HB_SIXCDX )
diff --git a/harbour/source/rdd/dbffpt/dbffpt1.c b/harbour/source/rdd/dbffpt/dbffpt1.c
index 5e39b3d2b3..6996ae8667 100644
--- a/harbour/source/rdd/dbffpt/dbffpt1.c
+++ b/harbour/source/rdd/dbffpt/dbffpt1.c
@@ -5306,13 +5306,6 @@ HB_FUNC( DBFBLOB_GETFUNCTABLE )
    hb_dbffptRegisterRDD( &s_uiRddIdBLOB );
 }
 
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-#  undef HB_PRG_PCODE_VER
-#  define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC_EXTERN( _DBF );
 
 static void hb_dbffptRddInit( void * cargo )
diff --git a/harbour/source/rdd/dbfnsx/dbfnsx1.c b/harbour/source/rdd/dbfnsx/dbfnsx1.c
index e025b8b118..9eb2ebe942 100644
--- a/harbour/source/rdd/dbfnsx/dbfnsx1.c
+++ b/harbour/source/rdd/dbfnsx/dbfnsx1.c
@@ -8187,14 +8187,6 @@ HB_FUNC( DBFNSX_GETFUNCTABLE )
    }
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-#  undef HB_PRG_PCODE_VER
-#  define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC_EXTERN( _DBF );
 
 static void hb_dbfnsxRddInit( void * cargo )
diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c
index 6c6151c1cc..03e6abcbb1 100644
--- a/harbour/source/rdd/dbfntx/dbfntx1.c
+++ b/harbour/source/rdd/dbfntx/dbfntx1.c
@@ -7799,14 +7799,6 @@ HB_FUNC( DBFNTX_GETFUNCTABLE )
    }
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-#  undef HB_PRG_PCODE_VER
-#  define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 HB_FUNC_EXTERN( _DBF );
 
 static void hb_dbfntxRddInit( void * cargo )
diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c
index 27937f5d3b..d8f4c72477 100644
--- a/harbour/source/rdd/delim1.c
+++ b/harbour/source/rdd/delim1.c
@@ -1592,14 +1592,6 @@ HB_FUNC( DELIM_GETFUNCTABLE )
       hb_retni( HB_FAILURE );
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 static void hb_delimRddInit( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );
diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c
index f3586f3480..b9c9f51303 100644
--- a/harbour/source/rdd/sdf1.c
+++ b/harbour/source/rdd/sdf1.c
@@ -1327,14 +1327,6 @@ HB_FUNC( SDF_GETFUNCTABLE )
       hb_retni( HB_FAILURE );
 }
 
-
-#define __PRG_SOURCE__ __FILE__
-
-#ifdef HB_PCODE_VER
-   #undef HB_PRG_PCODE_VER
-   #define HB_PRG_PCODE_VER HB_PCODE_VER
-#endif
-
 static void hb_sdfRddInit( void * cargo )
 {
    HB_SYMBOL_UNUSED( cargo );