diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 4b292b3b89..2f77213654 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,33 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-29 13:54 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hblzf/tests/hbmk.hbm
+  * contrib/hblzf/tests/test.prg
+  * contrib/hblzf/tests/test2.prg
+  * contrib/hbodbc/tests/hbmk.hbm
+  * contrib/hbodbc/tests/odbccall.prg
+  * contrib/hbodbc/tests/odbcdemo.prg
+  * contrib/hbodbc/tests/testodbc.prg
+  * contrib/hbssl/tests/bio.prg
+  * contrib/hbssl/tests/crypt.prg
+  * contrib/hbssl/tests/digest.prg
+  * contrib/hbssl/tests/encode.prg
+  * contrib/hbssl/tests/hbmk.hbm
+  * contrib/hbssl/tests/pem.prg
+  * contrib/hbssl/tests/test.prg
+  * contrib/hbtinymt/tests/hbmk.hbm
+  * contrib/hbtinymt/tests/test32.prg
+  * contrib/hbtinymt/tests/test64.prg
+  * contrib/hbxdiff/tests/hbmk.hbm
+  * contrib/hbxdiff/tests/test.prg
+  * contrib/hbxdiff/tests/test2.prg
+  * contrib/hbxdiff/tests/test3.prg
+  * contrib/hbziparc/tests/hbmk.hbm
+  * contrib/hbziparc/tests/unzipa.prg
+  * contrib/hbziparc/tests/zipa.prg
+    % moved simpleio.ch to hbmk.hbm
+
 2012-11-29 13:49 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbfbird/tests/hbmk.hbm
   * contrib/hbfbird/tests/simple.prg
diff --git a/harbour/contrib/hblzf/tests/hbmk.hbm b/harbour/contrib/hblzf/tests/hbmk.hbm
index 3506ba3c5a..d0fe1d0e96 100644
--- a/harbour/contrib/hblzf/tests/hbmk.hbm
+++ b/harbour/contrib/hblzf/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hblzf.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/contrib/hblzf/tests/test.prg b/harbour/contrib/hblzf/tests/test.prg
index 3774eecc87..8831890a32 100644
--- a/harbour/contrib/hblzf/tests/test.prg
+++ b/harbour/contrib/hblzf/tests/test.prg
@@ -4,8 +4,6 @@
 
 #require "hblzf"
 
-#include "simpleio.ch"
-
 #define TEST_STRING "This is test of LZF extension"
 #define _NREPL_     128
 
diff --git a/harbour/contrib/hblzf/tests/test2.prg b/harbour/contrib/hblzf/tests/test2.prg
index 1abc72ac10..ed4e47b654 100644
--- a/harbour/contrib/hblzf/tests/test2.prg
+++ b/harbour/contrib/hblzf/tests/test2.prg
@@ -5,8 +5,6 @@
 #require "hbbz2"
 #require "hblzf"
 
-#include "simpleio.ch"
-
 #define _NREPL_     50
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbodbc/tests/hbmk.hbm b/harbour/contrib/hbodbc/tests/hbmk.hbm
index aa0dd60f2c..3dd0e29fd3 100644
--- a/harbour/contrib/hbodbc/tests/hbmk.hbm
+++ b/harbour/contrib/hbodbc/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hbodbc.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/contrib/hbodbc/tests/odbccall.prg b/harbour/contrib/hbodbc/tests/odbccall.prg
index e743bb937a..8db389f197 100644
--- a/harbour/contrib/hbodbc/tests/odbccall.prg
+++ b/harbour/contrib/hbodbc/tests/odbccall.prg
@@ -4,8 +4,6 @@
 
 #require "hbodbc"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL dsFunctions := TODBC():New( "DBQ=" + hb_FNameMerge( hb_DirBase(), "test.mdb" ) + ";Driver={Microsoft Access Driver (*.mdb)}" )
diff --git a/harbour/contrib/hbodbc/tests/odbcdemo.prg b/harbour/contrib/hbodbc/tests/odbcdemo.prg
index f49f60d51e..747d7511dc 100644
--- a/harbour/contrib/hbodbc/tests/odbcdemo.prg
+++ b/harbour/contrib/hbodbc/tests/odbcdemo.prg
@@ -4,8 +4,6 @@
 
 #require "hbodbc"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL aOrders
