diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 57b8902775..f0d044c158 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,35 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-23 14:48 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/xhb/hbcompat.ch
+  * include/harbour.hbx
+  * src/debug/debugger.prg
+  * src/rtl/achoice.prg
+  * src/rtl/inkey.c
+  * src/rtl/memoedit.prg
+    + added HB_KEYSETLAST() which is the successor of
+      HB_SETLASTKEY() but renamed to put it into the
+      right namespace. HB_SETLASTKEY() is deprecated
+      and will disappear after the second major release.
+
+  * utils/hbmk2/hbmk2.prg
+    + added interactive keyboard functions to trigger
+      full screen UI in scripts
+
+  * contrib/hbct/tests/*.prg
+    % deleted #include "ct.ch" where it's not used
+    ! added #require "ct.ch" where ct.ch is #included
+
+  * contrib/hbct/tests/csetarge.prg
+    % CLS not needed anymore to force interactive UI
+
+  * contrib/hbfbird/firebird.c
+    ! typo in comment
+
+  * contrib/hbct/tests/math.prg
+    * minor
+
 2012-10-23 12:01 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/include/hbvm.h
   * harbour/src/vm/hvm.c
diff --git a/harbour/contrib/hbct/tests/addascii.prg b/harbour/contrib/hbct/tests/addascii.prg
index 3fec35fb4c..1526ea6a0e 100644
--- a/harbour/contrib/hbct/tests/addascii.prg
+++ b/harbour/contrib/hbct/tests/addascii.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 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 fd6841c5d3..2b17360a2e 100644
--- a/harbour/contrib/hbct/tests/afteratn.prg
+++ b/harbour/contrib/hbct/tests/afteratn.prg
@@ -52,6 +52,8 @@
  *
  */
 
+#require "hbct"
+
 #include "ct.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbct/tests/asciisum.prg b/harbour/contrib/hbct/tests/asciisum.prg
index f1a94c94bc..a9204d5de6 100644
--- a/harbour/contrib/hbct/tests/asciisum.prg
+++ b/harbour/contrib/hbct/tests/asciisum.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/ascpos.prg b/harbour/contrib/hbct/tests/ascpos.prg
index 2fad3c86cb..2afff60eab 100644
--- a/harbour/contrib/hbct/tests/ascpos.prg
+++ b/harbour/contrib/hbct/tests/ascpos.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/atadjust.prg b/harbour/contrib/hbct/tests/atadjust.prg
index 836cdc50d0..d87438f280 100644
--- a/harbour/contrib/hbct/tests/atadjust.prg
+++ b/harbour/contrib/hbct/tests/atadjust.prg
@@ -52,6 +52,8 @@
  *
  */
 
+#require "hbct"
+
 #include "ct.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbct/tests/atnum.prg b/harbour/contrib/hbct/tests/atnum.prg
index cae3a1b7b0..5ff309fb29 100644
--- a/harbour/contrib/hbct/tests/atnum.prg
+++ b/harbour/contrib/hbct/tests/atnum.prg
@@ -52,6 +52,8 @@
  *
  */
 
+#require "hbct"
+
 #include "ct.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbct/tests/atrepl.prg b/harbour/contrib/hbct/tests/atrepl.prg
index ca1625f141..1672953ad0 100644
--- a/harbour/contrib/hbct/tests/atrepl.prg
+++ b/harbour/contrib/hbct/tests/atrepl.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/attoken.prg b/harbour/contrib/hbct/tests/attoken.prg
index 24f2097f7a..e70b4be5f3 100644
--- a/harbour/contrib/hbct/tests/attoken.prg
+++ b/harbour/contrib/hbct/tests/attoken.prg
@@ -56,8 +56,6 @@
    #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    LOCAL cStr := "...This...is...a...test!"
diff --git a/harbour/contrib/hbct/tests/beforatn.prg b/harbour/contrib/hbct/tests/beforatn.prg
index ba2ca64cf9..6812d708c4 100644
--- a/harbour/contrib/hbct/tests/beforatn.prg
+++ b/harbour/contrib/hbct/tests/beforatn.prg
@@ -52,6 +52,8 @@
  *
  */
 
+#require "hbct"
+
 #include "ct.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbct/tests/charadd.prg b/harbour/contrib/hbct/tests/charadd.prg
