diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 073ce31f0e..a278efe7b6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-02 04:07 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbnf/dispc.c
+    + added TOFIX (needs to be updated for unicode savescreen buffers)
+
+  * contrib/hbnf/menu1.prg
+    ! use inkey.ch constants
+
+  * contrib/hbnf/pickday.prg
+    * comment
+
+  * contrib/hbnf/tests/*.prg
+    + added '#require "hbnf"' so they all work as hbrun scripts now.
+      pretty cool.
+    * Added CLS calls for few files to force CUI mode.
+
 2012-10-02 03:33 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     * minor code cleanup by using macros for special dirs
diff --git a/harbour/contrib/hbnf/dispc.c b/harbour/contrib/hbnf/dispc.c
index 6ca4a1c312..b3db7cafd2 100644
--- a/harbour/contrib/hbnf/dispc.c
+++ b/harbour/contrib/hbnf/dispc.c
@@ -50,6 +50,8 @@
  *
  */
 
+/* TOFIX: for unicode savescreen buffers */
+
 #include "hbapi.h"
 #include "hbapifs.h"
 #include "hbapigt.h"
diff --git a/harbour/contrib/hbnf/menu1.prg b/harbour/contrib/hbnf/menu1.prg
index 0f884524ef..3897246a30 100644
--- a/harbour/contrib/hbnf/menu1.prg
+++ b/harbour/contrib/hbnf/menu1.prg
@@ -61,9 +61,33 @@ FUNCTION FT_MENU1( aBar, aOptions, aColors, nTopRow, lShadow )
    LOCAL aBarKeys[ Len( aBar ) ]
 
    // inkey codes for A - Z
-   LOCAL aKeyCodes := { 286, 304, 302, 288, 274, 289, 290, 291, 279, ;
-      292, 293, 294, 306, 305, 280, 281, 272, 275, ;
-      287, 276, 278, 303, 273, 301, 277, 300 }
+   LOCAL aKeyCodes := { ;
+      K_ALT_A ,;
+      K_ALT_B ,;
+      K_ALT_C ,;
+      K_ALT_D ,;
+      K_ALT_E ,;
+      K_ALT_F ,;
+      K_ALT_G ,;
+      K_ALT_H ,;
+      K_ALT_I ,;
+      K_ALT_J ,;
+      K_ALT_K ,;
+      K_ALT_L ,;
+      K_ALT_M ,;
+      K_ALT_N ,;
+      K_ALT_O ,;
+      K_ALT_P ,;
+      K_ALT_Q ,;
+      K_ALT_R ,;
+      K_ALT_S ,;
+      K_ALT_T ,;
+      K_ALT_U ,;
+      K_ALT_V ,;
+      K_ALT_W ,;
+      K_ALT_X ,;
+      K_ALT_Y ,;
+      K_ALT_Z }
 
    // Len() of widest array element for for each pulldown menu
    LOCAL aBarWidth[ Len( aBar ) ]
diff --git a/harbour/contrib/hbnf/pickday.prg b/harbour/contrib/hbnf/pickday.prg
index 7f4ed7d7f7..3be45d5c23 100644
--- a/harbour/contrib/hbnf/pickday.prg
+++ b/harbour/contrib/hbnf/pickday.prg
@@ -23,7 +23,6 @@
  *
  */
 