diff --git a/harbour/contrib/hbodbc/tests/testodbc.prg b/harbour/contrib/hbodbc/tests/testodbc.prg
index 04ed6cbc07..e81d187ef2 100644
--- a/harbour/contrib/hbodbc/tests/testodbc.prg
+++ b/harbour/contrib/hbodbc/tests/testodbc.prg
@@ -4,8 +4,6 @@
 
 #require "hbodbc"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL hEnv
diff --git a/harbour/contrib/hbssl/tests/bio.prg b/harbour/contrib/hbssl/tests/bio.prg
index 0df775e880..b7a9bdae13 100644
--- a/harbour/contrib/hbssl/tests/bio.prg
+++ b/harbour/contrib/hbssl/tests/bio.prg
@@ -9,8 +9,6 @@
 
 #require "hbssl"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL bio
diff --git a/harbour/contrib/hbssl/tests/crypt.prg b/harbour/contrib/hbssl/tests/crypt.prg
index cd6bf75689..f08985077a 100644
--- a/harbour/contrib/hbssl/tests/crypt.prg
+++ b/harbour/contrib/hbssl/tests/crypt.prg
@@ -9,8 +9,6 @@
 
 #require "hbssl"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL ctx
diff --git a/harbour/contrib/hbssl/tests/digest.prg b/harbour/contrib/hbssl/tests/digest.prg
index f420503bcf..c65a2e1fc0 100644
--- a/harbour/contrib/hbssl/tests/digest.prg
+++ b/harbour/contrib/hbssl/tests/digest.prg
@@ -9,8 +9,6 @@
 
 #require "hbssl"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL ctx
diff --git a/harbour/contrib/hbssl/tests/encode.prg b/harbour/contrib/hbssl/tests/encode.prg
index 31e5d23f17..8153b96ea9 100644
--- a/harbour/contrib/hbssl/tests/encode.prg
+++ b/harbour/contrib/hbssl/tests/encode.prg
@@ -9,8 +9,6 @@
 
 #require "hbssl"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL ctx
diff --git a/harbour/contrib/hbssl/tests/hbmk.hbm b/harbour/contrib/hbssl/tests/hbmk.hbm
index 3064aab78f..7789f99915 100644
--- a/harbour/contrib/hbssl/tests/hbmk.hbm
+++ b/harbour/contrib/hbssl/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hbssl.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/contrib/hbssl/tests/pem.prg b/harbour/contrib/hbssl/tests/pem.prg
index 178a55529b..b3c621ce05 100644
--- a/harbour/contrib/hbssl/tests/pem.prg
+++ b/harbour/contrib/hbssl/tests/pem.prg
@@ -9,8 +9,6 @@
 
 #require "hbssl"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    LOCAL cString
diff --git a/harbour/contrib/hbssl/tests/test.prg b/harbour/contrib/hbssl/tests/test.prg
index 4abb6f2a17..452d9bb6b8 100644
--- a/harbour/contrib/hbssl/tests/test.prg
+++ b/harbour/contrib/hbssl/tests/test.prg
@@ -9,8 +9,6 @@
 
 #require "hbssl"
 
-#include "simpleio.ch"
-
 #define CRLF Chr( 13 ) + Chr( 10 )
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbtinymt/tests/hbmk.hbm b/harbour/contrib/hbtinymt/tests/hbmk.hbm
index 1ce2fc0001..2cd85ede54 100644
--- a/harbour/contrib/hbtinymt/tests/hbmk.hbm
+++ b/harbour/contrib/hbtinymt/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hbtinymt.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/contrib/hbtinymt/tests/test32.prg b/harbour/contrib/hbtinymt/tests/test32.prg
index 8e17a0622f..0b161aca9b 100644
--- a/harbour/contrib/hbtinymt/tests/test32.prg
+++ b/harbour/contrib/hbtinymt/tests/test32.prg
@@ -9,8 +9,6 @@
 
 #require "hbtinymt"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    SET DECIMAL TO 0
