diff --git a/harbour/config/w32/global.cf b/harbour/config/w32/global.cf
index 40d4834b98..d17fe24790 100644
--- a/harbour/config/w32/global.cf
+++ b/harbour/config/w32/global.cf
@@ -45,6 +45,7 @@ dirbase::
 
 clean::
 	-for %f in ($(ARCH_DOS)\*.*) do $(RM) %f
+	-for %%f in ($(ARCH_DOS)\*.*) do $(RM) %%f
 	-if exist *.bak $(RM) *.bak
 	-if exist *.obj $(RM) *.obj
 	-if exist core $(RM) core
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index b9baec6c44..5cabd94ec2 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -7,6 +7,7 @@ ROOT = ../
 ifeq ($(HB_ARCHITECTURE),w32)
 
 DIRS=\
+	btree \
 	htmllib \
 	libct \
 	libgt \
@@ -17,7 +18,7 @@ DIRS=\
 
 
 else
-ifeq ($(HB_ARCHITECTURE),os2)
+ifeq ($(HB_COMPILER),icc)
 
 DIRS=\
 	hgf/os2pm \
@@ -29,8 +30,22 @@ DIRS=\
 	samples \
 
 else
+ifeq ($(HB_ARCHITECTURE),os2)
 
 DIRS=\
+	btree \
+	hgf/os2pm \
+	htmllib \
+	libct \
+	libgt \
+	libmisc \
+	libnf \
+	samples \
+
+else
+
+DIRS=\
+	btree \
 	htmllib \
 	libct \
 	libgt \
@@ -40,5 +55,6 @@ DIRS=\
 
 endif
 endif
+endif
 
 include $(ROOT)config/dir.cf
diff --git a/harbour/contrib/libnf/Makefile b/harbour/contrib/libnf/Makefile
index b390d868a5..4040ec33a7 100644
--- a/harbour/contrib/libnf/Makefile
+++ b/harbour/contrib/libnf/Makefile
@@ -96,7 +96,6 @@ PRG_SOURCES= \
 	miltime.prg \
 	min2dhm.prg \
 	month.prg \
-	mouse1.prg \
 	mouse2.prg \
 	netpv.prg \
 	nooccur.prg \
@@ -139,6 +138,9 @@ PRG_SOURCES= \
 	xbox.prg \
 	year.prg \
 
+BAD_PRG_SOURCES= \
+	mouse1.prg \
+
 LIBNAME=nf
 
 include $(TOP)$(ROOT)config/lib.cf
diff --git a/harbour/contrib/rdd_ads/ace.h b/harbour/contrib/rdd_ads/ace.h
index 363b93064f..e16e662f78 100644
--- a/harbour/contrib/rdd_ads/ace.h
+++ b/harbour/contrib/rdd_ads/ace.h
@@ -35,15 +35,16 @@
 #endif  // ADS_LINUX && ACE
 
 
-#ifdef ADS_LINUX
+#if defined(ADS_LINUX) || defined(__GNUC__)
    #pragma pack( 1 )
 #else
    #pragma pack( push, 1 )
 #endif
 
 /* This forces a warning for single equals in if statements */
-#ifdef WIN32
-   // 16-bit compiler doesn't seem to like this
+#if defined( WIN32 ) && !defined( ADS_LINUX )
+   /* 16-bit compiler doesn't seem to like this */
+   /* MingWin reports "warning: ignoring pragma: )" */
    #pragma warning( error : 4706 )
 
    #define ADS_PATH_DELIMITER    '\\'
@@ -78,7 +79,7 @@
 
 #if defined( ASANLM ) || defined( ADS_LINUX ) || defined( ASANT ) || defined( NLM ) || defined( ADS_NT ) || defined( ADS_WIN9X ) || defined( STAND_ALONE_EXE )
    #define ENTRYPOINT
-#elif defined( WIN32 ) && !defined( __BORLANDC__ )
+#elif defined( WIN32 ) && !defined( __BORLANDC__ ) && ! defined( __GNUC__ )
    #define ENTRYPOINT _declspec( dllexport ) WINAPI
 #else
    #define ENTRYPOINT _export WINAPI
@@ -2264,7 +2265,7 @@ UNSIGNED32 ENTRYPOINT AdsDDDeployDatabase( UNSIGNED8 *pucDestination,
 #endif
 
 
-#ifdef ADS_LINUX
+#if defined(ADS_LINUX) || defined(__GNUC__)
    #pragma pack()
 #else
    #pragma pack( pop )
diff --git a/harbour/contrib/samples/num.c b/harbour/contrib/samples/num.c
index 51cb8887a8..64649c5b16 100644
--- a/harbour/contrib/samples/num.c
+++ b/harbour/contrib/samples/num.c
@@ -55,6 +55,10 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
+#ifdef PI
+/* DJGPP defines PI in math.h */
+#undef PI
+#endif
 #define PI  ( 3.1415926535897932384626433 )
 
 /* Ceiling( <nNumber> ) --> nInteger