diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9849e50ced..50815261f7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,18 @@
+19990809-07:40 GMT+1 Victor Szel <info@szelvesz.hu>
+   * source/odbc moved to contrib/odbc
+   * source/rtl/console.c
+     + #include "io.h" added for __CYGWIN__
+   * tests/working/block2.PRG removed.
+   * tests/working/transdef.prg
+     tests/working/testrdd.prg
+     tests/working/testpre.prg
+     tests/working/testdbf.prg
+     tests/working/strsub.prg
+     tests/working/dates4.prg
+     ! CVS tag added.
+   * source/rtl/mtran.c
+     ! Small typo.
+
 19990809-06:23 GMT+1 Victor Szel <info@szelvesz.hu>
    * include/memvars.ch
      ! #ifdef _MEMVARS_CH guard added.
diff --git a/harbour/source/odbc/Makefile b/harbour/contrib/odbc/Makefile
similarity index 100%
rename from harbour/source/odbc/Makefile
rename to harbour/contrib/odbc/Makefile
diff --git a/harbour/source/odbc/bld32exe.bat b/harbour/contrib/odbc/bld32exe.bat
similarity index 100%
rename from harbour/source/odbc/bld32exe.bat
rename to harbour/contrib/odbc/bld32exe.bat
diff --git a/harbour/source/odbc/harbour.mdb b/harbour/contrib/odbc/harbour.mdb
similarity index 100%
rename from harbour/source/odbc/harbour.mdb
rename to harbour/contrib/odbc/harbour.mdb
diff --git a/harbour/source/odbc/hb32.bat b/harbour/contrib/odbc/hb32.bat
similarity index 100%
rename from harbour/source/odbc/hb32.bat
rename to harbour/contrib/odbc/hb32.bat
diff --git a/harbour/source/odbc/odbc.c b/harbour/contrib/odbc/odbc.c
similarity index 100%
rename from harbour/source/odbc/odbc.c
rename to harbour/contrib/odbc/odbc.c
diff --git a/harbour/source/odbc/odbc.txt b/harbour/contrib/odbc/odbc.txt
similarity index 100%
rename from harbour/source/odbc/odbc.txt
rename to harbour/contrib/odbc/odbc.txt
diff --git a/harbour/source/odbc/odbc32.def b/harbour/contrib/odbc/odbc32.def
similarity index 100%
rename from harbour/source/odbc/odbc32.def
rename to harbour/contrib/odbc/odbc32.def
diff --git a/harbour/source/odbc/sql.ch b/harbour/contrib/odbc/sql.ch
similarity index 100%
rename from harbour/source/odbc/sql.ch
rename to harbour/contrib/odbc/sql.ch
diff --git a/harbour/source/odbc/sql.h b/harbour/contrib/odbc/sql.h
similarity index 100%
rename from harbour/source/odbc/sql.h
rename to harbour/contrib/odbc/sql.h
diff --git a/harbour/source/odbc/sqlext.h b/harbour/contrib/odbc/sqlext.h
similarity index 100%
rename from harbour/source/odbc/sqlext.h
rename to harbour/contrib/odbc/sqlext.h
diff --git a/harbour/source/odbc/sqltypes.h b/harbour/contrib/odbc/sqltypes.h
similarity index 100%
rename from harbour/source/odbc/sqltypes.h
rename to harbour/contrib/odbc/sqltypes.h
diff --git a/harbour/source/odbc/testodbc.prg b/harbour/contrib/odbc/testodbc.prg
similarity index 100%
rename from harbour/source/odbc/testodbc.prg
rename to harbour/contrib/odbc/testodbc.prg
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index 76a3e2e4c1..3e8d3b378d 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -59,6 +59,9 @@
 #else
   #include <io.h>
 #endif
+#if defined(__CYGWIN__)
+  #include <io.h>
+#endif
 #include <fcntl.h>
 #include "gtapi.h"            /* HARBOUR_USE_GTAPI is checked inside gtapi.h, so that
                                  we can always get the border styles */
diff --git a/harbour/source/rtl/mtran.c b/harbour/source/rtl/mtran.c
index 5e4c31a6ff..f041962735 100644
--- a/harbour/source/rtl/mtran.c
+++ b/harbour/source/rtl/mtran.c
@@ -83,7 +83,7 @@ HB_INIT_SYMBOLS_END( Memotran__InitSymbols );
 #pragma startup Memotran__InitSymbols
 #endif
 
-/* Note: pszResult must have an allocated buffer of at least */
+/* NOTE: pszResult must have an allocated buffer of at least */
 /*       ulStringLen */
 
 void hb_memotran( char *pszResult, ULONG *ulResultLen, char *pszString, ULONG ulStringLen, char cHardcr, char cSoftcr )
diff --git a/harbour/tests/working/block2.PRG b/harbour/tests/working/block2.PRG
deleted file mode 100644
index eee3f525a7..0000000000
--- a/harbour/tests/working/block2.PRG
+++ /dev/null
@@ -1,16 +0,0 @@
-// CodeBlocks management
-
-function Main()
-
-   local bBlock := GenBlock()
-
-   Eval( bBlock, "I am a ", "codeblock" )
-
-   QOut( "ok" )
-
-return nil
-
-function GenBlock()
-
-return { | c, d | QOut( c + d ) }
-
diff --git a/harbour/tests/working/dates4.prg b/harbour/tests/working/dates4.prg
index d805198747..69fe98140c 100644
--- a/harbour/tests/working/dates4.prg
+++ b/harbour/tests/working/dates4.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 // Testing Harbour dates management.
 #include "set.ch"
 
diff --git a/harbour/tests/working/strsub.prg b/harbour/tests/working/strsub.prg
index 418f3d435b..3d4831853b 100644
--- a/harbour/tests/working/strsub.prg
+++ b/harbour/tests/working/strsub.prg
@@ -1,3 +1,6 @@
+/*
+ * $Id$
+ */
 
 // Testing strings concat
 
diff --git a/harbour/tests/working/testdbf.prg b/harbour/tests/working/testdbf.prg
index 724117f2f2..16498373d0 100644
--- a/harbour/tests/working/testdbf.prg
+++ b/harbour/tests/working/testdbf.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 function main()
 
    local aStruct := { { "CHARACTER", "C", 25, 0 }, ;
diff --git a/harbour/tests/working/testpre.prg b/harbour/tests/working/testpre.prg
index b6f76e0677..a8498db22e 100644
--- a/harbour/tests/working/testpre.prg
+++ b/harbour/tests/working/testpre.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 FUNCTION Main()
 
    LOCAL cString
diff --git a/harbour/tests/working/testrdd.prg b/harbour/tests/working/testrdd.prg
index cdcb5c7c89..458608f1bc 100644
--- a/harbour/tests/working/testrdd.prg
+++ b/harbour/tests/working/testrdd.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 function main()
 
    local aRdd := rddList()
diff --git a/harbour/tests/working/transdef.prg b/harbour/tests/working/transdef.prg
index c7de15d9cc..838f486654 100644
--- a/harbour/tests/working/transdef.prg
+++ b/harbour/tests/working/transdef.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 procedure main
 local a := 1, b := 5.22
    qout( "[" + transform( 1, "@B" ) + "]" )