diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 951d024cca..b85f31cae8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2003-03-03 23:45 UTC-0500 David G. Holm <dholm@jsd-llc.com>
+  * contrib/libct/makefile.bc
+    ! Added a rule to compile setlast.prg
+  * source/rtl/filesys.c
+  	! Always use X__WIN32__ when testing to see if the extended
+  	  Windows file handle conversion utilities should be used.
+
 2003-01-30 22:10 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * source/vm/asort.c
     ! Some fixes, which became necessary after optimization of string operations.
@@ -1143,6 +1150,13 @@
   * source/rtl/dbdelim.prg
     ! Code fix to handle the field delimiters, provided by the
       APPEND FROM code author, Marco Braida <marcobra@elart.it>.
+
+
+
+
+
+
+
 2006-02-15 13:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/vm/hvm.c
     ! fixed memory leak I introduced changing Ryszard modifications
diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc
index 386b5477b9..238662ea8e 100644
--- a/harbour/contrib/libct/makefile.bc
+++ b/harbour/contrib/libct/makefile.bc
@@ -444,6 +444,9 @@ $(OBJ_DIR)\screen2.obj : $(OBJ_DIR)\screen2.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\setlast.c : $(TOOLS_DIR)\setlast.prg
+   $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
+
 $(OBJ_DIR)\setlast.obj : $(OBJ_DIR)\setlast.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index 6029f0526e..78e8761345 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -246,7 +246,7 @@ static USHORT s_uiErrorLast = 0;
    #define LARGE_MAX ( UINT_MAX - 1L )
 #endif
 
-#ifdef __WIN32__
+#if defined(X__WIN32__)
    #if !defined(__BORLANDC__)
       extern int WintoDosError(DWORD dwError);
    #else
@@ -1216,7 +1216,7 @@ BOOL hb_fsDelete( BYTE * pFilename )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsDelete(%s)", (char*) pFilename));
 
-#if defined(HB_OS_WIN_32)
+#if defined(X__WIN32__)
 
    if ((bResult = DeleteFile( ( char * ) pFilename ))==0)
       #if !defined(__BORLANDC__)
@@ -1464,7 +1464,7 @@ void    hb_fsCommit( FHANDLE hFileHandle )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_fsCommit(%p)", hFileHandle));
 
-#if defined(HB_OS_WIN_32)
+#if defined(X__WIN32__)
 
    FlushFileBuffers( ( HANDLE ) DostoWinHandle(hFileHandle) );
    s_uiErrorLast = ( USHORT ) GetLastError();
@@ -1961,7 +1961,7 @@ BOOL hb_fsEof( FHANDLE hFileHandle )
    return eof( hFileHandle ) != 0;
 #endif
 }
-#ifdef __WIN32__
+#if defined(X__WIN32__)
 HANDLE DostoWinHandle( FHANDLE fHandle)
 {
    HANDLE hHandle=LongToHandle(fHandle);