diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3b8d02599c..c72612b71a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -10,6 +10,27 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-20 16:32 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbct/tests/*.prg
+  * contrib/hbnetio/tests/*.prg
+  * contrib/hbwin/tests/dlg.prg
+  * contrib/hbwin/tests/oletst1.prg
+  * contrib/hbwin/tests/oletst2.prg
+  * contrib/hbwin/tests/oletst3.prg
+  * contrib/hbwin/tests/oletst4.prg
+  * contrib/hbwin/tests/pdfcreat.prg
+  * contrib/hbwin/tests/testdir.prg
+  * contrib/hbwin/tests/testole.prg
+  * contrib/hbwin/tests/testprn2.prg
+  * contrib/hbwin/tests/testprn3.prg
+  * contrib/hbwin/tests/testprn4.prg
+  * contrib/hbwin/tests/testrpc.prg
+  * contrib/hbwin/tests/testwmtx.prg
+    + added #require directives
+      (only needed when hbrun doesn't have these loaded
+      by default)
+    ! hbct tests now allow again to run under Clipper
+
 2012-11-20 12:57 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbtpathy/hbtpathy.hbp
   * contrib/hbtpathy/telepath.prg
diff --git a/harbour/contrib/hbct/tests/addascii.prg b/harbour/contrib/hbct/tests/addascii.prg
index 69f67a145b..3e0a4b07ff 100644
--- a/harbour/contrib/hbct/tests/addascii.prg
+++ b/harbour/contrib/hbct/tests/addascii.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL cStr := "This is a test!"
diff --git a/harbour/contrib/hbct/tests/afteratn.prg b/harbour/contrib/hbct/tests/afteratn.prg
index 2cea270cfb..90f50072b8 100644
--- a/harbour/contrib/hbct/tests/afteratn.prg
+++ b/harbour/contrib/hbct/tests/afteratn.prg
@@ -52,7 +52,9 @@
  *
  */
 
+#ifdef __HARBOUR__
 #require "hbct"
+#endif
 
 #include "ct.ch"
 
diff --git a/harbour/contrib/hbct/tests/asciisum.prg b/harbour/contrib/hbct/tests/asciisum.prg
index ad8b2c9ef0..32eaf29d31 100644
--- a/harbour/contrib/hbct/tests/asciisum.prg
+++ b/harbour/contrib/hbct/tests/asciisum.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/ascpos.prg b/harbour/contrib/hbct/tests/ascpos.prg
index e87d61b24d..948085e36b 100644
--- a/harbour/contrib/hbct/tests/ascpos.prg
+++ b/harbour/contrib/hbct/tests/ascpos.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/atadjust.prg b/harbour/contrib/hbct/tests/atadjust.prg
index 6bc074e4cc..fc369bdf43 100644
--- a/harbour/contrib/hbct/tests/atadjust.prg
+++ b/harbour/contrib/hbct/tests/atadjust.prg
@@ -52,7 +52,9 @@
  *
  */
 
+#ifdef __HARBOUR__
 #require "hbct"
+#endif
 
 #include "ct.ch"
 
diff --git a/harbour/contrib/hbct/tests/atnum.prg b/harbour/contrib/hbct/tests/atnum.prg
index 5bb6dfd7bb..9be176629b 100644
--- a/harbour/contrib/hbct/tests/atnum.prg
+++ b/harbour/contrib/hbct/tests/atnum.prg
@@ -52,7 +52,9 @@
  *
  */
 
+#ifdef __HARBOUR__
 #require "hbct"
+#endif
 
 #include "ct.ch"
 
diff --git a/harbour/contrib/hbct/tests/atrepl.prg b/harbour/contrib/hbct/tests/atrepl.prg
index f2dbb536d3..be30f2211f 100644
--- a/harbour/contrib/hbct/tests/atrepl.prg
+++ b/harbour/contrib/hbct/tests/atrepl.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/attoken.prg b/harbour/contrib/hbct/tests/attoken.prg
index af887877ef..555193fc9b 100644
--- a/harbour/contrib/hbct/tests/attoken.prg
+++ b/harbour/contrib/hbct/tests/attoken.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/beforatn.prg b/harbour/contrib/hbct/tests/beforatn.prg
index 82de9c12af..074f093004 100644
--- a/harbour/contrib/hbct/tests/beforatn.prg
+++ b/harbour/contrib/hbct/tests/beforatn.prg
@@ -52,7 +52,9 @@
  *
  */
 