-// test code
 FUNCTION FT_PICKDAY()
 
    LOCAL days := { "SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", ;
diff --git a/harbour/contrib/hbnf/tests/aading.prg b/harbour/contrib/hbnf/tests/aading.prg
index 522667b4d2..5d7877a4b3 100644
--- a/harbour/contrib/hbnf/tests/aading.prg
+++ b/harbour/contrib/hbnf/tests/aading.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL aList1, aList2, var0, nstart, nstop, nelapsed, nCtr
diff --git a/harbour/contrib/hbnf/tests/aemaxlen.prg b/harbour/contrib/hbnf/tests/aemaxlen.prg
index 0eef29d3f7..40de697c61 100644
--- a/harbour/contrib/hbnf/tests/aemaxlen.prg
+++ b/harbour/contrib/hbnf/tests/aemaxlen.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL var0, myarray1 := Directory()
diff --git a/harbour/contrib/hbnf/tests/aeminlen.prg b/harbour/contrib/hbnf/tests/aeminlen.prg
index d8b1f9a7cf..10e9f96d68 100644
--- a/harbour/contrib/hbnf/tests/aeminlen.prg
+++ b/harbour/contrib/hbnf/tests/aeminlen.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL var0, myarray1 := Directory()
diff --git a/harbour/contrib/hbnf/tests/amedian.prg b/harbour/contrib/hbnf/tests/amedian.prg
index 8cb7b70d7e..433a3c668e 100644
--- a/harbour/contrib/hbnf/tests/amedian.prg
+++ b/harbour/contrib/hbnf/tests/amedian.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "directry.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbnf/tests/aredit.prg b/harbour/contrib/hbnf/tests/aredit.prg
index f5ef396f93..664c39eb31 100644
--- a/harbour/contrib/hbnf/tests/aredit.prg
+++ b/harbour/contrib/hbnf/tests/aredit.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "inkey.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbnf/tests/at2.prg b/harbour/contrib/hbnf/tests/at2.prg
index efdadedea3..98921ca6c4 100644
--- a/harbour/contrib/hbnf/tests/at2.prg
+++ b/harbour/contrib/hbnf/tests/at2.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL cSearch, cTarget, var0
diff --git a/harbour/contrib/hbnf/tests/blink.prg b/harbour/contrib/hbnf/tests/blink.prg
index 4334962d9b..c3b6615dc1 100644
--- a/harbour/contrib/hbnf/tests/blink.prg
+++ b/harbour/contrib/hbnf/tests/blink.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    FT_BLINK( "WAIT", 5, 10 )
diff --git a/harbour/contrib/hbnf/tests/calendar.prg b/harbour/contrib/hbnf/tests/calendar.prg
index af737a260c..441900aa23 100644
--- a/harbour/contrib/hbnf/tests/calendar.prg
+++ b/harbour/contrib/hbnf/tests/calendar.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "inkey.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbnf/tests/clrsel.prg b/harbour/contrib/hbnf/tests/clrsel.prg
index 75c7b0580b..9efee23934 100644
--- a/harbour/contrib/hbnf/tests/clrsel.prg
+++ b/harbour/contrib/hbnf/tests/clrsel.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "common.ch"
 #include "setcurs.ch"
 
diff --git a/harbour/contrib/hbnf/tests/d2e.prg b/harbour/contrib/hbnf/tests/d2e.prg
index a5e7e62931..6dac127f0d 100644
--- a/harbour/contrib/hbnf/tests/d2e.prg
+++ b/harbour/contrib/hbnf/tests/d2e.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "common.ch"
 
 PROCEDURE Main( cNum, cPrec )
diff --git a/harbour/contrib/hbnf/tests/datecnfg.prg b/harbour/contrib/hbnf/tests/datecnfg.prg
index 9ed3c33fca..ba0d0f422b 100644
--- a/harbour/contrib/hbnf/tests/datecnfg.prg
+++ b/harbour/contrib/hbnf/tests/datecnfg.prg
@@ -44,10 +44,10 @@
 //
 //              See function: FT_DATECNFG()
 //
-// COMPILE ALL PROGRAMS WITH /N /W /A
-//
 //*******************************************************************
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL nNum, dDate, aTestData, aTemp, cFY_Start, nDOW_Start
diff --git a/harbour/contrib/hbnf/tests/dectobin.prg b/harbour/contrib/hbnf/tests/dectobin.prg
index 41c433fd90..7322dc0c52 100644
--- a/harbour/contrib/hbnf/tests/dectobin.prg
+++ b/harbour/contrib/hbnf/tests/dectobin.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL X
diff --git a/harbour/contrib/hbnf/tests/dfile.prg b/harbour/contrib/hbnf/tests/dfile.prg
index 1d67430bc1..34fba732a0 100644
--- a/harbour/contrib/hbnf/tests/dfile.prg
+++ b/harbour/contrib/hbnf/tests/dfile.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL cInFile   := "dfile.prg"
diff --git a/harbour/contrib/hbnf/tests/diskfunc.prg b/harbour/contrib/hbnf/tests/diskfunc.prg
index 5a9b32fb07..e2ea9f9f2a 100644
--- a/harbour/contrib/hbnf/tests/diskfunc.prg
+++ b/harbour/contrib/hbnf/tests/diskfunc.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cDrv )
 
    QOut( "Disk size:   " + Str( FT_DSKSIZE( cDrv ) ) )
