diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 37d433687a..8de3d5123f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-09 10:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/gtwvg/gtwvg.hbc
+    ! Fixed missing incpaths= line.
+
+  * contrib/gtwvg/tests/demowvg.prg
+  - contrib/gtwvg/tests/test.dbf
+  * contrib/hbtip/tests/dbtohtml.prg
+  - contrib/hbtip/tests/test.dbf
+    ! Fixed to use central test.dbf instead of duplicating it.
+
 2009-08-09 10:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbxbp/tests/demoxbp.prg
     * Added hb_DirBase() to local file references, to make these
diff --git a/harbour/contrib/gtwvg/gtwvg.hbc b/harbour/contrib/gtwvg/gtwvg.hbc
index 3a906d799e..bee6c31b40 100644
--- a/harbour/contrib/gtwvg/gtwvg.hbc
+++ b/harbour/contrib/gtwvg/gtwvg.hbc
@@ -4,6 +4,8 @@
 
 {!win}skip=yes
 
+incpaths=.
+
 gt=gtwvg
 libs=..\hbwin\hbwin.hbc
 gui=yes
diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg
index e2c74ce50b..c33b652350 100644
--- a/harbour/contrib/gtwvg/tests/demowvg.prg
+++ b/harbour/contrib/gtwvg/tests/demowvg.prg
@@ -802,7 +802,7 @@ FUNCTION WvtMyBrowse_X( oCrt )
    s_pGT_[ 2 ] := hb_gtSelect()
 
    cRDD       := "DBFCDX"
-   cFileDbf   := "test.dbf"
+   cFileDbf   := ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + "tests" + hb_osPathSeparator() + "test.dbf"
    cFileIndex := "test.z01"
 
    USE ( cFileDbf ) NEW SHARED VIA ( cRDD )
@@ -858,7 +858,7 @@ FUNCTION WvtMyBrowse_X( oCrt )
    aLastPaint := WvtSetBlocks( aBlocks )
 
    DispBox( 0, 0, maxrow(), maxcol(), "         ", "N/W" )
-   DispOutAt( oBrowse:nTop-2, oBrowse:nleft, padc( CurDrive()+":\"+CurDir()+"\"+"test.dbf", oBrowse:nRight-oBrowse:nLeft+1 ), "W+/W" )
+   DispOutAt( oBrowse:nTop-2, oBrowse:nleft, padc( cFileDbf, oBrowse:nRight-oBrowse:nLeft+1 ), "W+/W" )
    DispOutAt( maxrow(), 0, padc( '<F3 Modal Window> <F4 Maximize> <F11 Transp++> <F12 Transp--> <Thread'+str(ThreadID(),3)+'>',maxcol()+1), 'B/W' )
 
    oTBar:buttonClick := {|oBtn| IF( oBtn:caption=='Show',__keyboard( chr( K_DOWN ) ),nil ) }
@@ -889,7 +889,7 @@ FUNCTION WvtMyBrowse_X( oCrt )
          oBrowse:nRight  := maxcol() - 5
 
          DispBox( 0, 0, maxrow(), maxcol(), "         ", "N/W" )
-         DispOutAt( oBrowse:nTop-2, oBrowse:nleft, padc( CurDrive()+":\"+CurDir()+"\"+"test.dbf", oBrowse:nRight - oBrowse:nLeft + 1 ), "W+/W" )
+         DispOutAt( oBrowse:nTop-2, oBrowse:nleft, padc( cFileDbf, oBrowse:nRight - oBrowse:nLeft + 1 ), "W+/W" )
          DispOutAt( maxrow(), 0, padc( '<F3 Modal Window> <F4 Maximize> <F11 Transp++> <F12 Transp--> <Thread'+str(ThreadID(),3)+'>',maxcol()+1), 'B/W' )
          oBrowse:configure()
 
@@ -1770,7 +1770,7 @@ STATIC FUNCTION MyDialogOne_X( oCrt )
 
    lOpen := .f.
    cUseAlias := "TEST"
-   USE "test" NEW ALIAS ( cUseAlias ) SHARED
+   USE ( ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + "tests" + hb_osPathSeparator() + "test.dbf" ) NEW ALIAS ( cUseAlias ) SHARED
    if !NetErr()
       lOpen := .t.
       oWvtBrw := CfgMyBrowse( { 1,7,9,10,8 }, cUseAlias, { 6,67,36,120 }, "test.dbf - 1,7,9,10,8", oDlg, "N/W*,N/GR*",1001 )
@@ -1779,7 +1779,7 @@ STATIC FUNCTION MyDialogOne_X( oCrt )
 
    lOpen1 := .f.
    cUseAlias1 := "TEST1"
-   USE "test" NEW ALIAS ( cUseAlias1 ) SHARED
+   USE ( ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + "tests" + hb_osPathSeparator() + "test.dbf" ) NEW ALIAS ( cUseAlias1 ) SHARED
    if !NetErr()
       lOpen1 := .t.
       oWvtBrw1 := CfgMyBrowse( { 1,2,3,4,5,6 }, cUseAlias1, { 43,4,51,120 }, "test.dbf - 1,2,3,4,5,6",oDlg, "N/BG*,N/W*",1002 )
diff --git a/harbour/contrib/gtwvg/tests/test.dbf b/harbour/contrib/gtwvg/tests/test.dbf
deleted file mode 100644
index b6c930febe..0000000000
Binary files a/harbour/contrib/gtwvg/tests/test.dbf and /dev/null differ
diff --git a/harbour/contrib/hbtip/tests/dbtohtml.prg b/harbour/contrib/hbtip/tests/dbtohtml.prg
index 4b93b3e2f4..958b91423d 100644
--- a/harbour/contrib/hbtip/tests/dbtohtml.prg
+++ b/harbour/contrib/hbtip/tests/dbtohtml.prg
@@ -11,7 +11,8 @@ PROCEDURE Main
    CLS
 
    BEGIN SEQUENCE
-      USE test.dbf
+      USE ( ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + ".." + hb_osPathSeparator() + "tests" + hb_osPathSeparator() +;
+            "test.dbf" )
    RECOVER
       ? "Error: Database not found test.dbf"
       QUIT
@@ -71,7 +72,7 @@ PROCEDURE Main
 
       FOR j:=1 TO FCount()
          oCell      := oRow + "td"
-         oCell:text := FieldGet(j) 
+         oCell:text := FieldGet(j)
       NEXT
 
       SKIP
@@ -85,7 +86,7 @@ PROCEDURE Main
    DbCloseArea()
 
    IF oDoc:writeFile( "address.html" )
-      ? "File created: address.html" 
+      ? "File created: address.html"
    ELSE
       ? "Error: ", FError()
    ENDIF
diff --git a/harbour/contrib/hbtip/tests/test.dbf b/harbour/contrib/hbtip/tests/test.dbf
deleted file mode 100644
index 840005d122..0000000000
Binary files a/harbour/contrib/hbtip/tests/test.dbf and /dev/null differ