+#ifdef __HARBOUR__
 #require "hbct"
+#endif
 
 #include "ct.ch"
 
diff --git a/harbour/contrib/hbct/tests/charadd.prg b/harbour/contrib/hbct/tests/charadd.prg
index 712be00013..c897cfc8b8 100644
--- a/harbour/contrib/hbct/tests/charadd.prg
+++ b/harbour/contrib/hbct/tests/charadd.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charand.prg b/harbour/contrib/hbct/tests/charand.prg
index 5f05b0488a..94e18f20a0 100644
--- a/harbour/contrib/hbct/tests/charand.prg
+++ b/harbour/contrib/hbct/tests/charand.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/chareven.prg b/harbour/contrib/hbct/tests/chareven.prg
index fa41639bb3..a80fa85801 100644
--- a/harbour/contrib/hbct/tests/chareven.prg
+++ b/harbour/contrib/hbct/tests/chareven.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charhist.prg b/harbour/contrib/hbct/tests/charhist.prg
index b871be6e0f..6f4f359edd 100644
--- a/harbour/contrib/hbct/tests/charhist.prg
+++ b/harbour/contrib/hbct/tests/charhist.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL nTotal := 0
diff --git a/harbour/contrib/hbct/tests/charlist.prg b/harbour/contrib/hbct/tests/charlist.prg
index af9004f299..db86091ee7 100644
--- a/harbour/contrib/hbct/tests/charlist.prg
+++ b/harbour/contrib/hbct/tests/charlist.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charmirr.prg b/harbour/contrib/hbct/tests/charmirr.prg
index f39bde942f..ae75771c77 100644
--- a/harbour/contrib/hbct/tests/charmirr.prg
+++ b/harbour/contrib/hbct/tests/charmirr.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charmix.prg b/harbour/contrib/hbct/tests/charmix.prg
index e56363f114..0612bbd3cd 100644
--- a/harbour/contrib/hbct/tests/charmix.prg
+++ b/harbour/contrib/hbct/tests/charmix.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charnlst.prg b/harbour/contrib/hbct/tests/charnlst.prg
index 5001eac986..be1b0328da 100644
--- a/harbour/contrib/hbct/tests/charnlst.prg
+++ b/harbour/contrib/hbct/tests/charnlst.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charnot.prg b/harbour/contrib/hbct/tests/charnot.prg
index 19647c0cee..58d0f8a4b5 100644
--- a/harbour/contrib/hbct/tests/charnot.prg
+++ b/harbour/contrib/hbct/tests/charnot.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/charodd.prg b/harbour/contrib/hbct/tests/charodd.prg
index b015197bfe..9c651797b5 100644
--- a/harbour/contrib/hbct/tests/charodd.prg
+++ b/harbour/contrib/hbct/tests/charodd.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charone.prg b/harbour/contrib/hbct/tests/charone.prg
index 8910cb48d8..c1a7fc241f 100644
--- a/harbour/contrib/hbct/tests/charone.prg
+++ b/harbour/contrib/hbct/tests/charone.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charonly.prg b/harbour/contrib/hbct/tests/charonly.prg
index 49ffa4964b..94ec8b465d 100644
--- a/harbour/contrib/hbct/tests/charonly.prg
+++ b/harbour/contrib/hbct/tests/charonly.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charor.prg b/harbour/contrib/hbct/tests/charor.prg
index f40975ea86..9691628689 100644
--- a/harbour/contrib/hbct/tests/charor.prg
+++ b/harbour/contrib/hbct/tests/charor.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charrem.prg b/harbour/contrib/hbct/tests/charrem.prg
index 2e24701d09..a0a722bd42 100644
--- a/harbour/contrib/hbct/tests/charrem.prg
+++ b/harbour/contrib/hbct/tests/charrem.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charrepl.prg b/harbour/contrib/hbct/tests/charrepl.prg
index a784428d4b..fb6d6859b6 100644
--- a/harbour/contrib/hbct/tests/charrepl.prg
+++ b/harbour/contrib/hbct/tests/charrepl.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charrll.prg b/harbour/contrib/hbct/tests/charrll.prg
index 9586300233..2da02e7007 100644
--- a/harbour/contrib/hbct/tests/charrll.prg
+++ b/harbour/contrib/hbct/tests/charrll.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/charrlr.prg b/harbour/contrib/hbct/tests/charrlr.prg
index abda7c5e05..895fe2f9bc 100644
--- a/harbour/contrib/hbct/tests/charrlr.prg
+++ b/harbour/contrib/hbct/tests/charrlr.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/charshl.prg b/harbour/contrib/hbct/tests/charshl.prg
index 7f77fc9ae3..1837eda854 100644
--- a/harbour/contrib/hbct/tests/charshl.prg
+++ b/harbour/contrib/hbct/tests/charshl.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/charshr.prg b/harbour/contrib/hbct/tests/charshr.prg
index 5fb2ff6543..d5b3d3322f 100644
--- a/harbour/contrib/hbct/tests/charshr.prg
+++ b/harbour/contrib/hbct/tests/charshr.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/charslst.prg b/harbour/contrib/hbct/tests/charslst.prg
index 65791d242f..0c0ae5c0f6 100644
--- a/harbour/contrib/hbct/tests/charslst.prg
+++ b/harbour/contrib/hbct/tests/charslst.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charsort.prg b/harbour/contrib/hbct/tests/charsort.prg
index 027f224a8c..460e9cc5fe 100644
--- a/harbour/contrib/hbct/tests/charsort.prg
+++ b/harbour/contrib/hbct/tests/charsort.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charsub.prg b/harbour/contrib/hbct/tests/charsub.prg
index 09cc4f7e93..a4974b5bd3 100644
--- a/harbour/contrib/hbct/tests/charsub.prg
+++ b/harbour/contrib/hbct/tests/charsub.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charswap.prg b/harbour/contrib/hbct/tests/charswap.prg
index de95f3b597..6b5230c457 100644
--- a/harbour/contrib/hbct/tests/charswap.prg
+++ b/harbour/contrib/hbct/tests/charswap.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charxor.prg b/harbour/contrib/hbct/tests/charxor.prg
index 72872154d9..9c514359e7 100644
--- a/harbour/contrib/hbct/tests/charxor.prg
+++ b/harbour/contrib/hbct/tests/charxor.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/csetarge.prg b/harbour/contrib/hbct/tests/csetarge.prg
index e2326ff304..b9eb5f6fe4 100644
--- a/harbour/contrib/hbct/tests/csetarge.prg
+++ b/harbour/contrib/hbct/tests/csetarge.prg
@@ -52,14 +52,14 @@
  *
  */
 