diff --git a/harbour/contrib/hbnf/tests/dispmsg.prg b/harbour/contrib/hbnf/tests/dispmsg.prg
index 186f3249e9..1e9026f6ae 100644
--- a/harbour/contrib/hbnf/tests/dispmsg.prg
+++ b/harbour/contrib/hbnf/tests/dispmsg.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "inkey.ch"
 #include "setcurs.ch"
 
diff --git a/harbour/contrib/hbnf/tests/dosver.prg b/harbour/contrib/hbnf/tests/dosver.prg
index 80442cf1e3..1b1c961a2a 100644
--- a/harbour/contrib/hbnf/tests/dosver.prg
+++ b/harbour/contrib/hbnf/tests/dosver.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    QOut( "Dos version: " + FT_DOSVER() )
diff --git a/harbour/contrib/hbnf/tests/e2d.prg b/harbour/contrib/hbnf/tests/e2d.prg
index 508ef4bb49..c83292a144 100644
--- a/harbour/contrib/hbnf/tests/e2d.prg
+++ b/harbour/contrib/hbnf/tests/e2d.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( sNumE )
 
    QOut( FT_E2D( sNumE ) )
diff --git a/harbour/contrib/hbnf/tests/elapsed.prg b/harbour/contrib/hbnf/tests/elapsed.prg
index d7496ac1ff..e26591f2ce 100644
--- a/harbour/contrib/hbnf/tests/elapsed.prg
+++ b/harbour/contrib/hbnf/tests/elapsed.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL dStart, dEnd, cTimeStart, cTimeEnd, n, aDataTest
diff --git a/harbour/contrib/hbnf/tests/findith.prg b/harbour/contrib/hbnf/tests/findith.prg
index 1267c42034..2d2903aa67 100644
--- a/harbour/contrib/hbnf/tests/findith.prg
+++ b/harbour/contrib/hbnf/tests/findith.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cCk, cStr, nOcc, xCase )
 
    LOCAL nFind
diff --git a/harbour/contrib/hbnf/tests/floptst.prg b/harbour/contrib/hbnf/tests/floptst.prg
index f2e2a5b1b0..5a0a38b174 100644
--- a/harbour/contrib/hbnf/tests/floptst.prg
+++ b/harbour/contrib/hbnf/tests/floptst.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cArg1 )
 
    LOCAL nErrCode
diff --git a/harbour/contrib/hbnf/tests/ftgete.prg b/harbour/contrib/hbnf/tests/ftgete.prg
index d98a72b49b..932b2de0f3 100644
--- a/harbour/contrib/hbnf/tests/ftgete.prg
+++ b/harbour/contrib/hbnf/tests/ftgete.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "simpleio.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbnf/tests/gcd.prg b/harbour/contrib/hbnf/tests/gcd.prg
index 874807c245..4e21f03d5c 100644
--- a/harbour/contrib/hbnf/tests/gcd.prg
+++ b/harbour/contrib/hbnf/tests/gcd.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cNum1, cNum2 )
 
    OutStd( Str( FT_GCD( Val( cNum1 ), Val( cNum2 ) ) ) + hb_eol() )
