diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3604a989af..d0a245c281 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-15 19:08 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/debug/dbgbrwsr.prg
+    ! added missing #include "common.ch"
+    ! added missing colorBlock variable in HBDBColumn class
+    % replaced .prg wrappers for type checking with native
+      harbour class type validation
+
 2008-10-15 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * source/debug/tbrwtext.prg
     * Replaced with new implementation from Lorenzo Fiorini.
diff --git a/harbour/source/debug/dbgbrwsr.prg b/harbour/source/debug/dbgbrwsr.prg
index e1bd0aa159..abf8b0523f 100644
--- a/harbour/source/debug/dbgbrwsr.prg
+++ b/harbour/source/debug/dbgbrwsr.prg
@@ -55,6 +55,7 @@
 #pragma DEBUGINFO=OFF
 
 #include "hbclass.ch"
+#include "common.ch"
 
 /* HBDbBrowser
  *
@@ -235,33 +236,21 @@ METHOD Resize( nTop, nLeft, nBottom, nRight )
 
 CREATE CLASS HBDbColumn
 
-   VAR nWidth       PROTECTED
-   VAR bBlock       PROTECTED
-   VAR aDefColor    PROTECTED INIT { 1, 2 }
-
    EXPORTED:
 
-   METHOD block( bBlock ) SETGET                     /* Code block to retrieve data for the column */
-   METHOD defColor( aDefColor ) SETGET               /* Array of numeric indexes into the color table */
-   METHOD width( nWidth ) SETGET                     /* Column display width */
-                                                     
-   METHOD New( cHeading, bBlock )                    /* NOTE: This method is a Harbour extension [vszakats] */
+   VAR block      AS CODEBLOCK                  /* Code block to retrieve data for the column */
+   VAR colorBlock AS CODEBLOCK INIT {|| NIL }   /* column color block */
+   VAR defColor   AS ARRAY     INIT { 1, 2 }    /* Array of numeric indexes into the color table */
+   VAR width      AS USUAL                      /* Column display width */
+
+   METHOD New( cHeading, bBlock )               /* NOTE: This method is a Harbour extension [vszakats] */
 
 ENDCLASS
 
-METHOD block( bBlock ) CLASS HBDbColumn
-   RETURN iif( ISBLOCK( bBlock ), ::bBlock := bBlock, ::bBlock )
-
-METHOD defColor( aDefColor ) CLASS HBDbColumn
-   RETURN iif( ISARRAY( aDefColor ), ::aDefColor := aDefColor, ::aDefColor )
-
-METHOD width( nWidth ) CLASS HBDbColumn
-   RETURN iif( ISNUMBER( nWidth ), ::nWidth := nWidth, ::nWidth )
-
 METHOD New( cHeading, bBlock ) CLASS HBDbColumn
 
    HB_SYMBOL_UNUSED( cHeading )
-   ::bBlock := bBlock
+   ::block := bBlock
 
    RETURN Self