diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fdaf1ea500..aa301526d2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,23 @@
+20000312-13:58 GMT+1 Victor Szakats <info@szelvesz.hu>
+   * source/tools/io.c
+     ! __DOS__ -> DOS
+   * config/linux/gcc.cf
+     config/w32/msvc.cf
+     - Removed -DDEBUG
+   * config/dos/bcc16.cf
+     config/os2/icc.cf
+     config/w32/bcc32.cf
+     - Removed the default HARBOUR_USE_???_GTAPI define switches, to be in
+       sync with the other GNU-make platforms.
+       WARNING! You have to specify this manually like:
+       set C_USR=-DHARBOUR_USE_DOS_GTAPI
+       set C_USR=-DHARBOUR_USE_OS2_GTAPI
+       set C_USR=-DHARBOUR_USE_WIN_GTAPI
+   * include/hbapifs.h
+     - Removed the #include "hbapifs.h".
+   * source/rtl/mouse/mousedos.c
+     * Small formatting.
+
 20000312-07:10 EST Paul Tucker <ptucker@sympatico.ca>
    * contrib/rdd_ads/ads1.c
      added a couple of casts
diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf
index 30482d2ba4..4f1906e66c 100644
--- a/harbour/config/dos/bcc16.cf
+++ b/harbour/config/dos/bcc16.cf
@@ -24,7 +24,7 @@ endif
 CC = bcc
 CC_IN = -c
 CC_OUT = -o
-CPPFLAGS = -I$($(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP) -I$(_HB_INC_COMPILE) -DHARBOUR_USE_DOS_GTAPI
+CPPFLAGS = -I$($(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP) -I$(_HB_INC_COMPILE)
 CFLAGS = -O2 -mh -d
 
 #Note: The empty line below HAVE TO exist!
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index d1edd8e9b1..55082f8ea3 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -12,7 +12,7 @@ LIB_EXT = .a
 CC = gcc
 CC_IN = -c
 CC_OUT = -o
-CPPFLAGS = -DDEBUG -I. -I$(HB_INC_COMPILE)
+CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS = -Wall -g
 
 LD = gcc
diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf
index b62620ea73..5448e7a02f 100644
--- a/harbour/config/os2/icc.cf
+++ b/harbour/config/os2/icc.cf
@@ -12,7 +12,7 @@ LIB_EXT = .lib
 CC = icc
 CC_IN = /C+ /Tp
 CC_OUT = /Fo
-CPPFLAGS = /I$(GRANDP) /I$(HB_INC_COMPILE) /DHARBOUR_USE_OS2_GTAPI
+CPPFLAGS = /I$(GRANDP) /I$(HB_INC_COMPILE)
 #CFLAGS = /Gs+ /W2 /Se /Sd+ /Ti+
 CFLAGS = /Gs+ /W2 /Se /Sd+
 
diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/w32/bcc32.cf
index bf4cb4ddec..9cacbe2026 100644
--- a/harbour/config/w32/bcc32.cf
+++ b/harbour/config/w32/bcc32.cf
@@ -23,7 +23,7 @@ endif
 CC = bcc32
 CC_IN = -c
 CC_OUT = -o
-CPPFLAGS = -I$(GRANDP) -I$(HB_INC_COMPILE) -DHARBOUR_USE_WIN_GTAPI
+CPPFLAGS = -I$(GRANDP) -I$(HB_INC_COMPILE)
 CFLAGS = -O2 -d
 
 LD = bcc32
diff --git a/harbour/config/w32/msvc.cf b/harbour/config/w32/msvc.cf
index 0613970a7e..3492d52b75 100644
--- a/harbour/config/w32/msvc.cf
+++ b/harbour/config/w32/msvc.cf
@@ -12,7 +12,7 @@ LIB_EXT = .lib
 CC = cl.exe
 CC_IN = -c
 CC_OUT = -Fo
-CPPFLAGS = -DDEBUG -I. -I$(HB_INC_COMPILE)
+CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS = -W0 -Zi  # -W4 for max warnings
 
 LD = cl.exe
diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h
index 800ba4b7ff..5958c21b19 100644
--- a/harbour/include/hbapifs.h
+++ b/harbour/include/hbapifs.h
@@ -55,7 +55,6 @@
 #define HB_APIFS_H_
 
 #include "hbapi.h"
-#include "hbapifs.h"
 #include "fileio.ch"
 
 #define FS_ERROR F_ERROR
diff --git a/harbour/source/rtl/mouse/mousedos.c b/harbour/source/rtl/mouse/mousedos.c
index 8c9eabcf44..c0f2e47d40 100644
--- a/harbour/source/rtl/mouse/mousedos.c
+++ b/harbour/source/rtl/mouse/mousedos.c
@@ -110,7 +110,7 @@ void hb_mouse_Hide( void )
 
    if( s_bPresent )
    {
-#if defined(__DJGPP__)|| defined(__BORLANDC__)
+#if defined(__DJGPP__) || defined(__BORLANDC__)
       union REGS regs;
 
       regs.x.ax = 2;
@@ -127,7 +127,7 @@ int hb_mouse_Col( void )
 
    if( s_bPresent )
    {
-#if defined(__DJGPP__)|| defined(__BORLANDC__)
+#if defined(__DJGPP__) || defined(__BORLANDC__)
       union REGS regs;
 
       regs.x.ax = 3;
@@ -146,7 +146,7 @@ int hb_mouse_Row( void )
 {
    if( s_bPresent )
    {
-#if defined(__DJGPP__)|| defined(__BORLANDC__)
+#if defined(__DJGPP__) || defined(__BORLANDC__)
       union REGS regs;
 
       regs.x.ax = 3;
diff --git a/harbour/source/tools/io.c b/harbour/source/tools/io.c
index 42bc4551e8..cb5f8cdb9d 100644
--- a/harbour/source/tools/io.c
+++ b/harbour/source/tools/io.c
@@ -12,7 +12,7 @@
 
 HARBOUR HB_CD( void )
 {
-#if defined(__DOS__)
+#if defined(DOS)
    hb_retni( ISCHAR( 1 ) ? chdir( hb_parc( 1 ) ) : 0 );
 #else
    hb_retni( 0 );
@@ -21,7 +21,7 @@ HARBOUR HB_CD( void )
 
 HARBOUR HB_MD(void)
 {
-#if defined(__DOS__)
+#if defined(DOS)
    hb_retni( ISCHAR( 1 ) ? mkdir( hb_parc( 1 ) ) : 0 );
 #else
    hb_retni( 0 );
@@ -30,7 +30,7 @@ HARBOUR HB_MD(void)
 
 HARBOUR HB_RD( void )
 {
-#if defined(__DOS__)
+#if defined(DOS)
    hb_retni( ISCHAR( 1 ) ? rmdir( hb_parc( 1 ) ) : 0 );
 #else
    hb_retni( 0 );