index ffec336c98..ce1b50ba14 100644
--- a/harbour/contrib/hbct/tests/charadd.prg
+++ b/harbour/contrib/hbct/tests/charadd.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charand.prg b/harbour/contrib/hbct/tests/charand.prg
index 9014bbe3a8..1983aecbf4 100644
--- a/harbour/contrib/hbct/tests/charand.prg
+++ b/harbour/contrib/hbct/tests/charand.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/chareven.prg b/harbour/contrib/hbct/tests/chareven.prg
index 5ab550cb66..ab8c2061e3 100644
--- a/harbour/contrib/hbct/tests/chareven.prg
+++ b/harbour/contrib/hbct/tests/chareven.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charhist.prg b/harbour/contrib/hbct/tests/charhist.prg
index 5bbd2163a3..d6ecf033d3 100644
--- a/harbour/contrib/hbct/tests/charhist.prg
+++ b/harbour/contrib/hbct/tests/charhist.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    LOCAL nTotal := 0
diff --git a/harbour/contrib/hbct/tests/charlist.prg b/harbour/contrib/hbct/tests/charlist.prg
index 2445f83d14..c98681b3e9 100644
--- a/harbour/contrib/hbct/tests/charlist.prg
+++ b/harbour/contrib/hbct/tests/charlist.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charmirr.prg b/harbour/contrib/hbct/tests/charmirr.prg
index b7157d4aaf..9e68da2f52 100644
--- a/harbour/contrib/hbct/tests/charmirr.prg
+++ b/harbour/contrib/hbct/tests/charmirr.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charmix.prg b/harbour/contrib/hbct/tests/charmix.prg
index 9c752c3b48..00f7f0dee3 100644
--- a/harbour/contrib/hbct/tests/charmix.prg
+++ b/harbour/contrib/hbct/tests/charmix.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charnlst.prg b/harbour/contrib/hbct/tests/charnlst.prg
index 2635904470..f0fab51beb 100644
--- a/harbour/contrib/hbct/tests/charnlst.prg
+++ b/harbour/contrib/hbct/tests/charnlst.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charnot.prg b/harbour/contrib/hbct/tests/charnot.prg
index e016ad4365..1e26c2ced6 100644
--- a/harbour/contrib/hbct/tests/charnot.prg
+++ b/harbour/contrib/hbct/tests/charnot.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 #ifndef __HARBOUR__
    #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 c57b50578b..d414fb766c 100644
--- a/harbour/contrib/hbct/tests/charodd.prg
+++ b/harbour/contrib/hbct/tests/charodd.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charone.prg b/harbour/contrib/hbct/tests/charone.prg
index 70fcb7d04b..18400e3ccc 100644
--- a/harbour/contrib/hbct/tests/charone.prg
+++ b/harbour/contrib/hbct/tests/charone.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charonly.prg b/harbour/contrib/hbct/tests/charonly.prg
index d89ee258cd..6d9d19360c 100644
--- a/harbour/contrib/hbct/tests/charonly.prg
+++ b/harbour/contrib/hbct/tests/charonly.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charor.prg b/harbour/contrib/hbct/tests/charor.prg
index f6060f545c..8164bc8591 100644
--- a/harbour/contrib/hbct/tests/charor.prg
+++ b/harbour/contrib/hbct/tests/charor.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charrem.prg b/harbour/contrib/hbct/tests/charrem.prg
index 8530b5add7..a3150ee923 100644
--- a/harbour/contrib/hbct/tests/charrem.prg
+++ b/harbour/contrib/hbct/tests/charrem.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charrepl.prg b/harbour/contrib/hbct/tests/charrepl.prg
index 89e5e7498e..ea5fe175b0 100644
--- a/harbour/contrib/hbct/tests/charrepl.prg
+++ b/harbour/contrib/hbct/tests/charrepl.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charrll.prg b/harbour/contrib/hbct/tests/charrll.prg
index 3a62e9c414..e58774b698 100644
--- a/harbour/contrib/hbct/tests/charrll.prg
+++ b/harbour/contrib/hbct/tests/charrll.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 #ifndef __HARBOUR__
    #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 6eb521f305..c29785ebb9 100644
--- a/harbour/contrib/hbct/tests/charrlr.prg
+++ b/harbour/contrib/hbct/tests/charrlr.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 #ifndef __HARBOUR__
    #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 292e75aa5e..a4ecd1c0c4 100644