diff --git a/harbour/contrib/hbtinymt/tests/test64.prg b/harbour/contrib/hbtinymt/tests/test64.prg
index 3419078038..fe12e01cbf 100644
--- a/harbour/contrib/hbtinymt/tests/test64.prg
+++ b/harbour/contrib/hbtinymt/tests/test64.prg
@@ -4,8 +4,6 @@
 
 #require "hbtinymt"
 
-#include "simpleio.ch"
-
 PROCEDURE Main()
 
    SET DECIMAL TO 0
diff --git a/harbour/contrib/hbxdiff/tests/hbmk.hbm b/harbour/contrib/hbxdiff/tests/hbmk.hbm
index ba9ea08267..d43004e5ad 100644
--- a/harbour/contrib/hbxdiff/tests/hbmk.hbm
+++ b/harbour/contrib/hbxdiff/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hbxdiff.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/contrib/hbxdiff/tests/test.prg b/harbour/contrib/hbxdiff/tests/test.prg
index 718f57b2a7..db1d2baad7 100644
--- a/harbour/contrib/hbxdiff/tests/test.prg
+++ b/harbour/contrib/hbxdiff/tests/test.prg
@@ -4,8 +4,6 @@
 
 #require "hbxdiff"
 
-#include "simpleio.ch"
-
 #define _SIZE 62
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbxdiff/tests/test2.prg b/harbour/contrib/hbxdiff/tests/test2.prg
index 26ce7c084b..1766a3013f 100644
--- a/harbour/contrib/hbxdiff/tests/test2.prg
+++ b/harbour/contrib/hbxdiff/tests/test2.prg
@@ -5,7 +5,6 @@
 #require "hbxdiff"
 
 #include "fileio.ch"
-#include "simpleio.ch"
 
 PROCEDURE Main()
 
diff --git a/harbour/contrib/hbxdiff/tests/test3.prg b/harbour/contrib/hbxdiff/tests/test3.prg
index 1f28efcc47..e07f1137c8 100644
--- a/harbour/contrib/hbxdiff/tests/test3.prg
+++ b/harbour/contrib/hbxdiff/tests/test3.prg
@@ -4,8 +4,6 @@
 
 #require "hbxdiff"
 
-#include "simpleio.ch"
-
 FUNCTION Diff( ... )
 
    LOCAL e
diff --git a/harbour/contrib/hbziparc/tests/hbmk.hbm b/harbour/contrib/hbziparc/tests/hbmk.hbm
index 737ba8ad3a..0e92c000d1 100644
--- a/harbour/contrib/hbziparc/tests/hbmk.hbm
+++ b/harbour/contrib/hbziparc/tests/hbmk.hbm
@@ -5,3 +5,5 @@
 hbziparc.hbc
 
 -w3 -es2
+
+-u+simpleio.ch
diff --git a/harbour/contrib/hbziparc/tests/unzipa.prg b/harbour/contrib/hbziparc/tests/unzipa.prg
index 744a05c7d5..7e99632eae 100644
--- a/harbour/contrib/hbziparc/tests/unzipa.prg
+++ b/harbour/contrib/hbziparc/tests/unzipa.prg
@@ -4,8 +4,6 @@
 
 #require "hbziparc"
 
-#include "simpleio.ch"
-
 PROCEDURE Main( cZip, ... )
 
    ? hb_UnzipFile( cZip, NIL, .F., NIL, NIL, hb_AParams(), {| x, y | QOut( Str( x / y * 100, 3 ) + "%" ) } )
diff --git a/harbour/contrib/hbziparc/tests/zipa.prg b/harbour/contrib/hbziparc/tests/zipa.prg
index 9b8ce44da7..5a00b2492f 100644
--- a/harbour/contrib/hbziparc/tests/zipa.prg
+++ b/harbour/contrib/hbziparc/tests/zipa.prg
@@ -4,8 +4,6 @@
 
 #require "hbziparc"
 
-#include "simpleio.ch"
-
 PROCEDURE Main( cZip, ... )
 
    LOCAL a, b, c