+#ifdef __HARBOUR__
 #require "hbct"
-
-#include "ct.ch"
-
-#ifndef __HARBOUR__
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
+#include "ct.ch"
+
 PROCEDURE Main()
 
    LOCAL cRet, olderr
diff --git a/harbour/contrib/hbct/tests/csetatmu.prg b/harbour/contrib/hbct/tests/csetatmu.prg
index f5f85aa9c4..d724254976 100644
--- a/harbour/contrib/hbct/tests/csetatmu.prg
+++ b/harbour/contrib/hbct/tests/csetatmu.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/csetref.prg b/harbour/contrib/hbct/tests/csetref.prg
index abbb94ccbc..7c569f76bc 100644
--- a/harbour/contrib/hbct/tests/csetref.prg
+++ b/harbour/contrib/hbct/tests/csetref.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/ctwtest.prg b/harbour/contrib/hbct/tests/ctwtest.prg
index de06ad5e9e..ec9dc8d47b 100644
--- a/harbour/contrib/hbct/tests/ctwtest.prg
+++ b/harbour/contrib/hbct/tests/ctwtest.prg
@@ -10,6 +10,10 @@
  * Donated to the public domain on 2006-02-11 by Przemyslaw Czerpak
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 #include "inkey.ch"
 #include "setcurs.ch"
 