--- a/harbour/contrib/hbct/tests/charshl.prg
+++ b/harbour/contrib/hbct/tests/charshl.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 #ifndef __HARBOUR__
    #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 92791463fa..554ead44a6 100644
--- a/harbour/contrib/hbct/tests/charshr.prg
+++ b/harbour/contrib/hbct/tests/charshr.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 #ifndef __HARBOUR__
    #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 f7e5256c29..d5da3a79aa 100644
--- a/harbour/contrib/hbct/tests/charslst.prg
+++ b/harbour/contrib/hbct/tests/charslst.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charsort.prg b/harbour/contrib/hbct/tests/charsort.prg
index 5d4cf485d9..c89e4019d4 100644
--- a/harbour/contrib/hbct/tests/charsort.prg
+++ b/harbour/contrib/hbct/tests/charsort.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charsub.prg b/harbour/contrib/hbct/tests/charsub.prg
index 9f3ea63166..ba467c7f0d 100644
--- a/harbour/contrib/hbct/tests/charsub.prg
+++ b/harbour/contrib/hbct/tests/charsub.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charswap.prg b/harbour/contrib/hbct/tests/charswap.prg
index 8bb8e8d43a..47c9fc33fe 100644
--- a/harbour/contrib/hbct/tests/charswap.prg
+++ b/harbour/contrib/hbct/tests/charswap.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/charxor.prg b/harbour/contrib/hbct/tests/charxor.prg
index a43819a98c..27f62438ef 100644
--- a/harbour/contrib/hbct/tests/charxor.prg
+++ b/harbour/contrib/hbct/tests/charxor.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/csetarge.prg b/harbour/contrib/hbct/tests/csetarge.prg
index 403e6d34f1..09268e53f4 100644
--- a/harbour/contrib/hbct/tests/csetarge.prg
+++ b/harbour/contrib/hbct/tests/csetarge.prg
@@ -52,20 +52,20 @@
  *
  */
 
+#require "hbct"
+
+#include "ct.ch"
+
 #ifndef __HARBOUR__
    #define hb_ntos( n ) LTrim( Str( n ) )
 #endif
 
-#include "ct.ch"
-
-PROCEDURE main
+PROCEDURE Main()
 
    LOCAL cRet, olderr
 
    ctinit()
 
-   CLS
-
    ? "Begin test of CSETARGERR()"
    ?
 
diff --git a/harbour/contrib/hbct/tests/csetatmu.prg b/harbour/contrib/hbct/tests/csetatmu.prg
index 189d3d06b1..fc9cc2afdc 100644
--- a/harbour/contrib/hbct/tests/csetatmu.prg
+++ b/harbour/contrib/hbct/tests/csetatmu.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/csetref.prg b/harbour/contrib/hbct/tests/csetref.prg
index 11de61a800..4640a4c9db 100644
--- a/harbour/contrib/hbct/tests/csetref.prg
+++ b/harbour/contrib/hbct/tests/csetref.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/math.prg b/harbour/contrib/hbct/tests/math.prg
index 3144c0a2fd..9f0c0334af 100644
--- a/harbour/contrib/hbct/tests/math.prg
+++ b/harbour/contrib/hbct/tests/math.prg
@@ -86,6 +86,7 @@ PROCEDURE Main()
    ? "FLOOR( -1.1 ) = -2       // CT3"
    ? Space( 7 ), FLOOR( -1.1 ), "  <-- CT for Harbour"
    ?
+
    WAIT4()
 
    ? "CEILING( 1.9 ) = 2       // CT3"
@@ -114,7 +115,6 @@ PROCEDURE Main()
 
    WAIT4()
 
-
    ? "LOG10( 0.01 ) = -2.00    // CT3"
    ?  Space( 7 ), LOG10( 0.01 ), "  <-- CT for Harbour"
    ?
diff --git a/harbour/contrib/hbct/tests/numtoken.prg b/harbour/contrib/hbct/tests/numtoken.prg
index 0157371120..9e0d384770 100644
--- a/harbour/contrib/hbct/tests/numtoken.prg
+++ b/harbour/contrib/hbct/tests/numtoken.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    LOCAL cStr := ".,.This.,.is.,.a.,.test!"
@@ -65,9 +63,9 @@ PROCEDURE Main()
 
    // Some simple tests
    ? "  Simple tests:"
