diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fb797e4b54..bb9aae18d2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+19991013-01:40 GMT+1 Victor Szel <info@szelvesz.hu>
+   * source/rtl/dates.c
+     ! #ifdef ...WIN_GTAPI changed to proper platform tests.
+
 19991013-19:05 EDT David G. Holm <dholm@jsd-llc.com>
 
    * include/itemapi.h
diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c
index c51e140fac..487f19c2c9 100644
--- a/harbour/source/rtl/dates.c
+++ b/harbour/source/rtl/dates.c
@@ -65,8 +65,12 @@
  *
  */
 
-#ifdef HARBOUR_USE_WIN_GTAPI
+#if defined(_Windows) || defined(WINNT)
+   #define WIN32_LEAN_AND_MEAN
    #include <windows.h>
+   #if defined(__MINGW32__)
+      #define HB_DONT_DEFINE_BASIC_TYPES
+   #endif
 #endif
 
 #include "extend.h"
@@ -605,7 +609,7 @@ HARBOUR HB_TIME( void )
    {
       char szResult[ 9 ];
 
-      #ifdef HARBOUR_USE_WIN_GTAPI
+      #if defined(_Windows) || defined(WINNT)
          SYSTEMTIME st;
          GetLocalTime( &st );
          sprintf( szResult, "%02d:%02d:%02d", st.wHour, st.wMinute, st.wSecond );
@@ -630,7 +634,7 @@ HARBOUR HB_DATE( void )
    {
       char szResult[ 9 ];
 
-      #ifdef HARBOUR_USE_WIN_GTAPI
+      #if defined(_Windows) || defined(WINNT)
          SYSTEMTIME st;
          GetLocalTime( &st );
          sprintf( szResult, "%04d%02d%02d", st.wYear, st.wMonth, st.wDay );