diff --git a/harbour/contrib/hbct/tests/dates4.prg b/harbour/contrib/hbct/tests/dates4.prg
index e7e18ccb5a..ac6bffcaa4 100644
--- a/harbour/contrib/hbct/tests/dates4.prg
+++ b/harbour/contrib/hbct/tests/dates4.prg
@@ -2,6 +2,10 @@
  * $Id$
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 // Testing Harbour dates management.
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbct/tests/datetime.prg b/harbour/contrib/hbct/tests/datetime.prg
index 4690d2bd36..0c516a7a2f 100644
--- a/harbour/contrib/hbct/tests/datetime.prg
+++ b/harbour/contrib/hbct/tests/datetime.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 #include "inkey.ch"
 #include "setcurs.ch"
 
diff --git a/harbour/contrib/hbct/tests/expomant.prg b/harbour/contrib/hbct/tests/expomant.prg
index bb857fce1e..c487bbbd42 100644
--- a/harbour/contrib/hbct/tests/expomant.prg
+++ b/harbour/contrib/hbct/tests/expomant.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL n
diff --git a/harbour/contrib/hbct/tests/finan.prg b/harbour/contrib/hbct/tests/finan.prg
index 6f17872ca9..3f5a34d105 100644
--- a/harbour/contrib/hbct/tests/finan.prg
+++ b/harbour/contrib/hbct/tests/finan.prg
@@ -54,6 +54,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/math.prg b/harbour/contrib/hbct/tests/math.prg
index 864b718d96..b4a4ee82db 100644
--- a/harbour/contrib/hbct/tests/math.prg
+++ b/harbour/contrib/hbct/tests/math.prg
@@ -54,6 +54,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/num1.prg b/harbour/contrib/hbct/tests/num1.prg
index 28976c3fa7..56a8a63597 100644
--- a/harbour/contrib/hbct/tests/num1.prg
+++ b/harbour/contrib/hbct/tests/num1.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/numline.prg b/harbour/contrib/hbct/tests/numline.prg
index 01955ba5d7..6524deab01 100644
--- a/harbour/contrib/hbct/tests/numline.prg
+++ b/harbour/contrib/hbct/tests/numline.prg
@@ -10,6 +10,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 #include "simpleio.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbct/tests/numtoken.prg b/harbour/contrib/hbct/tests/numtoken.prg
index 7ec36dd3a4..3f9a60222c 100644
--- a/harbour/contrib/hbct/tests/numtoken.prg
+++ b/harbour/contrib/hbct/tests/numtoken.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL cStr := ".,.This.,.is.,.a.,.test!"
diff --git a/harbour/contrib/hbct/tests/rangerem.prg b/harbour/contrib/hbct/tests/rangerem.prg
index 9f75af3a53..1835b8fa53 100644
--- a/harbour/contrib/hbct/tests/rangerem.prg
+++ b/harbour/contrib/hbct/tests/rangerem.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/rangerep.prg b/harbour/contrib/hbct/tests/rangerep.prg
index 7fe1f82498..765b0050c1 100644
--- a/harbour/contrib/hbct/tests/rangerep.prg
+++ b/harbour/contrib/hbct/tests/rangerep.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/setatlik.prg b/harbour/contrib/hbct/tests/setatlik.prg
index 63dc4e8ed7..5ab500af28 100644
--- a/harbour/contrib/hbct/tests/setatlik.prg
+++ b/harbour/contrib/hbct/tests/setatlik.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL cWildcard := " "
diff --git a/harbour/contrib/hbct/tests/strdiff.prg b/harbour/contrib/hbct/tests/strdiff.prg
index 5c3089c244..e81eb4905d 100644
--- a/harbour/contrib/hbct/tests/strdiff.prg
+++ b/harbour/contrib/hbct/tests/strdiff.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/tab.prg b/harbour/contrib/hbct/tests/tab.prg
index 573910606e..bda2111ef9 100644
--- a/harbour/contrib/hbct/tests/tab.prg
+++ b/harbour/contrib/hbct/tests/tab.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL cStr, nLen
diff --git a/harbour/contrib/hbct/tests/token.prg b/harbour/contrib/hbct/tests/token.prg
index a5dcce39f9..d4c40be1ce 100644
--- a/harbour/contrib/hbct/tests/token.prg
+++ b/harbour/contrib/hbct/tests/token.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/token2.prg b/harbour/contrib/hbct/tests/token2.prg
index 5a98adcd24..1934c4538a 100644
--- a/harbour/contrib/hbct/tests/token2.prg
+++ b/harbour/contrib/hbct/tests/token2.prg
@@ -60,6 +60,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL cStr1 := "A,BB,CCC,DDDD,EEEEE,FFFFFF"
diff --git a/harbour/contrib/hbct/tests/tokenlow.prg b/harbour/contrib/hbct/tests/tokenlow.prg
index 5a075f9a25..281b8f49a1 100644
--- a/harbour/contrib/hbct/tests/tokenlow.prg
+++ b/harbour/contrib/hbct/tests/tokenlow.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL cStr := ".,.This.,.is.,.a.,.test!"
diff --git a/harbour/contrib/hbct/tests/tokensep.prg b/harbour/contrib/hbct/tests/tokensep.prg
index 8d17b2cfd2..c3c8ddf809 100644
--- a/harbour/contrib/hbct/tests/tokensep.prg
+++ b/harbour/contrib/hbct/tests/tokensep.prg
@@ -52,7 +52,9 @@
  *
  */
 