-   ? [    numtoken("Hello, World!") ==  2 ? ------------------------------> ] + Str( numtoken("Hello, World!" ),2 )
-   ? [    numtoken("This is good. See you! How do you do?",".!?") == 3 ? -> ] + Str( numtoken("This is good. See you! How do you do?",".!?" ),2 )
-   ? [    numtoken("one,,three,four,,six",",",1) ==  6 ? -----------------> ] + Str( numtoken("one,,three,four,,six",",",1 ),2 )
+   ? [    numtoken("Hello, World!") ==  2 ? ------------------------------> ] + Str( numtoken( "Hello, World!" ),2 )
+   ? [    numtoken("This is good. See you! How do you do?",".!?") == 3 ? -> ] + Str( numtoken( "This is good. See you! How do you do?", ".!?" ), 2 )
+   ? [    numtoken("one,,three,four,,six",",",1) ==  6 ? -----------------> ] + Str( numtoken( "one,,three,four,,six", ",", 1 ), 2 )
    ?
 
    ? [  # of tokens in the string "] + cStr + ["]
diff --git a/harbour/contrib/hbct/tests/rangerem.prg b/harbour/contrib/hbct/tests/rangerem.prg
index 02967fee1b..924e28e28b 100644
--- a/harbour/contrib/hbct/tests/rangerem.prg
+++ b/harbour/contrib/hbct/tests/rangerem.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/rangerep.prg b/harbour/contrib/hbct/tests/rangerep.prg
index d47c92b946..00b8b47f89 100644
--- a/harbour/contrib/hbct/tests/rangerep.prg
+++ b/harbour/contrib/hbct/tests/rangerep.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/setatlik.prg b/harbour/contrib/hbct/tests/setatlik.prg
index 2512719625..9f73942ee5 100644
--- a/harbour/contrib/hbct/tests/setatlik.prg
+++ b/harbour/contrib/hbct/tests/setatlik.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    LOCAL cWildcard := " "
diff --git a/harbour/contrib/hbct/tests/strdiff.prg b/harbour/contrib/hbct/tests/strdiff.prg
index 77ba360a70..e00428c5ee 100644
--- a/harbour/contrib/hbct/tests/strdiff.prg
+++ b/harbour/contrib/hbct/tests/strdiff.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/tab.prg b/harbour/contrib/hbct/tests/tab.prg
index 55d3895ba0..1b650496ba 100644
--- a/harbour/contrib/hbct/tests/tab.prg
+++ b/harbour/contrib/hbct/tests/tab.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    LOCAL cStr, nLen
diff --git a/harbour/contrib/hbct/tests/token.prg b/harbour/contrib/hbct/tests/token.prg
index c81e55db8a..409dad6a35 100644
--- a/harbour/contrib/hbct/tests/token.prg
+++ b/harbour/contrib/hbct/tests/token.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 #ifndef __HARBOUR__
    #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 26ef533f41..69ded0b8f2 100644
--- a/harbour/contrib/hbct/tests/token2.prg
+++ b/harbour/contrib/hbct/tests/token2.prg
@@ -60,8 +60,6 @@
  *
  */
 
-#include "ct.ch"
-
 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 a3c0eb224a..c9fca97898 100644
--- a/harbour/contrib/hbct/tests/tokenlow.prg
+++ b/harbour/contrib/hbct/tests/tokenlow.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    LOCAL cStr := ".,.This.,.is.,.a.,.test!"
@@ -68,11 +66,11 @@ PROCEDURE Main()
    ? [   tokenlower("Hello, World, here I am!")       == "hello, world, here i am!" ?]
    ? [                                                -> "] + tokenlower( "Hello, World, here I am!" ) + ["]
    ? [   tokenlower("Hello, World, here I am!",,3)    == "hello, world, here I am!" ?]
-   ? [                                                -> "] + tokenlower( "Hello, World, here I am!",,3 ) + ["]
+   ? [                                                -> "] + tokenlower( "Hello, World, here I am!",, 3 ) + ["]
    ? [   tokenlower("Hello, World, here I am!",",",3) == "hello, World, here I am!" ?]
-   ? [                                                -> "] + tokenlower( "Hello, World, here I am!",",",3 ) + ["]
+   ? [                                                -> "] + tokenlower( "Hello, World, here I am!", ",", 3 ) + ["]
    ? [   tokenlower("Hello, World, here I am!"," W")  == "hello, World, here i am!" ?]
-   ? [                                                -> "] + tokenlower( "Hello, World, here I am!"," W" ) + ["]
+   ? [                                                -> "] + tokenlower( "Hello, World, here I am!", " W" ) + ["]
    ?
 
    ? [  Lowercase the tokens in the string "] + cStr + ["]
diff --git a/harbour/contrib/hbct/tests/tokensep.prg b/harbour/contrib/hbct/tests/tokensep.prg
index 3624bd623a..6b621e6b9e 100644
--- a/harbour/contrib/hbct/tests/tokensep.prg
+++ b/harbour/contrib/hbct/tests/tokensep.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 #ifndef __HARBOUR__
    #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 534b400446..472cd476a9 100644
--- a/harbour/contrib/hbct/tests/tokenupp.prg
+++ b/harbour/contrib/hbct/tests/tokenupp.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    LOCAL cStr := ".,.This.,.is.,.a.,.test!"
@@ -68,11 +66,11 @@ PROCEDURE Main()
    ? [   tokenupper("Hello, world, here I am!")       == "Hello, World, Here I Am!" ?]
    ? [                                                -> "] + tokenupper( "Hello, world, here I am!" ) + ["]
    ? [   tokenupper("Hello, world, here I am!",,3)    == "Hello, World, Here I am!" ?]
-   ? [                                                -> "] + tokenupper( "Hello, world, here I am!",,3 ) + ["]
+   ? [                                                -> "] + tokenupper( "Hello, world, here I am!",, 3 ) + ["]
    ? [   tokenupper("Hello, world, here I am!",",",3) == "Hello, world, here I am!" ?]
-   ? [                                                -> "] + tokenupper( "Hello, world, here I am!",",",3 ) + ["]
+   ? [                                                -> "] + tokenupper( "Hello, world, here I am!", ",", 3 ) + ["]
    ? [   tokenupper("Hello, world, here I am!"," w")  == "Hello, wOrld, Here I Am!" ?]
-   ? [                                                -> "] + tokenupper( "Hello, world, here I am!"," w" ) + ["]
+   ? [                                                -> "] + tokenupper( "Hello, world, here I am!", " w" ) + ["]
    ?
 
    ? [  Uppercase the tokens in the string "] + cStr + ["]
diff --git a/harbour/contrib/hbct/tests/valpos.prg b/harbour/contrib/hbct/tests/valpos.prg
index 6ec29d6f88..cdf4f7302f 100644
--- a/harbour/contrib/hbct/tests/valpos.prg
+++ b/harbour/contrib/hbct/tests/valpos.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordone.prg b/harbour/contrib/hbct/tests/wordone.prg
index 0715fcb04b..a885b569be 100644
--- a/harbour/contrib/hbct/tests/wordone.prg
+++ b/harbour/contrib/hbct/tests/wordone.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordonly.prg b/harbour/contrib/hbct/tests/wordonly.prg
index 370922b64f..897f43877b 100644
--- a/harbour/contrib/hbct/tests/wordonly.prg
+++ b/harbour/contrib/hbct/tests/wordonly.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordrem.prg b/harbour/contrib/hbct/tests/wordrem.prg
index 1b70ae3004..c775b49fe3 100644
--- a/harbour/contrib/hbct/tests/wordrem.prg
+++ b/harbour/contrib/hbct/tests/wordrem.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordrepl.prg b/harbour/contrib/hbct/tests/wordrepl.prg
index efce869341..b2a97c84b8 100644
--- a/harbour/contrib/hbct/tests/wordrepl.prg
+++ b/harbour/contrib/hbct/tests/wordrepl.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbct/tests/wordswap.prg b/harbour/contrib/hbct/tests/wordswap.prg
index f209c6d279..5df57d90c6 100644
--- a/harbour/contrib/hbct/tests/wordswap.prg
+++ b/harbour/contrib/hbct/tests/wordswap.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#include "ct.ch"
-
 PROCEDURE Main()
 
    ctinit()
diff --git a/harbour/contrib/hbfbird/firebird.c b/harbour/contrib/hbfbird/firebird.c
index cc3d3c1f80..0f0502efbf 100644
--- a/harbour/contrib/hbfbird/firebird.c
+++ b/harbour/contrib/hbfbird/firebird.c
@@ -54,7 +54,7 @@
 
 #include <time.h>
 
-/* NOTE: Ugly hack to avoid this error when compiler with BCC 5.8.2 and above:
+/* NOTE: Ugly hack to avoid this error when compiled with BCC 5.8.2 and above:
          Error E2238 C:\...\Firebird-2.1.1\include\ibase.h 82: Multiple declaration for 'intptr_t' */
 #if ( defined( __BORLANDC__ ) && __BORLANDC__ >= 1410 )
    /* Prevent inclusion of <stdint.h> from hbdefs.h */
@@ -464,7 +464,6 @@ HB_FUNC( FBQUERY )
    }
    else
       hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
