diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 004fa473b4..498ee53bd8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+19991004-01:20 GMT+1 Victor Szel <info@szelvesz.hu>
+  - make_b31.bat
+    makefile.b31
+    harbour.b31
+    - Removed, make_b16.bat should be used instead.
+
 19991004-01:14 GMT+1 Victor Szel <info@szelvesz.hu>
   * build16.bat -> make_b16.bat
     build31.bat -> make_b31.bat
diff --git a/harbour/harbour.b31 b/harbour/harbour.b31
deleted file mode 100644
index cc2178c5bc..0000000000
--- a/harbour/harbour.b31
+++ /dev/null
@@ -1,84 +0,0 @@
-# 
-# $Id$
-# 
-
-# makefile for Borland C/C++ 16 bits Harbour compiler
-
-.path.asm = source\compiler
-.path.c   = source\rtl
-.path.h   = include
-.path.l   = source\compiler
-.path.y   = source\compiler
-.path.exe = bin
-.path.lib = libs\b16
-.path.obj = obj
-.path.prg = source\rtl
-.path.hbp = source\hbpp
-
-c_opt = -mh -O2 -I.\include -DUSE_GTAPI
-#c_opt = -mh -O2 -I.\include
-
-PROJECT: harbour.exe
-
-{source\compiler}.c{obj}.obj:
-  bcc -c $(c_opt) -Isource\compiler -o$@ $<
-
-{source\hbpp}.c{obj}.obj:
-  bcc -c $(c_opt) -Isource\hbpp -o$@ $<
-
-.c.obj:
-  bcc -c $(c_opt) -o$@ $<
-  tlib .\libs\b16\harbour.lib -+$@,,
-
-.asm.obj:
-  tasm -I.\include $< $@
-  tlib .\libs\b16\harbour.lib -+$@,,
-
-harbour.exe : harboury.obj harbourl.obj lex_t1.obj lex_t2.obj lex_t3.obj harbour.obj genobj32.obj \
-              genc.obj \
-              genhrb.obj \
-              genrc.obj \
-              genjava.obj \
-              genpas.obj \
-              hbpp.obj hbppint.obj table.obj
-   echo -ebin\harbour.exe obj\harboury.obj > b31.bc
-   echo obj\harbourl.obj obj\lex_t1.obj >> b31.bc
-   echo obj\lex_t2.obj obj\lex_t3.obj >> b31.bc
-   echo obj\harbour.obj obj\genobj32.obj >> b31.bc
-   echo obj\genc.obj >> b31.bc
-   echo obj\genhrb.obj >> b31.bc
-   echo obj\genrc.obj >> b31.bc
-   echo obj\genjava.obj >> b31.bc
-   echo obj\genpas.obj >> b31.bc
-   echo obj\hbpp.obj obj\hbppint.obj obj\table.obj >> b31.bc
-   bcc $(c_opt) -Isource\compiler @b31.bc
-
-fixflex.obj  : source\compiler\fixflex.c
-genobj32.obj : source\compiler\genobj32.c
-genc.obj     : source\compiler\genc.c
-genhrb.obj   : source\compiler\genhrb.c
-genrc.obj    : source\compiler\genrc.c
-genjava.obj  : source\compiler\genjava.c
-genpas.obj   : source\compiler\genpas.c
-harbour.obj  : source\compiler\harbour.c
-harbourl.obj : source\compiler\harbourl.c harbour.l
-harboury.obj : source\compiler\harboury.c harbour.y
-hbpp.obj     : source\hbpp\hbpp.c
-hbppint.obj  : source\hbpp\hbppint.c
-table.obj    : source\hbpp\table.c
-lex_t1.obj   : source\compiler\lex_t1.c   harbour.l
-lex_t2.obj   : source\compiler\lex_t2.c   harbour.l
-lex_t3.obj   : source\compiler\lex_t3.c   harbour.l
-
-source\compiler\harboury.c : harbour.y
-   bison -d -v -y -osource\compiler\harboury.c source\compiler\harbour.y
-
-fixflex.exe : fixflex.obj
-  bcc -mh $(c_opt) -ebin\fixflex.exe obj\fixflex.obj
-
-source\compiler\lex_t1.c :: harbour.l fixflex.exe
-source\compiler\lex_t2.c :: harbour.l fixflex.exe
-source\compiler\harbourl.c :: harbour.l fixflex.exe
-   flex -i -8 -osource\compiler\harbourl.c source\compiler\harbour.l
-   if exist source\compiler\harbourl.bak del source\compiler\harbourl.bak
-   bin\fixflex source\compiler\harbourl.c source\compiler\lex_t1.c source\compiler\lex_t2.c source\compiler\lex_t3.c -P-
diff --git a/harbour/make_b31.bat b/harbour/make_b31.bat
deleted file mode 100644
index 965f5bc46a..0000000000
--- a/harbour/make_b31.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-rem 
-rem $Id$
-rem 
-
-if %1.==hb. make -fharbour.b31 -r %2
-if not %1.==hb. make -fmakefile.b31 -r %1
diff --git a/harbour/makefile.b31 b/harbour/makefile.b31
deleted file mode 100644
index 10f6eb8add..0000000000
--- a/harbour/makefile.b31
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# $Id$
-#
-
-# makefile for Borland C/C++ 16 bits Harbour libraries
-
-.path.api = include
-.path.asm = source\compiler
-.path.c   = source\rtl
-.path.ch  = include
-.path.h   = include
-.path.lib = libs\b16
-.path.obj = obj
-.path.prg = source\rtl
-
-c_opt = -mh -O2 -I.\include -DHARBOUR_USE_GTAPI
-#c_opt = -mh -O2 -I.\include
-
-PROJECT: harbour.lib hbtools.lib terminal.lib libs\win16\terminal.lib
-
-harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj copyfile.obj cmdarg.obj \
-              dates.obj descend.obj devoutp.obj dir.obj dynsym.obj environ.obj \
-              terror.obj errorapi.obj errorsys.obj harbinit.obj extend.obj \
-              filesys.obj gtapi.obj hardcr.obj initsymb.obj itemapi.obj \
-              math.obj memofile.obj memvars.obj mtran.obj msguk.obj objfunc.obj \
-              set.obj setcolor.obj strings.obj symbols.obj \
-              tclass.obj transfrm.obj
-
-hbtools.lib : dates2.obj datesx.obj debug.obj hb_f.obj io.obj mathx.obj \
-              stringp.obj stringsx.obj \
-              asciisum.obj ascpos.obj atdiff.obj \
-              chareven.obj charmix.obj charodd.obj \
-              chrcount.obj chrfirst.obj chrtotal.obj \
-              strasint.obj strcount.obj strcspn.obj \
-              strdiff.obj strexpan.obj strleft.obj \
-              strpbrk.obj strright.obj
-
-terminal.lib : console.obj gtdos.obj
-
-libs\win16\terminal.lib : console.obj
-
-console.obj  : console.c  extend.h hbdefs.h ctoharb.h dates.h gtapi.h set.h
-  bcc -c $(c_opt) -o$@ source\rtl\console.c
-  tlib .\libs\b16\terminal.lib -+$@,,
-#  bcc -c -DWINDOWS $(c_opt) -o$@ source\rtl\console.c
-#  tlib .\libs\win16\terminal.lib -+$@,,
-
-arrays.obj   : arrays.c     extend.h hbdefs.h itemapi.h ctoharb.h
-asort.obj    : asort.prg    extend.h hbdefs.h init.h pcode.h
-classes.obj  : classes.c    extend.h hbdefs.h itemapi.h
-codebloc.obj : codebloc.c   extend.h hbdefs.h
-copyfile.obj : copyfile.c   extend.h hbdefs.h itemapi.h errorapi.h error.ch filesys.h fileio.ch filesys.api
-dates.obj    : dates.c      extend.h hbdefs.h dates.h set.h
-descend.obj  : descend.c    extend.h hbdefs.h
-devoutp.obj  : devoutp.prg  extend.h hbdefs.h init.h pcode.h
-dir.obj      : dir.c        extend.h hbdefs.h
-environ.obj  : environ.c    extend.h hbdefs.h
-terror.obj   : terror.prg   extend.h hbdefs.h init.h pcode.h
-errorapi.obj : errorapi.c   extend.h hbdefs.h ctoharb.h
-errorsys.obj : errorsys.prg extend.h hbdefs.h init.h pcode.h
-extend.obj   : extend.c     extend.h hbdefs.h set.h dates.h
-filesys.obj  : filesys.c    extend.h hbdefs.h
-fm.obj       : fm.c         extend.h hbdefs.h
-gtapi.obj    : gtapi.c      extend.h hbdefs.h gtapi.h
-harbinit.obj : harbinit.prg extend.h hbdefs.h init.h pcode.h
-hardcr.obj   : hardcr.c     extend.h hbdefs.h
-itemapi.obj  : itemapi.c    extend.h hbdefs.h ctoharb.h itemapi.h set.h dates.h
-math.obj     : math.c       extend.h hbdefs.h
-memofile.obj : memofile.c   extend.h hbdefs.h
-memvars.obj  : memvars.c    extend.h hbdefs.h
-mtran.obj    : mtran.c      extend.h hbdefs.h
-objfunc.obj  : objfunc.prg  extend.h hbdefs.h init.h pcode.h
-set.obj      : set.c        extend.h hbdefs.h set.h
-setcolor.obj : setcolor.c   extend.h hbdefs.h init.h pcode.h
-strings.obj  : strings.c    extend.h hbdefs.h set.h
-tclass.obj   : tclass.prg   extend.h hbdefs.h init.h pcode.h
-transfrm.obj : transfrm.c   extend.h hbdefs.h ctoharb.h set.h dates.h
-
-gtdos.obj    : source\rtl\gt\gtdos.c     extend.h hbdefs.h gtapi.h
-msguk.obj    : source\rtl\natmsg\msguk.c extend.h hbdefs.h
-
-cmdarg.obj   : source\vm\cmdarg.c   extend.h hbdefs.h
-debug.obj    : source\vm\debug.c    extend.h hbdefs.h ctoharb.h itemapi.h
-dynsym.obj   : source\vm\dynsym.c   extend.h hbdefs.h
-initsymb.obj : source\vm\initsymb.c extend.h hbdefs.h
-symbols.obj  : source\vm\symbols.asm
-
-dates2.obj   : source\tools\dates2.c    extend.h hbdefs.h
-datesx.obj   : source\tools\datesx.c    extend.h hbdefs.h
-hb_f.obj     : source\tools\hb_f.c      extend.h hbdefs.h filesys.api filesys.h fileio.ch
-io.obj       : source\tools\io.c        extend.h hbdefs.h
-mathx.obj    : source\tools\mathx.c     extend.h hbdefs.h
-stringp.obj  : source\tools\stringp.prg extend.h hbdefs.h init.h pcode.h
-stringsx.obj : source\tools\stringsx.c  extend.h hbdefs.h
-
-asciisum.obj : source\tools\asciisum.c  extend.h hbdefs.h
-ascpos.obj   : source\tools\ascpos.c    extend.h hbdefs.h
-atdiff.obj   : source\tools\atdiff.c    extend.h hbdefs.h
-chareven.obj : source\tools\chareven.c  extend.h hbdefs.h
-charmix.obj  : source\tools\charmix.c   extend.h hbdefs.h
-charodd.obj  : source\tools\charodd.c   extend.h hbdefs.h
-chrcount.obj : source\tools\chrcount.c  extend.h hbdefs.h
-chrfirst.obj : source\tools\chrfirst.c  extend.h hbdefs.h
-chrtotal.obj : source\tools\chrtotal.c  extend.h hbdefs.h
-strasint.obj : source\tools\strasint.c  extend.h hbdefs.h
-strcount.obj : source\tools\strcount.c  extend.h hbdefs.h
-strcspn.obj  : source\tools\strcspn.c   extend.h hbdefs.h
-strdiff.obj  : source\tools\strdiff.c   extend.h hbdefs.h
-strexpan.obj : source\tools\strexpan.c  extend.h hbdefs.h
-strleft.obj  : source\tools\strleft.c   extend.h hbdefs.h
-strpbrk.obj  : source\tools\strpbrk.c   extend.h hbdefs.h
-strright.obj : source\tools\strright.c  extend.h hbdefs.h
-
-{source\tools}.prg{obj}.obj:
-  bin\harbour $< /n /osource\tools
-  bcc -c $(c_opt) -o$@ $*.c
-  tlib .\libs\b16\hbtools.lib -+$@,,
-
-.prg.obj:
-  bin\harbour $< /n /osource\rtl /iinclude
-  bcc -c $(c_opt) -o$@ $*.c
-  tlib .\libs\b16\harbour.lib -+$@,,
-
-{source\vm}.c{obj}.obj:
-  bcc -c $(c_opt) -o$@ $<
-  tlib .\libs\b16\harbour.lib -+$@,,
-
-{source\tools}.c{obj}.obj:
-  bcc -c $(c_opt) -o$@ $<
-  tlib .\libs\b16\hbtools.lib -+$@,,
-
-{source\rtl\gt}.c{obj}.obj:
-  bcc -c $(c_opt) -o$@ $<
-  tlib .\libs\b16\terminal.lib -+$@,,
-
-{source\rtl\natmsg}.c{obj}.obj:
-  bcc -c $(c_opt) -o$@ $<
-  tlib .\libs\b16\harbour.lib -+$@,,
-
-{source\compiler}.c{obj}.obj:
-  bcc -c $(c_opt) -Isource\compiler -o$@ $<
-
-{source\hbpp}.c{obj}.obj:
-  bcc -c $(c_opt) -Isource\hbpp -o$@ $<
-
-.c.obj:
-  bcc -c $(c_opt) -o$@ $<
-  tlib .\libs\b16\harbour.lib -+$@,,
-
-.asm.obj:
-  tasm -I.\include $< $@
-  tlib .\libs\b16\harbour.lib -+$@,,