-#ifndef __HARBOUR__
+#ifdef __HARBOUR__
+#require "hbct"
+#else
 #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
diff --git a/harbour/contrib/hbct/tests/tokenupp.prg b/harbour/contrib/hbct/tests/tokenupp.prg
index 6a71a862b0..c1dbbbc0ab 100644
--- a/harbour/contrib/hbct/tests/tokenupp.prg
+++ b/harbour/contrib/hbct/tests/tokenupp.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL cStr := ".,.This.,.is.,.a.,.test!"
diff --git a/harbour/contrib/hbct/tests/trig.prg b/harbour/contrib/hbct/tests/trig.prg
index d7b88a451c..1a7bc86848 100644
--- a/harbour/contrib/hbct/tests/trig.prg
+++ b/harbour/contrib/hbct/tests/trig.prg
@@ -61,6 +61,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    LOCAL X, Y
diff --git a/harbour/contrib/hbct/tests/valpos.prg b/harbour/contrib/hbct/tests/valpos.prg
index 2bd063934f..875c8cd32c 100644
--- a/harbour/contrib/hbct/tests/valpos.prg
+++ b/harbour/contrib/hbct/tests/valpos.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordone.prg b/harbour/contrib/hbct/tests/wordone.prg
index efb8052f2e..b10fef8a0c 100644
--- a/harbour/contrib/hbct/tests/wordone.prg
+++ b/harbour/contrib/hbct/tests/wordone.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordonly.prg b/harbour/contrib/hbct/tests/wordonly.prg
index 14bf21ac6f..2d6bb6cbd2 100644
--- a/harbour/contrib/hbct/tests/wordonly.prg
+++ b/harbour/contrib/hbct/tests/wordonly.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordrem.prg b/harbour/contrib/hbct/tests/wordrem.prg
index cd0c17396a..e3b503ecee 100644
--- a/harbour/contrib/hbct/tests/wordrem.prg
+++ b/harbour/contrib/hbct/tests/wordrem.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordrepl.prg b/harbour/contrib/hbct/tests/wordrepl.prg
index 3ca81f7fa8..e87f3bbf13 100644
--- a/harbour/contrib/hbct/tests/wordrepl.prg
+++ b/harbour/contrib/hbct/tests/wordrepl.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordswap.prg b/harbour/contrib/hbct/tests/wordswap.prg
index 2886e73a97..a3dd96aa1b 100644
--- a/harbour/contrib/hbct/tests/wordswap.prg
+++ b/harbour/contrib/hbct/tests/wordswap.prg
@@ -52,6 +52,10 @@
  *
  */
 