-
 }
 
 HB_FUNC( FBFETCH )
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
index a0b4832614..8afe774236 100644
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -92,6 +92,7 @@
    #xtranslate hb_libLoad([<x,...>])       => libLoad(<x>)
    #xtranslate hb_libFree([<x,...>])       => libFree(<x>)
    #xtranslate hb_adler32([<x,...>])       => hb_checksum(<x>)
+   #xtranslate hb_keySetLast([<x,...>])    => setLastKey(<x>)
    #xtranslate hb_setLastKey([<x,...>])    => setLastKey(<x>)
    #xtranslate hb_CStr([<x,...>])          => CStr(<x>)
    #xtranslate hb_valToExp([<x,...>])      => ValToPrgExp(<x>)
@@ -359,7 +360,7 @@
    #xtranslate libLoad([<x,...>])              => hb_libLoad(<x>)
    #xtranslate libFree([<x,...>])              => hb_libFree(<x>)
    #xtranslate hb_checksum([<x,...>])          => hb_adler32(<x>)
-   #xtranslate setLastKey([<x,...>])           => hb_setLastKey(<x>)
+   #xtranslate setLastKey([<x,...>])           => hb_keySetLast(<x>)
    #xtranslate CStr([<x,...>])                 => hb_CStr(<x>)
    #xtranslate ValToPrgExp([<x,...>])          => hb_valToExp(<x>)
    #xtranslate SecondsSleep([<x,...>])         => hb_idleSleep(<x>)