diff --git a/harbour/contrib/hbnf/tests/hex2dec.prg b/harbour/contrib/hbnf/tests/hex2dec.prg
index 8ad8c7b3c1..5861a653ae 100644
--- a/harbour/contrib/hbnf/tests/hex2dec.prg
+++ b/harbour/contrib/hbnf/tests/hex2dec.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cHexNum )
 
    QOut( FT_HEX2DEC( cHexNum ) )
diff --git a/harbour/contrib/hbnf/tests/isshare.prg b/harbour/contrib/hbnf/tests/isshare.prg
index 5815cc34fb..66fbb9c409 100644
--- a/harbour/contrib/hbnf/tests/isshare.prg
+++ b/harbour/contrib/hbnf/tests/isshare.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL nLoaded := ft_isshare()
diff --git a/harbour/contrib/hbnf/tests/linked.prg b/harbour/contrib/hbnf/tests/linked.prg
index 6b85316659..359616f56b 100644
--- a/harbour/contrib/hbnf/tests/linked.prg
+++ b/harbour/contrib/hbnf/tests/linked.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL aString := { ;
diff --git a/harbour/contrib/hbnf/tests/menu1.prg b/harbour/contrib/hbnf/tests/menu1.prg
index a2f18fe9ec..f5b70b2431 100644
--- a/harbour/contrib/hbnf/tests/menu1.prg
+++ b/harbour/contrib/hbnf/tests/menu1.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "setcurs.ch"
 
 PROCEDURE Main( cCmdLine )
diff --git a/harbour/contrib/hbnf/tests/metaph.prg b/harbour/contrib/hbnf/tests/metaph.prg
index da5946529d..2455763185 100644
--- a/harbour/contrib/hbnf/tests/metaph.prg
+++ b/harbour/contrib/hbnf/tests/metaph.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL aNames := {}
diff --git a/harbour/contrib/hbnf/tests/miltime.prg b/harbour/contrib/hbnf/tests/miltime.prg
index d542d9dcfa..26c3b7497c 100644
--- a/harbour/contrib/hbnf/tests/miltime.prg
+++ b/harbour/contrib/hbnf/tests/miltime.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    CLS
diff --git a/harbour/contrib/hbnf/tests/mouse1.prg b/harbour/contrib/hbnf/tests/mouse1.prg
index acf333f58b..296a26a825 100644
--- a/harbour/contrib/hbnf/tests/mouse1.prg
+++ b/harbour/contrib/hbnf/tests/mouse1.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( nRow, nCol )
 
    // Pass valid row and column values for different video modes to change modes
diff --git a/harbour/contrib/hbnf/tests/mouse2.prg b/harbour/contrib/hbnf/tests/mouse2.prg
index a00c364a23..416d5c6fc2 100644
--- a/harbour/contrib/hbnf/tests/mouse2.prg
+++ b/harbour/contrib/hbnf/tests/mouse2.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 // Pass valid row and column values for different video modes to change modes
 
 PROCEDURE Main( nRow, nCol )
diff --git a/harbour/contrib/hbnf/tests/netpv.prg b/harbour/contrib/hbnf/tests/netpv.prg
index 829daf77da..8e9afdef3a 100644
--- a/harbour/contrib/hbnf/tests/netpv.prg
+++ b/harbour/contrib/hbnf/tests/netpv.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    ? FT_NETPV( 10000, 10, { 10000, 15000, 16000, 17000 } )
diff --git a/harbour/contrib/hbnf/tests/ntow.prg b/harbour/contrib/hbnf/tests/ntow.prg
index 1dff5d8e4e..de34333643 100644
--- a/harbour/contrib/hbnf/tests/ntow.prg
+++ b/harbour/contrib/hbnf/tests/ntow.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cNum )
 
    QOut( ft_ntow( Val( cNum ) ) )