+#ifdef __HARBOUR__
+#require "hbct"
+#endif
+
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbnetio/tests/netiomt1.prg b/harbour/contrib/hbnetio/tests/netiomt1.prg
index 7f075631de..9986e43012 100644
--- a/harbour/contrib/hbnetio/tests/netiomt1.prg
+++ b/harbour/contrib/hbnetio/tests/netiomt1.prg
@@ -11,6 +11,8 @@
  *
  */
 
+#require "hbnetio"
+
 #define NETSERVER  "127.0.0.1"
 #define NETPORT    2940
 #define NETPASSWD  "toptopsecret"
diff --git a/harbour/contrib/hbnetio/tests/netiot02.prg b/harbour/contrib/hbnetio/tests/netiot02.prg
index 88659c57f6..eded5547b7 100644
--- a/harbour/contrib/hbnetio/tests/netiot02.prg
+++ b/harbour/contrib/hbnetio/tests/netiot02.prg
@@ -11,6 +11,7 @@
  *
  */
 
+#require "hbnetio"
 
 /* to execute this code run server (netiosrv) on the same machine
  * with support for RPC and "topsecret" password, i.e.:
diff --git a/harbour/contrib/hbnetio/tests/netiot03.prg b/harbour/contrib/hbnetio/tests/netiot03.prg
index 6b615742f1..538147ae5d 100644
--- a/harbour/contrib/hbnetio/tests/netiot03.prg
+++ b/harbour/contrib/hbnetio/tests/netiot03.prg
@@ -12,6 +12,8 @@
  *
  */
 
+#require "hbnetio"
+
 /* net:127.0.0.1:2941:topsecret:data/_tst_ */
 
 #define DBSERVER  "127.0.0.1"
diff --git a/harbour/contrib/hbnetio/tests/netiotst.prg b/harbour/contrib/hbnetio/tests/netiotst.prg
index 2d618ea8a5..6cee1d1680 100644
--- a/harbour/contrib/hbnetio/tests/netiotst.prg
+++ b/harbour/contrib/hbnetio/tests/netiotst.prg
@@ -12,6 +12,8 @@
  *
  */
 
+#require "hbnetio"
+
 /* net:127.0.0.1:2941:topsecret:data/_tst_ */
 
 #define DBSERVER  "127.0.0.1"
diff --git a/harbour/contrib/hbwin/tests/dlg.prg b/harbour/contrib/hbwin/tests/dlg.prg
index ef655e0903..0c854ee94a 100644
--- a/harbour/contrib/hbwin/tests/dlg.prg
+++ b/harbour/contrib/hbwin/tests/dlg.prg
@@ -9,6 +9,8 @@
  * 2010/06/10 - 00:16:41 - [vailtom]
  */
 
+#require "hbwin"
+
 // Some constants
 #define IDD_DIALOG1                        101
 #define IDC_BUTTON1                        4001
diff --git a/harbour/contrib/hbwin/tests/oletst1.prg b/harbour/contrib/hbwin/tests/oletst1.prg
index 0ccf692680..66425c6666 100644
--- a/harbour/contrib/hbwin/tests/oletst1.prg
+++ b/harbour/contrib/hbwin/tests/oletst1.prg
@@ -11,6 +11,8 @@
  *
  */
 
+#require "hbwin"
+
 #define NETSERVER  "127.0.0.1"
 #define NETPORT    2941
 #define NETPASSWD  "topsecret"
diff --git a/harbour/contrib/hbwin/tests/oletst2.prg b/harbour/contrib/hbwin/tests/oletst2.prg
index 88d7aa9afb..ee77003fad 100644
--- a/harbour/contrib/hbwin/tests/oletst2.prg
+++ b/harbour/contrib/hbwin/tests/oletst2.prg
@@ -12,6 +12,8 @@
  * www - http://harbour-project.org
  */
 
+#require "hbwin"
+
 PROCEDURE Main()
 
    LOCAL oObject
diff --git a/harbour/contrib/hbwin/tests/oletst3.prg b/harbour/contrib/hbwin/tests/oletst3.prg
index 7e1da666ff..8ce6499ecf 100644
--- a/harbour/contrib/hbwin/tests/oletst3.prg
+++ b/harbour/contrib/hbwin/tests/oletst3.prg
@@ -11,6 +11,8 @@
  *    above WWW page.
  */
 
