diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e1feb8a0fa..4a44e8317b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-28 13:40 GMT+1 Maurilio Longo <maurilio.longo@libero.it>
+
+   * include/hbdefs.h
+     ! You cannot redefine base types when using GCC under OS/2
+
 2000-03-27 23:20 GMT-5 David G. Holm <dholm@jsd-llc.com>
    * include/hbapi.h
    * include/hbapierr.h
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 8ffd6a30e5..dac25cc865 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -54,7 +54,7 @@
    #endif
 #endif
 
-#if defined(__IBMCPP__)
+#if defined(__IBMCPP__) || defined(HARBOUR_GCC_OS2)
    /* With the exception of WORD, the IBM Visual Age C++ compiler has
       its own definitions of the Harbour types most of which conflict with the
       Harbour #undefs, due to typedef being the prevalent method of
@@ -68,6 +68,9 @@
             define. Any new types, particulary those that start with
             HB_, must be placed AFTER the #endif __IBMCPP__ line!
    */
+   /* 28/03/2000 - maurilio.longo@libero.it
+      The same holds true when using GCC under OS/2
+   */
    #define INCL_TYPES
    #include <os2.h>
    #undef INT