diff --git a/harbour/include/harbour.hbx b/harbour/include/harbour.hbx
index aa1b312ccf..3d1c7aa8ed 100644
--- a/harbour/include/harbour.hbx
+++ b/harbour/include/harbour.hbx
@@ -639,6 +639,7 @@ DYNAMIC hb_keyIns
 DYNAMIC hb_keyLast
 DYNAMIC hb_keyNext
 DYNAMIC hb_keyPut
+DYNAMIC hb_keySetLast
 DYNAMIC hb_keyStd
 DYNAMIC hb_langErrMsg
 DYNAMIC hb_langMessage
diff --git a/harbour/src/debug/debugger.prg b/harbour/src/debug/debugger.prg
index 3547eebb49..6d30d23dec 100644
--- a/harbour/src/debug/debugger.prg
+++ b/harbour/src/debug/debugger.prg
@@ -2185,7 +2185,7 @@ METHOD RestoreAppState() CLASS HBDebugger
    Set( _SET_DIRCASE, ::nAppDirCase )
    Set( _SET_FILECASE, ::nAppFileCase )
    Set( _SET_TYPEAHEAD, ::nAppTypeAhead )
-   hb_SetLastKey( ::nAppLastKey )
+   hb_keySetLast( ::nAppLastKey )
    RETURN NIL
 
 
diff --git a/harbour/src/rtl/achoice.prg b/harbour/src/rtl/achoice.prg
index 51778dcc15..3209b678b1 100644
--- a/harbour/src/rtl/achoice.prg
+++ b/harbour/src/rtl/achoice.prg
@@ -154,7 +154,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo
 
          Eval( bAction, ProcName( 1 ), ProcLine( 1 ), "" )
          IF Empty( NextKey() )
-            hb_setLastKey( 255 )
+            hb_keySetLast( 255 )
             nKey := 0
          ENDIF
 