+#require "hbwin"
+
 PROCEDURE Main()
 
    LOCAL oObject
diff --git a/harbour/contrib/hbwin/tests/oletst4.prg b/harbour/contrib/hbwin/tests/oletst4.prg
index 633e5ce679..fe14d06581 100644
--- a/harbour/contrib/hbwin/tests/oletst4.prg
+++ b/harbour/contrib/hbwin/tests/oletst4.prg
@@ -12,6 +12,8 @@
  * www - http://harbour-project.org
  */
 
+#require "hbwin"
+
 PROCEDURE Main()
 
    LOCAL oObject, oTime, oInfo
diff --git a/harbour/contrib/hbwin/tests/pdfcreat.prg b/harbour/contrib/hbwin/tests/pdfcreat.prg
index 7651d3d20b..7a71cb1e4e 100644
--- a/harbour/contrib/hbwin/tests/pdfcreat.prg
+++ b/harbour/contrib/hbwin/tests/pdfcreat.prg
@@ -20,6 +20,8 @@
  *
  */
 
+#require "hbwin"
+
 PROCEDURE Main()
 
    LOCAL oPC, nTime, cDefaultPrinter, cFilename, oPrinter, nEvent := 0
diff --git a/harbour/contrib/hbwin/tests/testdir.prg b/harbour/contrib/hbwin/tests/testdir.prg
index 4d2977ede4..0285662e72 100644
--- a/harbour/contrib/hbwin/tests/testdir.prg
+++ b/harbour/contrib/hbwin/tests/testdir.prg
@@ -10,6 +10,8 @@
  *
  */
 
+#require "hbwin"
+
 #include "simpleio.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbwin/tests/testole.prg b/harbour/contrib/hbwin/tests/testole.prg
index 1ff2711091..13f6365519 100644
--- a/harbour/contrib/hbwin/tests/testole.prg
+++ b/harbour/contrib/hbwin/tests/testole.prg
@@ -16,6 +16,8 @@
  *
  */
 
+#require "hbwin"
+
 PROCEDURE Main()
 
    LOCAL nOption
diff --git a/harbour/contrib/hbwin/tests/testprn2.prg b/harbour/contrib/hbwin/tests/testprn2.prg
index 84e02373d3..e000513dca 100644
--- a/harbour/contrib/hbwin/tests/testprn2.prg
+++ b/harbour/contrib/hbwin/tests/testprn2.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbwin"
+
 PROCEDURE Main()
 
    LOCAL nPrn := 1
diff --git a/harbour/contrib/hbwin/tests/testprn3.prg b/harbour/contrib/hbwin/tests/testprn3.prg
index e17453545b..91f3da9448 100644
--- a/harbour/contrib/hbwin/tests/testprn3.prg
+++ b/harbour/contrib/hbwin/tests/testprn3.prg
@@ -10,6 +10,8 @@
  *
  */
 
+#require "hbwin"
+
 #include "simpleio.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbwin/tests/testprn4.prg b/harbour/contrib/hbwin/tests/testprn4.prg
index 8d94f23962..9830e42c17 100644
--- a/harbour/contrib/hbwin/tests/testprn4.prg
+++ b/harbour/contrib/hbwin/tests/testprn4.prg
@@ -10,6 +10,8 @@
  *
  */
 
+#require "hbwin"
+
 #include "simpleio.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbwin/tests/testrpc.prg b/harbour/contrib/hbwin/tests/testrpc.prg
index d87ff80c8a..f0e601633d 100644
--- a/harbour/contrib/hbwin/tests/testrpc.prg
+++ b/harbour/contrib/hbwin/tests/testrpc.prg
@@ -10,6 +10,8 @@
  *
  */
 
+#require "hbwin"
+
 #include "simpleio.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbwin/tests/testwmtx.prg b/harbour/contrib/hbwin/tests/testwmtx.prg
index 36a593893c..6ba93a08a8 100644
--- a/harbour/contrib/hbwin/tests/testwmtx.prg
+++ b/harbour/contrib/hbwin/tests/testwmtx.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbwin"
+
 STATIC s_hMutex
 
 PROCEDURE Main()