diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f6baaaadd0..24a3d8f060 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,17 @@
+20000406-08:52 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * config/dos/dir.cf
+     ! Accidentally broken file restored.
+
+   * utils/hbtest/make_xpp.cmd
+     ! Fixed.
+
+   * include/box.ch
+     + Some extensions guarded as such.
+
+   * source/rtl/math.c
+     + Multithreading related NOTE added.
+
 20000405-15:29 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    + utils/hbtest/rt_hvma.prg
diff --git a/harbour/config/dos/dir.cf b/harbour/config/dos/dir.cf
index 9de52c9183..c32f7221a5 100644
--- a/harbour/config/dos/dir.cf
+++ b/harbour/config/dos/dir.cf
@@ -13,8 +13,7 @@ else
 DIR_LIST := $(subst /,\,$(DIRS))
 DIR_MAKE := $(subst /,\,$(MK))
 DIR_RULE =\
-	$(COMSPEC) /C FOR %%d IN ($(DIR_LIST)) DO $(DIR_MAKE) -C %%d $@
+	$(COMSPEC) /C FOR %d IN ($(DIR_LIST)) DO $(DIR_MAKE) -C %d $@
 endif
 
-endif # ! compiling a specific program module
-
+endif # ! compiling a specific program module
\ No newline at end of file
diff --git a/harbour/include/box.ch b/harbour/include/box.ch
index 29f815f70f..a919719677 100644
--- a/harbour/include/box.ch
+++ b/harbour/include/box.ch
@@ -36,6 +36,8 @@
 #ifndef _BOX_CH
 #define _BOX_CH
 
+#include "hbsetup.ch"
+
 /* #defines for DISPBOX() */
 
 /* Single-line */
@@ -54,11 +56,15 @@
 #define B_DOUBLE_SINGLE ( Chr( 213 ) + Chr( 205 ) + Chr( 184 ) + Chr( 179 ) + ;
                           Chr( 190 ) + Chr( 205 ) + Chr( 212 ) + Chr( 179 ) )
 
+#ifdef HB_COMPAT_XPP
+
 #define B_THIN          ( Chr( 219 ) + Chr( 223 ) + Chr( 219 ) + Chr( 219 ) + ;
                           Chr( 219 ) + Chr( 220 ) + Chr( 219 ) + Chr( 219 ) )
 
 #define B_FAT           ( Chr( 219 ) + Chr( 219 ) + Chr( 219 ) + Chr( 219 ) + ;
                           Chr( 219 ) + Chr( 219 ) + Chr( 219 ) + Chr( 219 ) )
 
+#endif
+
 #endif /* _BOX_CH */
 
diff --git a/harbour/make_b16.bat b/harbour/make_b16.bat
index ebe6063066..8b9d346325 100644
--- a/harbour/make_b16.bat
+++ b/harbour/make_b16.bat
@@ -26,6 +26,7 @@ if "%1" == "CLEAN" goto CLEAN
 
    if exist bin\b16\*.exe del bin\b16\*.exe
    if exist bin\b16\*.tds del bin\b16\*.tds
+   if exist bin\b16\*.map del bin\b16\*.map
    if exist lib\b16\*.lib del lib\b16\*.lib
    if exist lib\b16\*.bak del lib\b16\*.bak
    if exist obj\b16\*.obj del obj\b16\*.obj
diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c
index 7754115c84..d6bcc6e35c 100644
--- a/harbour/source/rtl/math.c
+++ b/harbour/source/rtl/math.c
@@ -62,7 +62,7 @@
 
 #if defined(HB_MATH_HANDLER)
 
-static int s_internal_math_error = 0;
+static int s_internal_math_error = 0; /* TOFIX: This is not thread safe. */
 
 /* define harbour specific error handler for math errors
  */
diff --git a/harbour/utils/hbtest/Makefile b/harbour/utils/hbtest/Makefile
index 399d68fee2..37395b5682 100644
--- a/harbour/utils/hbtest/Makefile
+++ b/harbour/utils/hbtest/Makefile
@@ -14,6 +14,7 @@ PRG_SOURCES=\
 	rt_date.prg  \
 	rt_file.prg  \
 	rt_hvm.prg   \
+	rt_hvma.prg  \
 	rt_math.prg  \
 	rt_misc.prg  \
 	rt_str.prg   \
diff --git a/harbour/utils/hbtest/make_xpp.cmd b/harbour/utils/hbtest/make_xpp.cmd
index d9d5db05c2..459fb9aa2a 100644
--- a/harbour/utils/hbtest/make_xpp.cmd
+++ b/harbour/utils/hbtest/make_xpp.cmd
@@ -15,6 +15,6 @@ xpp rt_str.prg   /w /n
 xpp rt_stra.prg  /w /n
 xpp rt_trans.prg /w /n
 
-alink hbtest rt_array rt_date rt_file rt_hvm rt_math rt_misc rt_str rt_trans
+alink hbtest rt_array rt_date rt_file rt_hvm rt_math rt_misc rt_str rt_stra rt_trans
 
 del *.obj