diff --git a/harbour/contrib/libct/files.c b/harbour/contrib/libct/files.c
index 9c03a6fe34..98862bcba7 100644
--- a/harbour/contrib/libct/files.c
+++ b/harbour/contrib/libct/files.c
@@ -78,22 +78,12 @@ static struct ffblk fsOldFiles;
       #include "dos.h"
       #include <dir.h>
 #endif
-#if defined(HB_OS_WIN_32) || defined(__MINGW32__)
+#if defined(HB_OS_WIN_32) || defined(__MINGW32__) && !defined(__CYGWIN__)
 static       HANDLE hLastFind;
 static       WIN32_FIND_DATA  Lastff32;
 LPTSTR GetDate(FILETIME *rTime);
 LPTSTR GetTime(FILETIME *rTime);
 #include <dir.h>
-/*
-   #if defined(__MINGW32__)
-   #define FA_RDONLY           1   
-   #define FA_HIDDEN           2   
-   #define FA_SYSTEM           4   
-   #define FA_LABEL            8   
-   #define FA_DIREC           16   
-   #define FA_ARCH            32   
-   #endif
-   */
 #endif
 
 #if !defined(FA_ARCH)
diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc
index 30c30f9b36..79143b103b 100644
--- a/harbour/contrib/libct/makefile.bc
+++ b/harbour/contrib/libct/makefile.bc
@@ -115,6 +115,7 @@ TOOLS_LIB_OBJS = \
    $(OBJ_DIR)\ctcolton.obj \
    $(OBJ_DIR)\ctcrypt.obj \
    $(OBJ_DIR)\finan.obj \
+   $(OBJ_DIR)\files.obj \
    $(OBJ_DIR)\justify.obj \
    $(OBJ_DIR)\math.obj \
    $(OBJ_DIR)\num1.obj \
@@ -254,6 +255,10 @@ $(OBJ_DIR)\finan.obj : $(TOOLS_DIR)\finan.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
 
+$(OBJ_DIR)\files.obj : $(TOOLS_DIR)\files.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\justify.obj : $(TOOLS_DIR)\justify.c
    $(CC) $(CLIBFLAGS) -o$@ $**
    tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,