diff --git a/harbour/src/rtl/inkey.c b/harbour/src/rtl/inkey.c
index 9bdb5db5ee..df3499463f 100644
--- a/harbour/src/rtl/inkey.c
+++ b/harbour/src/rtl/inkey.c
@@ -214,12 +214,18 @@ HB_FUNC( LASTKEY )
    hb_retni( hb_inkeyLast( HB_INKEY_ALL ) );
 }
 
-HB_FUNC( HB_SETLASTKEY )
+HB_FUNC( HB_KEYSETLAST )
 {
    if( HB_ISNUM( 1 ) )
       hb_retni( hb_inkeySetLast( hb_parni( 1 ) ) );
 }
 
+#if defined( HB_LEGACY_LEVEL5 )
+
+HB_FUNC_TRANSLATE( HB_SETLASTKEY, HB_KEYSETLAST )
+
+#endif
+
 HB_FUNC( HB_KEYCODE )
 {
    const char * szValue = hb_parc( 1 );
diff --git a/harbour/src/rtl/memoedit.prg b/harbour/src/rtl/memoedit.prg
index 1f2207ac80..2e1437dc52 100644
--- a/harbour/src/rtl/memoedit.prg
+++ b/harbour/src/rtl/memoedit.prg
@@ -172,7 +172,7 @@ METHOD KeyboardHook( nKey ) CLASS HBMemoEditor
             SetPos( nRow, nCol )
 
             IF nYesNoKey == Asc( "Y" ) .OR. nYesNoKey == Asc( "y" )
-               hb_SetLastKey( K_ESC ) /* Cl*pper compatibility */
+               hb_keySetLast( K_ESC ) /* Cl*pper compatibility */
                ::lSaved := .F.
                ::lExitEdit := .T.
             ENDIF
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 1101504c45..faf0fc98c7 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -13243,7 +13243,7 @@ STATIC FUNCTION __hbshell_win_reg_app( lRegister, lAllUser, cAppPath )
 /* List of Harbour RTL function typically used in
    a full-screen CUI ("interactive") app */
 STATIC FUNCTION __hbshell_detect_CUI_extern_positive()
-   RETURN {;
+   RETURN { ;
       "COL"               => NIL ,;
       "DISPBEGIN"         => NIL ,;
       "DISPBOX"           => NIL ,;
@@ -13255,18 +13255,27 @@ STATIC FUNCTION __hbshell_detect_CUI_extern_positive()
       "HB_DISPBOX"        => NIL ,;
       "HB_DISPOUTAT"      => NIL ,;
       "HB_DISPOUTATBOX"   => NIL ,;
+      "HB_KEYCLEAR"       => NIL ,;
+      "HB_KEYINS"         => NIL ,;
+      "HB_KEYLAST"        => NIL ,;
+      "HB_KEYNEXT"        => NIL ,;
+      "HB_KEYPUT"         => NIL ,;
+      "HB_KEYSETLAST"     => NIL ,;
+      "HB_KEYSTD"         => NIL ,;
+      "HB_MGETBOUNDS"     => NIL ,;
+      "HB_MMIDDLEDOWN"    => NIL ,;
       "HB_SCRMAXCOL"      => NIL ,;
       "HB_SCRMAXROW"      => NIL ,;
       "HB_SCROLL"         => NIL ,;
       "HB_SHADOW"         => NIL ,;
+      "INKEY"             => NIL ,;
+      "LASTKEY"           => NIL ,;
       "MAXCOL"            => NIL ,;
       "MAXROW"            => NIL ,;
-      "HB_MMIDDLEDOWN"    => NIL ,;
       "MCOL"              => NIL ,;
       "MDBLCLK"           => NIL ,;
       "MHIDE"             => NIL ,;
       "MLEFTDOWN"         => NIL ,;
-      "MMIDDLEDOWN"       => NIL ,;
       "MPRESENT"          => NIL ,;
       "MRESTSTATE"        => NIL ,;
       "MRIGHTDOWN"        => NIL ,;
@@ -13276,6 +13285,7 @@ STATIC FUNCTION __hbshell_detect_CUI_extern_positive()
       "MSETCURSOR"        => NIL ,;
       "MSETPOS"           => NIL ,;
       "MSHOW"             => NIL ,;
+      "NEXTKEY"           => NIL ,;
       "RESTSCREEN"        => NIL ,;
       "ROW"               => NIL ,;
       "SAVESCREEN"        => NIL ,;