diff --git a/harbour/contrib/hbnf/tests/nwlstat.prg b/harbour/contrib/hbnf/tests/nwlstat.prg
index 537ec5c7af..68645b5427 100644
--- a/harbour/contrib/hbnf/tests/nwlstat.prg
+++ b/harbour/contrib/hbnf/tests/nwlstat.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    QOut( "Logical station: " + Str( FT_NWLSTAT() ) )
diff --git a/harbour/contrib/hbnf/tests/nwsem.prg b/harbour/contrib/hbnf/tests/nwsem.prg
index 7888155b09..fecc9cbf9d 100644
--- a/harbour/contrib/hbnf/tests/nwsem.prg
+++ b/harbour/contrib/hbnf/tests/nwsem.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #define INITIAL_SEMAPHORE_VALUE     2
 #define WAIT_SECONDS                1
 
diff --git a/harbour/contrib/hbnf/tests/nwuid.prg b/harbour/contrib/hbnf/tests/nwuid.prg
index c063aacfee..e9cd532045 100644
--- a/harbour/contrib/hbnf/tests/nwuid.prg
+++ b/harbour/contrib/hbnf/tests/nwuid.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL x, cUid
diff --git a/harbour/contrib/hbnf/tests/ontick.prg b/harbour/contrib/hbnf/tests/ontick.prg
index 128939a9cb..21acf641f0 100644
--- a/harbour/contrib/hbnf/tests/ontick.prg
+++ b/harbour/contrib/hbnf/tests/ontick.prg
@@ -10,8 +10,12 @@
  *
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
+   CLS
+
    FT_ONTICK( {|| OutStd( hb_milliSeconds(), hb_eol() ) } )
 
    Inkey( 0 )
diff --git a/harbour/contrib/hbnf/tests/pending.prg b/harbour/contrib/hbnf/tests/pending.prg
index c4d50ff6b9..040f6602c7 100644
--- a/harbour/contrib/hbnf/tests/pending.prg
+++ b/harbour/contrib/hbnf/tests/pending.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    @ 0, 0 CLEAR
diff --git a/harbour/contrib/hbnf/tests/pickday.prg b/harbour/contrib/hbnf/tests/pickday.prg
index fce02e39b5..fc0b2e7bd8 100644
--- a/harbour/contrib/hbnf/tests/pickday.prg
+++ b/harbour/contrib/hbnf/tests/pickday.prg
@@ -2,8 +2,11 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
+   CLS
    QOut( "You selected " + FT_PICKDAY() )
 
    RETURN
diff --git a/harbour/contrib/hbnf/tests/popadder.prg b/harbour/contrib/hbnf/tests/popadder.prg
index 254384853e..31cdb6f99f 100644
--- a/harbour/contrib/hbnf/tests/popadder.prg
+++ b/harbour/contrib/hbnf/tests/popadder.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "inkey.ch"
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbnf/tests/prtesc.prg b/harbour/contrib/hbnf/tests/prtesc.prg
index 10744316a4..b85070cdc9 100644
--- a/harbour/contrib/hbnf/tests/prtesc.prg
+++ b/harbour/contrib/hbnf/tests/prtesc.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cParm1 )
 
    //-------------------------------------------------------
diff --git a/harbour/contrib/hbnf/tests/rand1.prg b/harbour/contrib/hbnf/tests/rand1.prg
index dba7c19e8e..8392e75fbf 100644
--- a/harbour/contrib/hbnf/tests/rand1.prg
+++ b/harbour/contrib/hbnf/tests/rand1.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 // Write 100 random numbers from 1 to 100 to stdout.
 // Run it multiple times and redirect output to a file
 // to check it
diff --git a/harbour/contrib/hbnf/tests/savearr.prg b/harbour/contrib/hbnf/tests/savearr.prg
index 36f62bc178..7b04703e54 100644
--- a/harbour/contrib/hbnf/tests/savearr.prg
+++ b/harbour/contrib/hbnf/tests/savearr.prg
@@ -2,12 +2,14 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL  aArray := {;
       { "Invoice 1", SToD( "19910415" ), 1234.32, .T. }, ;
       { "Invoice 2", Date(), 234.98, .F. }, ;
-      { "Invoice 3", Date() + 1, 0, .T. }  }, aSave
+      { "Invoice 3", Date() + 1, 0, .T. } }, aSave
    LOCAL nErrorCode := 0
 
    FT_SAVEARR( aArray, "invoice.dat", @nErrorCode )
