diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 829dd55e25..6f45ab4b41 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2004-02-14 03:00 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
+
+   * makefile.bc
+     ! Fixed compilation of dbgbrwsr
+
+   * source/pp/ppcore.c 
+   * source/rtl/round.c
+   * source/rdd/dbfcdx/dbfcdx1.c
+     ! Fixed errors when compiled with HB_TRACE
+   
+   * source/common/hbffind.c
+     * Formatting.
+
 2004-02-13 23:57 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
 
    + source/codepage/cdphu852.c
@@ -59,9 +72,9 @@
 
    * souce/rtl/gtapi.c
      ! hb_gtSetColorStr() removed one suspicious assigment which 
-       showed incompatible with CA-Cl*pper, whete CLR_UNSELECTED 
+       showed incompatible with CA-Cl*pper, where CLR_UNSELECTED 
        was made equal to CLR_ENHANCED if missing from the color string.
-     * Using CLR_ constants instead of literals.
+     * Using HB_CLR_ constants instead of literals.
 
    * source/rtl/tget.prg
      ! :ColorSpec() method unselected color defaulting fixed.
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index f98920ba28..836d4102bd 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -543,6 +543,7 @@ PP_LIB_OBJS = \
 #
 
 DEBUG_LIB_OBJS = \
+   $(OBJ_DIR)\dbgbrwsr.obj \
    $(OBJ_DIR)\dbghelp.obj \
    $(OBJ_DIR)\dbgmenu.obj \
    $(OBJ_DIR)\dbgtmenu.obj \
diff --git a/harbour/source/common/hbffind.c b/harbour/source/common/hbffind.c
index ff99f3641f..4c99fcd0ec 100644
--- a/harbour/source/common/hbffind.c
+++ b/harbour/source/common/hbffind.c
@@ -155,10 +155,13 @@ HB_FILE_VER( "$Id$" )
 
 /* Internal funtion , Convert Windows Error Values to Dos Error Values */
 #ifdef HB_OS_WIN_32
-int WintoDosError( unsigned long lError)
+
+static int WintoDosError( unsigned long lError)
 {
    int iReturn;
-   switch( lError ) {
+
+   switch( lError )
+   {
    case ERROR_ALREADY_EXISTS:
       iReturn = 5;
       break;
@@ -174,10 +177,10 @@ int WintoDosError( unsigned long lError)
    case ERROR_INVALID_HANDLE:
       iReturn = 6;
       break;
-  default:
-         iReturn=0;
+   default:
+      iReturn = 0;
       break;
-      }
+   }
 
    return iReturn;
 }
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 60a8a49010..9a7b8b2785 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -2728,7 +2728,7 @@ static BOOL ScanMacro( char * expreal, int lenitem, int * pNewLen )
 	BOOL bSmartMacro;
 	int i, lennew;
 
-   HB_TRACE(HB_TR_DEBUG, ("ScanMacro(%s, %d, %p)", expreal, lenreal, pNewLen));
+   HB_TRACE(HB_TR_DEBUG, ("ScanMacro(%s, %d, %p)", expreal, lenitem, pNewLen));
 
 	lennew = lenitem - 1;	
 	bSmartMacro = TRUE;
diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c
index a7be85e1da..9769affc28 100644
--- a/harbour/source/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c
@@ -4229,7 +4229,7 @@ static ERRCODE hb_cdxSkipUnique( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward )
 {
    ERRCODE retval;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipUnique(%p, %ld)", pArea, iDir));
+   HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipUnique(%p, %p, %d)", pArea, pTag, (int) fForward));
 
    if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE )
       return FAILURE;
@@ -4662,9 +4662,9 @@ static ERRCODE hb_cdxGoTop( CDXAREAP pArea )
 /* ( DBENTRYP_BIB )   hb_cdxSeek */
 static ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pKeyItm, BOOL fFindLast )
 {
-   LPCDXTAG pTag
+   LPCDXTAG pTag;
 
-   HB_TRACE(HB_TR_DEBUG, ("cdxSeek(%p, %d, %p, %d)", pArea, fSoftSeek, pKeyItm, fFindLast));
+   HB_TRACE(HB_TR_DEBUG, ("cdxSeek(%p, %d, %p, %d)", pArea, (int) fSoftSeek, pKeyItm, (int) fFindLast));
 
    if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE )
       return FAILURE;
diff --git a/harbour/source/rtl/round.c b/harbour/source/rtl/round.c
index 6aeeeba19a..339063ac07 100644
--- a/harbour/source/rtl/round.c
+++ b/harbour/source/rtl/round.c
@@ -89,22 +89,22 @@ HB_FUNC( INT )
 
 double hb_numRound( double doValue, int nPrecision )
 {
-	static const double doBase = 10.0f;
-	double doComplete5, doComplete5i;
-
-	HB_TRACE(HB_TR_DEBUG, ("hb_numRound(%lf, %d)", doValue, iPrecision));
-
-	doComplete5 = doValue * pow(doBase, (double) (nPrecision + 1));
-
-	if(doValue < 0.0f)
-		doComplete5 -= 5.0f;
-	else
-		doComplete5 += 5.0f;
-
-	doComplete5 /= doBase;
-	modf(doComplete5, &doComplete5i);
-
-	return doComplete5i / pow(doBase, (double) nPrecision);
+   static const double doBase = 10.0f;
+   double doComplete5, doComplete5i;
+   
+   HB_TRACE(HB_TR_DEBUG, ("hb_numRound(%lf, %d)", doValue, nPrecision));
+   
+   doComplete5 = doValue * pow( doBase, ( double ) ( nPrecision + 1 ) );
+   
+   if( doValue < 0.0f )
+      doComplete5 -= 5.0f;
+   else
+      doComplete5 += 5.0f;
+   
+   doComplete5 /= doBase;
+   modf( doComplete5, &doComplete5i );
+   
+   return doComplete5i / pow( doBase, ( double ) nPrecision );
 }
 
 HB_FUNC( ROUND )