diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 12479dbdf0..b1523dd952 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+20000601-20:40 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
+
+    *source/rtl/dates.c
+	* OS_UNIX_COMPATIBLE is defined in file included from hbapi.h
+	then it cannot be checked before inclusion of hbapi.h
+	
+    *source/rtl/filesys.c
+	* fixed hb_fsEof() for U*ix platforms
+    
 2000-06-01 12:15 UTC-0400 David G. Holm <dholm@jsd-llc.com>
 
    * doc/en/file.txt
diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c
index c54e8f1168..9643f4fe63 100644
--- a/harbour/source/rtl/dates.c
+++ b/harbour/source/rtl/dates.c
@@ -57,15 +57,19 @@
 
 #include <ctype.h>
 #include <time.h>
+
+#include "hbapi.h"
+#include "hbdate.h"
+
+/* NOTE: OS_UNIX_COMPATIBLE can be defined in file included from hbapi.h 
+ * then checking have to be placed after hbapi.h
+*/
 #if defined( OS_UNIX_COMPATIBLE )
    #include <sys/timeb.h>
 #else
    #include <sys\timeb.h>
 #endif
 
-#include "hbapi.h"
-#include "hbdate.h"
-
 long hb_dateEncode( long lYear, long lMonth, long lDay )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_dateEncode(%ld, %ld, %ld)", lYear, lMonth, lDay));
diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index 92270589b1..6ab8152b94 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -1462,7 +1462,7 @@ BOOL hb_fsFile( BYTE * pFilename )
 
 BOOL hb_fsEof( FHANDLE hFileHandle )
 {
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined( OS_UNIX_COMPATIBLE )
    long curPos = lseek( hFileHandle, 0L, SEEK_CUR );
    long endPos = lseek( hFileHandle, 0L, SEEK_END );
    long newPos = lseek( hFileHandle, curPos, SEEK_SET );