diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 8591612324..074cd75f9e 100644
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -56,7 +56,9 @@ bool wxDir::HasFiles(const wxString& spec)
 }
 
 // we have a (much) faster version for Unix
-#if !defined(__UNIX_LIKE__) || defined(__WXMAC__)
+// MBN: Cygwin should use the Unix version, but with the current build sistem
+//      this is painful
+#if defined(__CYGWIN__) || !defined(__UNIX_LIKE__) || defined(__WXMAC__)
 
 bool wxDir::HasSubDirs(const wxString& spec)
 {
diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 64c75ed284..11fcf168e5 100644
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -28,6 +28,8 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include <wx/icon.h>
+#include <wx/intl.h>
 #endif // WX_PRECOMP
 
 #include "wx/dir.h"
@@ -388,7 +390,7 @@ wxArrayString wxFSVolume::GetVolumes(int flagsSet, int flagsUnset)
     while (*pVol)
     {
         FilteredAdd(list, pVol, flagsSet, flagsUnset);
-        pVol = pVol + _tcslen(pVol) + 1;
+        pVol = pVol + wxStrlen(pVol) + 1;
     }
 
     // Cleanup.