diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d0cc538e49..db16bf5a2c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,14 @@
+20000129-19:15 GMT+1 Victor Szel <info@szelvesz.hu>
+  * bin/bld_tpl.*
+    ! Added macro lib.
+    ! Fix for os2 platform.
+  * source/rtl/tget.prg
+    - Removed #include "set.ch" since it's included by default (via std.ch)
+  * source/rtl/Makefile
+    source/rtl/memoline.c
+    source/rtl/filesys.c
+    * Some minor formatting fixes.
+
 20000129-14:30  GMT+3 Luiz Rafael Culik <culik@sl.conex.net>
     *source/rtl/oemansi.c
         *Added documentation to HB_oemtoansi() and Hb_ansitooem() 
diff --git a/harbour/bin/bld_tpl.bat b/harbour/bin/bld_tpl.bat
index 309e544de3..b68971457e 100644
--- a/harbour/bin/bld_tpl.bat
+++ b/harbour/bin/bld_tpl.bat
@@ -79,33 +79,33 @@ rem set HB_COMPILER=
 
    if not "%HB_ARCHITECTURE%" == "dos" goto A_W32
 
-   if "%HB_COMPILER%" == "bcc31"   bcc -O2 -mh -I..\include %1.c  ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
-   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfnt -ldbfcd -lcommon
+   if "%HB_COMPILER%" == "bcc31"   bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
+   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfnt -ldbfcd -lcommon
    goto END
 
 :A_W32
 
    if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "msvc"    cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "msvc"    cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\macro.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
    if "%HB_COMPILER%" == "msvc"    echo Ignore LNK4033 warning
    goto END
 
 :A_OS2
 
-   if not "%HB_ARCHITECTURE%" == "dos" goto A_LINUX
+   if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
    goto END
 
 :A_LINUX
 
    if not "%HB_ARCHITECTURE%" == "linux" goto CLEANUP
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
    goto END
 
 :CLEANUP
diff --git a/harbour/bin/bld_tpl.cmd b/harbour/bin/bld_tpl.cmd
index 5bf5068292..64126811e4 100644
--- a/harbour/bin/bld_tpl.cmd
+++ b/harbour/bin/bld_tpl.cmd
@@ -79,33 +79,33 @@ rem set HB_COMPILER=
 
    if not "%HB_ARCHITECTURE%" == "dos" goto A_W32
 
-   if "%HB_COMPILER%" == "bcc31"   bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
-   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfnt -ldbfcd -lcommon
+   if "%HB_COMPILER%" == "bcc31"   bcc -O2 -mh -I..\include %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
+   if "%HB_COMPILER%" == "djgpp"   gcc %1.c -o%1.exe -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfnt -ldbfcd -lcommon
    goto END
 
 :A_W32
 
    if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "msvc"    cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "mingw32" gcc %1.c -mno-cygwin -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "msvc"    cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\harbour.lib ..\lib\terminal.lib ..\lib\macro.lib ..\lib\hbtools.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\debug.lib
    if "%HB_COMPILER%" == "msvc"    echo Ignore LNK4033 warning
    goto END
 
 :A_OS2
 
-   if not "%HB_ARCHITECTURE%" == "dos" goto A_LINUX
+   if not "%HB_ARCHITECTURE%" == "os2" goto A_LINUX
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
-   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I..\include -L..\lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ -I..\include /C- /Tp %1.c ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\vm.lib ..\lib\rdd.lib ..\lib\rtl.lib ..\lib\macro.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
    goto END
 
 :A_LINUX
 
    if not "%HB_ARCHITECTURE%" == "linux" goto CLEANUP
 
-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -ldbfntx -ldbfcdx -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -I../include -L../lib -lrtl -lrdd -lvm -lrdd -lrtl -lmacro -ldbfntx -ldbfcdx -lcommon
    goto END
 
 :CLEANUP
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 6fb947dc9d..1abd387617 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -35,7 +35,7 @@ C_SOURCES=\
         memoline.c   \
         memvars.c    \
         mlcount.c    \
-	mlpos.c      \
+        mlpos.c      \
         mouseapi.c   \
         mtran.c      \
         natmsg.c     \
diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index 6c1fe0935a..8a42657ced 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -2143,6 +2143,7 @@ HARBOUR HB_FILE( void )
 {
    hb_retl( ISCHAR( 1 ) ? hb_fsFile( ( BYTE * ) hb_parc( 1 ) ) : FALSE );
 }
+
 /*  $DOC$
  *  $FUNCNAME$
  *     FREADSTR()
@@ -2464,7 +2465,9 @@ HARBOUR HB_FSETDEVMOD( void )
 }
 
 #endif
-/*            HARBOUR COMMAND THAT ARE PREPROCESSED IN FUNTION */
+
+/* HARBOUR COMMANDS THAT ARE PREPROCESSED INTO FUNCTIONS */
+
 /*  $DOC$
  *  $FUNCNAME$
  *     RENAME 
diff --git a/harbour/source/rtl/memoline.c b/harbour/source/rtl/memoline.c
index 2d4d17c136..a4c5bf9134 100644
--- a/harbour/source/rtl/memoline.c
+++ b/harbour/source/rtl/memoline.c
@@ -70,7 +70,7 @@ HARBOUR HB_MEMOLINE( void )
          case HB_CHAR_LF:
             ulCurLength = 0;
             ulLastSpace = 0;
-            ulLineEnd   = HB_MAX_( ulPos - 2, ulLineBegin ) ;
+            ulLineEnd   = HB_MAX_( ulPos - 2, ulLineBegin );
             ulLines++;
             if( ulLines < ulLineNumber )
             {
diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index a894cd4084..36771c63ac 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -35,7 +35,6 @@
 #include "setcurs.ch"
 #include "getexit.ch"
 #include "inkey.ch"
-#include "set.ch"
 
 #define GET_CLR_UNSELECTED	0
 #define GET_CLR_ENHANCED        1