diff --git a/harbour/contrib/hbnf/tests/savesets.prg b/harbour/contrib/hbnf/tests/savesets.prg
index 5e8e3d31fb..c702c8001e 100644
--- a/harbour/contrib/hbnf/tests/savesets.prg
+++ b/harbour/contrib/hbnf/tests/savesets.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL aSets := FT_SAVESETS()
diff --git a/harbour/contrib/hbnf/tests/scancode.prg b/harbour/contrib/hbnf/tests/scancode.prg
index d0ecf07a65..213582cd92 100644
--- a/harbour/contrib/hbnf/tests/scancode.prg
+++ b/harbour/contrib/hbnf/tests/scancode.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #define SCANCODE_ESCAPE   ( hb_BChar( 27 ) + hb_BChar( 1 ) )
 
 PROCEDURE Main()
diff --git a/harbour/contrib/hbnf/tests/setdate.prg b/harbour/contrib/hbnf/tests/setdate.prg
index edbe4fbf7a..e5c059b66f 100644
--- a/harbour/contrib/hbnf/tests/setdate.prg
+++ b/harbour/contrib/hbnf/tests/setdate.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cDate )
 
    cDate := iif( cDate == NIL, DToC( Date() ), cDate )
diff --git a/harbour/contrib/hbnf/tests/settime.prg b/harbour/contrib/hbnf/tests/settime.prg
index e6eff16d7d..1a54e447fd 100644
--- a/harbour/contrib/hbnf/tests/settime.prg
+++ b/harbour/contrib/hbnf/tests/settime.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cTime )
 
    cTime := iif( cTime == NIL, Time(), cTime )
diff --git a/harbour/contrib/hbnf/tests/sleep.prg b/harbour/contrib/hbnf/tests/sleep.prg
index b30159b258..787dc0035a 100644
--- a/harbour/contrib/hbnf/tests/sleep.prg
+++ b/harbour/contrib/hbnf/tests/sleep.prg
@@ -2,7 +2,8 @@
  * $Id$
  */
 
-// Test routine
+#require "hbnf"
+
 // Invoke by running SLEEP 1.0 to sleep 1.0 seconds
 
 PROCEDURE Main( nSleep )
diff --git a/harbour/contrib/hbnf/tests/sysmem.prg b/harbour/contrib/hbnf/tests/sysmem.prg
index 52b30d509a..0f6e3020bf 100644
--- a/harbour/contrib/hbnf/tests/sysmem.prg
+++ b/harbour/contrib/hbnf/tests/sysmem.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    QOut( "Conventional memory: " + Str( FT_SYSMEM() ) + "K installed" )
diff --git a/harbour/contrib/hbnf/tests/tbwhile.prg b/harbour/contrib/hbnf/tests/tbwhile.prg
index 17ec823927..5482a3b00f 100644
--- a/harbour/contrib/hbnf/tests/tbwhile.prg
+++ b/harbour/contrib/hbnf/tests/tbwhile.prg
@@ -11,6 +11,8 @@
  *   tbnames.dbf/.ntx ARE AUTOMATICALLY CREATED BY THIS TEST PROGRAM
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL aFields := {}, cKey := "O", cOldColor
diff --git a/harbour/contrib/hbnf/tests/tempfile.prg b/harbour/contrib/hbnf/tests/tempfile.prg
index c1a54f510d..5244865f84 100644
--- a/harbour/contrib/hbnf/tests/tempfile.prg
+++ b/harbour/contrib/hbnf/tests/tempfile.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 #include "fileio.ch"
 
 PROCEDURE Main( cPath, cHide )
