diff --git a/harbour/contrib/htmllib/Makefile.bc b/harbour/contrib/htmllib/Makefile.bc
index d7caa4da81..159cdb2fff 100644
--- a/harbour/contrib/htmllib/Makefile.bc
+++ b/harbour/contrib/htmllib/Makefile.bc
@@ -10,9 +10,9 @@
 # NOTE: You can use these envvars to configure the make process:
 #       (note that these are all optional)
 #
-#       CFLAGS       - Extra C compiler options for libraries and for 
+#       CFLAGS       - Extra C compiler options for libraries and for
 #                      executables
-#       C_USR        - Extra C compiler options for libraries and for 
+#       C_USR        - Extra C compiler options for libraries and for
 #                      executables (GNU make compatible envvar)
 #       CLIBFLAGS    - Extra C compiler options for the libraries
 #       HARBOURFLAGS - Extra Harbour compiler options
@@ -46,7 +46,7 @@ BIN_DIR = ..\..\bin\b32
 OBJ_DIR = ..\..\obj\b32
 LIB_DIR = ..\..\lib\b32
 
-# This is needed, otherwise the libs may overflow when 
+# This is needed, otherwise the libs may overflow when
 # debug info is requested with -v -y
 ARFLAGS = /P32
 
@@ -61,7 +61,7 @@ CFLAGS = -O2 $(CFLAGS)
 #
 
 INCLUDE_DIR  = ..\..\include;include
-TOOLS_DIR    = source
+TOOLS_DIR    =
 TOOLS1_DIR    = examples
 #
 # C compiler definition and C flags. These should never have to change.
@@ -100,7 +100,7 @@ $(OBJ_DIR)\ocgi.obj \
 $(OBJ_DIR)\oframe.obj \
 $(OBJ_DIR)\counter.obj \
 $(OBJ_DIR)\errorsys.obj \
-$(OBJ_DIR)\htmutil.obj 
+$(OBJ_DIR)\htmutil.obj
 
 #
 # Our default target
@@ -116,35 +116,35 @@ all: \
 $(TOOLS_LIB)  : $(TOOLS_LIB_OBJS)
 
 
-$(OBJ_DIR)\ohtm.c : $(TOOLS_DIR)\ohtm.prg
+$(OBJ_DIR)\ohtm.c : ohtm.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\ohtm.obj : $(OBJ_DIR)\ohtm.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\htmbrows.c : $(TOOLS_DIR)\htmbrows.prg
+$(OBJ_DIR)\htmbrows.c : htmbrows.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\htmbrows.obj : $(OBJ_DIR)\htmbrows.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\oedit.c : $(TOOLS_DIR)\oedit.prg
+$(OBJ_DIR)\oedit.c : oedit.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\oedit.obj : $(OBJ_DIR)\oedit.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\ofile.c : $(TOOLS_DIR)\ofile.prg
+$(OBJ_DIR)\ofile.c : ofile.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\ofile.obj : $(OBJ_DIR)\ofile.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\jlist.c : $(TOOLS_DIR)\jlist.prg
+$(OBJ_DIR)\jlist.c : jlist.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\jlist.obj : $(OBJ_DIR)\jlist.c
@@ -152,49 +152,49 @@ $(OBJ_DIR)\jlist.obj : $(OBJ_DIR)\jlist.c
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
 
-$(OBJ_DIR)\oini.c : $(TOOLS_DIR)\oini.prg
+$(OBJ_DIR)\oini.c : oini.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\oini.obj : $(OBJ_DIR)\oini.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\jwindow.c : $(TOOLS_DIR)\jwindow.prg
+$(OBJ_DIR)\jwindow.c : jwindow.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\jwindow.obj : $(OBJ_DIR)\jwindow.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\ocgi.c : $(TOOLS_DIR)\ocgi.prg
+$(OBJ_DIR)\ocgi.c : ocgi.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\ocgi.obj : $(OBJ_DIR)\ocgi.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\oframe.c : $(TOOLS_DIR)\oframe.prg
+$(OBJ_DIR)\oframe.c : oframe.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\oframe.obj : $(OBJ_DIR)\oframe.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\counter.c : $(TOOLS1_DIR)\counter.prg
+$(OBJ_DIR)\counter.c : counter.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\counter.obj : $(OBJ_DIR)\counter.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\errorsys.c : $(TOOLS_DIR)\errorsys.prg
+$(OBJ_DIR)\errorsys.c : errorsys.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\errorsys.obj : $(OBJ_DIR)\errorsys.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
-$(OBJ_DIR)\htmutil.c : $(TOOLS_DIR)\htmutil.prg
+$(OBJ_DIR)\htmutil.c : htmutil.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
 
 $(OBJ_DIR)\htmutil.obj : $(OBJ_DIR)\htmutil.c