diff --git a/harbour/contrib/hbnf/tests/test.prg b/harbour/contrib/hbnf/tests/test.prg
index 693a35c96d..d80bfece0b 100644
--- a/harbour/contrib/hbnf/tests/test.prg
+++ b/harbour/contrib/hbnf/tests/test.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL nver, nmar, ntype, nir, ppp
@@ -9,7 +11,7 @@ PROCEDURE Main()
    nmar := FT_MVERSION( @nver, @ntype, @nir )
    ppp := nmar + nver
    ? Str( nmar, 2, 0 ), '.', Str( nver, 2, 0 )
-   ? ppp/100
+   ? ppp / 100
    Inkey( 0 )
    ? 'is mouse on', ft_mreset()
    Inkey( 0 )
diff --git a/harbour/contrib/hbnf/tests/vertmenu.prg b/harbour/contrib/hbnf/tests/vertmenu.prg
index 58910a5a69..2732dabcc9 100644
--- a/harbour/contrib/hbnf/tests/vertmenu.prg
+++ b/harbour/contrib/hbnf/tests/vertmenu.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL datamenu := { ;
@@ -30,6 +32,8 @@ PROCEDURE Main()
       { "Maintenance", "Reindex files, etc.", {|| FT_MENU2( maintmenu ) } }, ;
       { "Quit",        "See ya later" } }
 
+   CLS
+
    FT_MENU2( mainmenu )
 
    RETURN
diff --git a/harbour/contrib/hbnf/tests/vidmode.prg b/harbour/contrib/hbnf/tests/vidmode.prg
index e9552be813..56886b6810 100644
--- a/harbour/contrib/hbnf/tests/vidmode.prg
+++ b/harbour/contrib/hbnf/tests/vidmode.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cMode )
 
    FT_SETMODE( Val( cMode ) )
diff --git a/harbour/contrib/hbnf/tests/wda.prg b/harbour/contrib/hbnf/tests/wda.prg
index 7730f4f9c6..edc4ce1e5e 100644
--- a/harbour/contrib/hbnf/tests/wda.prg
+++ b/harbour/contrib/hbnf/tests/wda.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cDate, cDays )
 
    LOCAL nDays := ft_addWkDy( CToD( cDate ), Val( cDays ) )
diff --git a/harbour/contrib/hbnf/tests/workdays.prg b/harbour/contrib/hbnf/tests/workdays.prg
index f11f57b34c..44a2c02807 100644
--- a/harbour/contrib/hbnf/tests/workdays.prg
+++ b/harbour/contrib/hbnf/tests/workdays.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main( cStart, cStop )
 
    QOut( ft_workdays( CToD( cStart ), CToD( cStop ) ) )
diff --git a/harbour/contrib/hbnf/tests/woy.prg b/harbour/contrib/hbnf/tests/woy.prg
index d0d6146d62..45a8af3cbc 100644
--- a/harbour/contrib/hbnf/tests/woy.prg
+++ b/harbour/contrib/hbnf/tests/woy.prg
@@ -2,6 +2,8 @@
  * $Id$
  */
 
+#require "hbnf"
+
 // ADD PARAMETER "CENTURY" ON COMMAND LINES TO TEST 4-DIGIT YEARS
 
 PROCEDURE Main( cCent )
diff --git a/harbour/contrib/hbnf/tests/xbox.prg b/harbour/contrib/hbnf/tests/xbox.prg
index d50ea9fdaa..60488839f9 100644
--- a/harbour/contrib/hbnf/tests/xbox.prg
+++ b/harbour/contrib/hbnf/tests/xbox.prg
@@ -1,13 +1,15 @@
 /*
- * $Id$ 
+ * $Id$
  */
 
+#require "hbnf"
+
 PROCEDURE Main()
 
    LOCAL i
 
    SetColor( "W/B" )
-// CLS
+   CLS
    FOR i := 1 TO 24
       @ i, 0 SAY Replicate( "@", 80 )
    NEXT
@@ -22,4 +24,3 @@ PROCEDURE Main()
       "Even though this line is way too long, and is in fact more than 80 characters long, if you care to check!" )
 
    RETURN
-