diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 037cbbde832..0677dde92c7 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -66,3 +66,8 @@ set(RPLIDAR_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/rplidar/sdk" PARENT_SCOPE)
 
 # diff_match_patch
 set(diff_match_patch_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/diff_match_patch" PARENT_SCOPE)
+
+# dirent (for MSVC)
+if(MSVC)
+  set(dirent_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/dirent/dirent/include" PARENT_SCOPE)
+endif()
diff --git a/src/libYARP_manager/CMakeLists.txt b/src/libYARP_manager/CMakeLists.txt
index e04b422fe92..1c5c9826e77 100644
--- a/src/libYARP_manager/CMakeLists.txt
+++ b/src/libYARP_manager/CMakeLists.txt
@@ -41,7 +41,6 @@ if(CREATE_LIB_MANAGER)
                         include/yarp/manager/xmltemploader.h
                         include/yarp/manager/yarpbroker.h
                         include/yarp/manager/yarpdevbroker.h
-                        include/yarp/manager/ymm-dir.h
                         include/yarp/manager/ymm-types.h)
 
   set(YARP_manager_IMPL_HDRS include/yarp/manager/impl/textparser.h)
@@ -87,7 +86,9 @@ if(CREATE_LIB_MANAGER)
 
   include_directories(${YARP_TREE_INCLUDE_DIRS})
   include_directories(SYSTEM ${TinyXML_INCLUDE_DIRS})
-
+  if(MSVC)
+    include_directories(SYSTEM ${dirent_INCLUDE_DIRS})
+  endif()
 
   if(CREATE_LIB_MATH)
     add_definitions( -DWITH_YARPMATH )
diff --git a/src/libYARP_manager/include/yarp/manager/ymm-dir.h b/src/libYARP_manager/include/yarp/manager/ymm-dir.h
deleted file mode 100644
index 9221a3840c4..00000000000
--- a/src/libYARP_manager/include/yarp/manager/ymm-dir.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- *  Yarp Modules Manager
- *  Copyright: (C) 2011 Istituto Italiano di Tecnologia (IIT)
- *  Authors: Ali Paikan <ali.paikan@iit.it>
- *
- *  Copy Policy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
- *
- *  Using dirent API for Microsoft Visual Studio from Toni Ronkko (Copyright (C) 2006 Toni Ronkko).
- */
-
-
-#ifndef YARP_MANAGER_YMMDIR
-#define YARP_MANAGER_YMMDIR
-
-
-#if defined(_WIN32)
-
-    #define PATH_SEPERATOR      "\\"
-
-    #define WIN32_LEAN_AND_MEAN
-    #include <windows.h>
-    #include <cstring>
-    #include <cstdlib>
-    #include <sys/types.h>
-    #include <sys/stat.h>
-    #include <cerrno>
-
-    /* File type and permission flags for stat() */
-    #if defined(_MSC_VER)  &&  !defined(S_IREAD)
-    # define S_IFMT   _S_IFMT                      /* file type mask */
-    # define S_IFDIR  _S_IFDIR                     /* directory */
-    # define S_IFCHR  _S_IFCHR                     /* character device */
-    # define S_IFFIFO _S_IFFIFO                    /* pipe */
-    # define S_IFREG  _S_IFREG                     /* regular file */
-    # define S_IREAD  _S_IREAD                     /* read permission */
-    # define S_IWRITE _S_IWRITE                    /* write permission */
-    # define S_IEXEC  _S_IEXEC                     /* execute permission */
-    #endif
-    #define S_IFBLK   0                            /* block device */
-    #define S_IFLNK   0                            /* link */
-    #define S_IFSOCK  0                            /* socket */
-
-    #if defined(_MSC_VER)
-    # define S_IRUSR  S_IREAD                      /* read, user */
-    # define S_IWUSR  S_IWRITE                     /* write, user */
-    # define S_IXUSR  0                            /* execute, user */
-    # define S_IRGRP  0                            /* read, group */
-    # define S_IWGRP  0                            /* write, group */
-    # define S_IXGRP  0                            /* execute, group */
-    # define S_IROTH  0                            /* read, others */
-    # define S_IWOTH  0                            /* write, others */
-    # define S_IXOTH  0                            /* execute, others */
-    #endif
-
-    /* Indicates that d_type field is available in dirent structure */
-    #define _DIRENT_HAVE_D_TYPE
-
-    /* File type flags for d_type */
-    #define DT_UNKNOWN  0
-    #define DT_REG      S_IFREG
-    #define DT_DIR      S_IFDIR
-    #define DT_FIFO     S_IFFIFO
-    #define DT_SOCK     S_IFSOCK
-    #define DT_CHR      S_IFCHR
-    #define DT_BLK      S_IFBLK
-
-    /* Macros for converting between st_mode and d_type */
-    #define IFTODT(mode) ((mode) & S_IFMT)
-    #define DTTOIF(type) (type)
-
-    /*
-     * File type macros.  Note that block devices, sockets and links cannot be
-     * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are
-     * only defined for compatibility.  These macros should always return false
-     * on Windows.
-     */
-    #define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFFIFO)
-    #define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
-    #define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
-    #define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
-    #define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
-    #define S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
-    #define S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
-
-    #ifdef __cplusplus
-    extern "C" {
-    #endif
-
-
-    typedef struct dirent
-    {
-       char d_name[MAX_PATH + 1];                  /* File name */
-       size_t d_namlen;                            /* Length of name without \0 */
-       int d_type;                                 /* File type */
-    } dirent;
-
-
-    typedef struct DIR
-    {
-       dirent           curentry;                  /* Current directory entry */
-       WIN32_FIND_DATAA find_data;                 /* Private file data */
-       int              cached;                    /* True if data is valid */
-       HANDLE           search_handle;             /* Win32 search handle */
-       char             patt[MAX_PATH + 3];        /* Initial directory name */
-    } DIR;
-
-
-    /* Forward declarations */
-    static DIR *opendir(const char *dirname);
-    static struct dirent *readdir(DIR *dirp);
-    static int closedir(DIR *dirp);
-    static void rewinddir(DIR* dirp);
-
-
-    /* Use the new safe string functions introduced in Visual Studio 2005 */
-    #if defined(_MSC_VER) && _MSC_VER >= 1400
-    # define DIRENT_STRNCPY(dest,src,size) strncpy_s((dest),(size),(src),_TRUNCATE)
-    #else
-    # define DIRENT_STRNCPY(dest,src,size) strncpy((dest),(src),(size))
-    #endif
-
-    /* Set errno variable */
-    #if defined(_MSC_VER)
-    #define DIRENT_SET_ERRNO(x) _set_errno (x)
-    #else
-    #define DIRENT_SET_ERRNO(x) (errno = (x))
-    #endif
-
-
-    /*****************************************************************************
-     * Open directory stream DIRNAME for read and return a pointer to the
-     * internal working area that is used to retrieve individual directory
-     * entries.
-     */
-    static DIR *opendir(const char *dirname)
-    {
-       DIR *dirp;
-
-       /* ensure that the resulting search pattern will be a valid file name */
-       if (dirname == NULL) {
-          DIRENT_SET_ERRNO (ENOENT);
-          return NULL;
-       }
-       if (strlen (dirname) + 3 >= MAX_PATH) {
-          DIRENT_SET_ERRNO (ENAMETOOLONG);
-          return NULL;
-       }
-
-       /* construct new DIR structure */
-       dirp = (DIR*) malloc (sizeof (struct DIR));
-       if (dirp != NULL) {
-          int error;
-
-          /*
-           * Convert relative directory name to an absolute directory one.  This
-           * allows rewinddir() to function correctly when the current working
-           * directory is changed between opendir() and rewinddir().
-           */
-          if (GetFullPathNameA (dirname, MAX_PATH, dirp->patt, NULL)) {
-             char *p;
-
-             /* append the search pattern "\\*\0" to the directory name */
-             p = strchr (dirp->patt, '\0');
-             if (dirp->patt < p  &&  *(p-1) != '\\'  &&  *(p-1) != ':') {
-               *p++ = '\\';
-             }
-             *p++ = '*';
-             *p = '\0';
-
-             /* open directory stream and retrieve the first entry */
-             dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
-             if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-                /* a directory entry is now waiting in memory */
-                dirp->cached = 1;
-                error = 0;
-             } else {
-                /* search pattern is not a directory name? */
-                DIRENT_SET_ERRNO (ENOENT);
-                error = 1;
-             }
-          } else {
-             /* buffer too small */
-             DIRENT_SET_ERRNO (ENOMEM);
-             error = 1;
-          }
-
-          if (error) {
-             free (dirp);
-             dirp = NULL;
-          }
-       }
-
-       return dirp;
-    }
-
-
-    /*****************************************************************************
-     * Read a directory entry, and return a pointer to a dirent structure
-     * containing the name of the entry in d_name field.  Individual directory
-     * entries returned by this very function include regular files,
-     * sub-directories, pseudo-directories "." and "..", but also volume labels,
-     * hidden files and system files may be returned.
-     */
-    static struct dirent *readdir(DIR *dirp)
-    {
-       DWORD attr;
-       if (dirp == NULL) {
-          /* directory stream did not open */
-          DIRENT_SET_ERRNO (EBADF);
-          return NULL;
-       }
-
-       /* get next directory entry */
-       if (dirp->cached != 0) {
-          /* a valid directory entry already in memory */
-          dirp->cached = 0;
-       } else {
-          /* get the next directory entry from stream */
-          if (dirp->search_handle == INVALID_HANDLE_VALUE) {
-             return NULL;
-          }
-          if (FindNextFileA (dirp->search_handle, &dirp->find_data) == FALSE) {
-             /* the very last entry has been processed or an error occurred */
-             FindClose (dirp->search_handle);
-             dirp->search_handle = INVALID_HANDLE_VALUE;
-             return NULL;
-          }
-       }
-
-       /* copy as a multibyte character string */
-       DIRENT_STRNCPY ( dirp->curentry.d_name,
-                 dirp->find_data.cFileName,
-                 sizeof(dirp->curentry.d_name) );
-       dirp->curentry.d_name[MAX_PATH] = '\0';
-
-       /* compute the length of name */
-       dirp->curentry.d_namlen = strlen (dirp->curentry.d_name);
-
-       /* determine file type */
-       attr = dirp->find_data.dwFileAttributes;
-       if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
-          dirp->curentry.d_type = DT_CHR;
-       } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
-          dirp->curentry.d_type = DT_DIR;
-       } else {
-          dirp->curentry.d_type = DT_REG;
-       }
-       return &dirp->curentry;
-    }
-
-
-    /*****************************************************************************
-     * Close directory stream opened by opendir() function.  Close of the
-     * directory stream invalidates the DIR structure as well as any previously
-     * read directory entry.
-     */
-    static int closedir(DIR *dirp)
-    {
-       if (dirp == NULL) {
-          /* invalid directory stream */
-          DIRENT_SET_ERRNO (EBADF);
-          return -1;
-       }
-
-       /* release search handle */
-       if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-          FindClose (dirp->search_handle);
-          dirp->search_handle = INVALID_HANDLE_VALUE;
-       }
-
-       /* release directory structure */
-       free (dirp);
-       return 0;
-    }
-
-
-    /*****************************************************************************
-     * Resets the position of the directory stream to which dirp refers to the
-     * beginning of the directory.  It also causes the directory stream to refer
-     * to the current state of the corresponding directory, as a call to opendir()
-     * would have done.  If dirp does not refer to a directory stream, the effect
-     * is undefined.
-     */
-    static void rewinddir(DIR* dirp)
-    {
-       if (dirp != NULL) {
-          /* release search handle */
-          if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-             FindClose (dirp->search_handle);
-          }
-
-          /* open new search handle and retrieve the first entry */
-          dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
-          if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-             /* a directory entry is now waiting in memory */
-             dirp->cached = 1;
-          } else {
-             /* failed to re-open directory: no directory entry in memory */
-             dirp->cached = 0;
-          }
-       }
-    }
-
-
-    #ifdef __cplusplus
-    }
-    #endif
-
-
-#else
-    #include <dirent.h>
-    #define PATH_SEPERATOR      "/"
-#endif
-
-
-#endif // __YARP_MANAGER_YMMDIR__
diff --git a/src/libYARP_manager/src/xmlapploader.cpp b/src/libYARP_manager/src/xmlapploader.cpp
index a5a6fa70666..398b503c9e3 100644
--- a/src/libYARP_manager/src/xmlapploader.cpp
+++ b/src/libYARP_manager/src/xmlapploader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlapploader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <tinyxml.h>
 #include <yarp/os/Value.h>
 #ifdef WITH_GEOMETRY
diff --git a/src/libYARP_manager/src/xmlappsaver.cpp b/src/libYARP_manager/src/xmlappsaver.cpp
index 40f50bacb63..d8df442872b 100644
--- a/src/libYARP_manager/src/xmlappsaver.cpp
+++ b/src/libYARP_manager/src/xmlappsaver.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlappsaver.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 
 #include <algorithm>
 #include <cctype>
diff --git a/src/libYARP_manager/src/xmlclusterloader.cpp b/src/libYARP_manager/src/xmlclusterloader.cpp
index 3adc49f0a4e..abfee8fbcf2 100644
--- a/src/libYARP_manager/src/xmlclusterloader.cpp
+++ b/src/libYARP_manager/src/xmlclusterloader.cpp
@@ -7,7 +7,7 @@
 
 #include <yarp/manager/xmlclusterloader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <tinyxml.h>
 #include <yarp/os/Value.h>
 
diff --git a/src/libYARP_manager/src/xmlmodloader.cpp b/src/libYARP_manager/src/xmlmodloader.cpp
index a848e361652..0a4661fc197 100644
--- a/src/libYARP_manager/src/xmlmodloader.cpp
+++ b/src/libYARP_manager/src/xmlmodloader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlmodloader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <yarp/manager/physicresource.h>
 #include <yarp/manager/logicresource.h>
 #include <yarp/manager/primresource.h>
diff --git a/src/libYARP_manager/src/xmlresloader.cpp b/src/libYARP_manager/src/xmlresloader.cpp
index 3c142af9c2c..83b2faad3ce 100644
--- a/src/libYARP_manager/src/xmlresloader.cpp
+++ b/src/libYARP_manager/src/xmlresloader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlresloader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <yarp/manager/physicresource.h>
 #include <yarp/manager/logicresource.h>
 
diff --git a/src/libYARP_manager/src/xmltemploader.cpp b/src/libYARP_manager/src/xmltemploader.cpp
index 2cf33c1e933..85ac006cada 100644
--- a/src/libYARP_manager/src/xmltemploader.cpp
+++ b/src/libYARP_manager/src/xmltemploader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmltemploader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 
 #include <algorithm>
 #include <cctype>
diff --git a/src/yarpdataplayer/CMakeLists.txt b/src/yarpdataplayer/CMakeLists.txt
index 3e38e515335..3ab1ab683c1 100644
--- a/src/yarpdataplayer/CMakeLists.txt
+++ b/src/yarpdataplayer/CMakeLists.txt
@@ -21,6 +21,10 @@ if(CREATE_YARPDATAPLAYER)
     message(STATUS "yarpdataplayer: OpenCV not selected, keep on building...")
   endif()
 
+  if(MSVC)
+    include_directories(SYSTEM ${dirent_INCLUDE_DIRS})
+  endif()
+
   set(yarpdataplayer_SRCS src/aboutdlg.cpp
                           src/genericinfodlg.cpp
                           src/loadingwidget.cpp
@@ -37,9 +41,7 @@ if(CREATE_YARPDATAPLAYER)
                           include/mainwindow.h
                           include/utils.h
                           include/worker.h)
-  if(MSVC)
-    list(APPEND yarpdataplayer_HDRS include/msvc/dirent.h)
-  endif()
+
   set(yarpdataplayer_QRC_FILES src/RC/res.qrc)
   set(yarpdataplayer_UI_FILES include/UI/aboutdlg.ui
                               include/UI/genericinfodlg.ui
diff --git a/src/yarpdataplayer/include/msvc/dirent.h b/src/yarpdataplayer/include/msvc/dirent.h
deleted file mode 100644
index 846caaa729a..00000000000
--- a/src/yarpdataplayer/include/msvc/dirent.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/*****************************************************************************
- * dirent.h - dirent API for Microsoft Visual Studio
- *
- * Copyright (C) 2006 Toni Ronkko
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * ``Software''), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Mar 15, 2011, Toni Ronkko
- * Defined FILE_ATTRIBUTE_DEVICE for MSVC 6.0.
- *
- * Aug 11, 2010, Toni Ronkko
- * Added d_type and d_namlen fields to dirent structure.  The former is
- * especially useful for determining whether directory entry represents a
- * file or a directory.  For more information, see
- * http://www.delorie.com/gnu/docs/glibc/libc_270.html
- *
- * Aug 11, 2010, Toni Ronkko
- * Improved conformance to the standards.  For example, errno is now set
- * properly on failure and assert() is never used.  Thanks to Peter Brockam
- * for suggestions.
- *
- * Aug 11, 2010, Toni Ronkko
- * Fixed a bug in rewinddir(): when using relative directory names, change
- * of working directory no longer causes rewinddir() to fail.
- *
- * Dec 15, 2009, John Cunningham
- * Added rewinddir member function
- *
- * Jan 18, 2008, Toni Ronkko
- * Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string
- * between multi-byte and unicode representations.  This makes the
- * code simpler and also allows the code to be compiled under MingW.  Thanks
- * to Azriel Fasten for the suggestion.
- *
- * Mar 4, 2007, Toni Ronkko
- * Bug fix: due to the strncpy_s() function this file only compiled in
- * Visual Studio 2005.  Using the new string functions only when the
- * compiler version allows.
- *
- * Nov  2, 2006, Toni Ronkko
- * Major update: removed support for Watcom C, MS-DOS and Turbo C to
- * simplify the file, updated the code to compile cleanly on Visual
- * Studio 2005 with both unicode and multi-byte character strings,
- * removed rewinddir() as it had a bug.
- *
- * Aug 20, 2006, Toni Ronkko
- * Removed all remarks about MSVC 1.0, which is antiqued now.  Simplified
- * comments by removing SGML tags.
- *
- * May 14 2002, Toni Ronkko
- * Embedded the function definitions directly to the header so that no
- * source modules need to be included in the Visual Studio project.  Removed
- * all the dependencies to other projects so that this very header can be
- * used independently.
- *
- * May 28 1998, Toni Ronkko
- * First version.
- *****************************************************************************/
-#ifndef DIRENT_H
-#define DIRENT_H
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <cstring>
-#include <cstdlib>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <cerrno>
-
-/* Entries missing from MSVC 6.0 */
-#if !defined(FILE_ATTRIBUTE_DEVICE)
-# define FILE_ATTRIBUTE_DEVICE 0x40
-#endif
-
-/* File type and permission flags for stat() */
-#if defined(_MSC_VER)  &&  !defined(S_IREAD)
-# define S_IFMT   _S_IFMT                      /* file type mask */
-# define S_IFDIR  _S_IFDIR                     /* directory */
-# define S_IFCHR  _S_IFCHR                     /* character device */
-# define S_IFFIFO _S_IFFIFO                    /* pipe */
-# define S_IFREG  _S_IFREG                     /* regular file */
-# define S_IREAD  _S_IREAD                     /* read permission */
-# define S_IWRITE _S_IWRITE                    /* write permission */
-# define S_IEXEC  _S_IEXEC                     /* execute permission */
-#endif
-#define S_IFBLK   0                            /* block device */
-#define S_IFLNK   0                            /* link */
-#define S_IFSOCK  0                            /* socket */
-
-#if defined(_MSC_VER)
-# define S_IRUSR  S_IREAD                      /* read, user */
-# define S_IWUSR  S_IWRITE                     /* write, user */
-# define S_IXUSR  0                            /* execute, user */
-# define S_IRGRP  0                            /* read, group */
-# define S_IWGRP  0                            /* write, group */
-# define S_IXGRP  0                            /* execute, group */
-# define S_IROTH  0                            /* read, others */
-# define S_IWOTH  0                            /* write, others */
-# define S_IXOTH  0                            /* execute, others */
-#endif
-
-/* Indicates that d_type field is available in dirent structure */
-#define _DIRENT_HAVE_D_TYPE
-
-/* File type flags for d_type */
-#define DT_UNKNOWN  0
-#define DT_REG      S_IFREG
-#define DT_DIR      S_IFDIR
-#define DT_FIFO     S_IFFIFO
-#define DT_SOCK     S_IFSOCK
-#define DT_CHR      S_IFCHR
-#define DT_BLK      S_IFBLK
-
-/* Macros for converting between st_mode and d_type */
-#define IFTODT(mode) ((mode) & S_IFMT)
-#define DTTOIF(type) (type)
-
-/*
- * File type macros.  Note that block devices, sockets and links cannot be
- * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are
- * only defined for compatibility.  These macros should always return false
- * on Windows.
- */
-#define	S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFFIFO)
-#define	S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
-#define	S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
-#define	S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
-#define	S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
-#define	S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
-#define	S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct dirent
-{
-   char d_name[MAX_PATH + 1];                  /* File name */
-   size_t d_namlen;                            /* Length of name without \0 */
-   int d_type;                                 /* File type */
-} dirent;
-
-
-typedef struct DIR
-{
-   dirent           curentry;                  /* Current directory entry */
-   WIN32_FIND_DATAA find_data;                 /* Private file data */
-   int              cached;                    /* True if data is valid */
-   HANDLE           search_handle;             /* Win32 search handle */
-   char             patt[MAX_PATH + 3];        /* Initial directory name */
-} DIR;
-
-
-/* Forward declarations */
-static DIR *opendir(const char *dirname);
-static struct dirent *readdir(DIR *dirp);
-static int closedir(DIR *dirp);
-static void rewinddir(DIR* dirp);
-
-
-/* Use the new safe string functions introduced in Visual Studio 2005 */
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-# define DIRENT_STRNCPY(dest,src,size) strncpy_s((dest),(size),(src),_TRUNCATE)
-#else
-# define DIRENT_STRNCPY(dest,src,size) strncpy((dest),(src),(size))
-#endif
-
-/* Set errno variable */
-#if defined(_MSC_VER)
-#define DIRENT_SET_ERRNO(x) _set_errno (x)
-#else
-#define DIRENT_SET_ERRNO(x) (errno = (x))
-#endif
-
-
-/*****************************************************************************
- * Open directory stream DIRNAME for read and return a pointer to the
- * internal working area that is used to retrieve individual directory
- * entries.
- */
-static DIR *opendir(const char *dirname)
-{
-   DIR *dirp;
-
-   /* ensure that the resulting search pattern will be a valid file name */
-   if (dirname == NULL) {
-      DIRENT_SET_ERRNO (ENOENT);
-      return NULL;
-   }
-   if (strlen (dirname) + 3 >= MAX_PATH) {
-      DIRENT_SET_ERRNO (ENAMETOOLONG);
-      return NULL;
-   }
-
-   /* construct new DIR structure */
-   dirp = (DIR*) malloc (sizeof (struct DIR));
-   if (dirp != NULL) {
-      int error;
-
-      /*
-       * Convert relative directory name to an absolute one.  This
-       * allows rewinddir() to function correctly when the current working
-       * directory is changed between opendir() and rewinddir().
-       */
-      if (GetFullPathNameA (dirname, MAX_PATH, dirp->patt, NULL)) {
-         char *p;
-
-         /* append the search pattern "\\*\0" to the directory name */
-         p = strchr (dirp->patt, '\0');
-         if (dirp->patt < p  &&  *(p-1) != '\\'  &&  *(p-1) != ':') {
-           *p++ = '\\';
-         }
-         *p++ = '*';
-         *p = '\0';
-
-         /* open directory stream and retrieve the first entry */
-         dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
-         if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-            /* a directory entry is now waiting in memory */
-            dirp->cached = 1;
-            error = 0;
-         } else {
-            /* search pattern is not a directory name? */
-            DIRENT_SET_ERRNO (ENOENT);
-            error = 1;
-         }
-      } else {
-         /* buffer too small */
-         DIRENT_SET_ERRNO (ENOMEM);
-         error = 1;
-      }
-
-      if (error) {
-         free (dirp);
-         dirp = NULL;
-      }
-   }
-
-   return dirp;
-}
-
-
-/*****************************************************************************
- * Read a directory entry, and return a pointer to a dirent structure
- * containing the name of the entry in d_name field.  Individual directory
- * entries returned by this very function include regular files,
- * sub-directories, pseudo-directories "." and "..", but also volume labels,
- * hidden files and system files may be returned.
- */
-static struct dirent *readdir(DIR *dirp)
-{
-   DWORD attr;
-   if (dirp == NULL) {
-      /* directory stream did not open */
-      DIRENT_SET_ERRNO (EBADF);
-      return NULL;
-   }
-
-   /* get next directory entry */
-   if (dirp->cached != 0) {
-      /* a valid directory entry already in memory */
-      dirp->cached = 0;
-   } else {
-      /* get the next directory entry from stream */
-      if (dirp->search_handle == INVALID_HANDLE_VALUE) {
-         return NULL;
-      }
-      if (FindNextFileA (dirp->search_handle, &dirp->find_data) == FALSE) {
-         /* the very last entry has been processed or an error occurred */
-         FindClose (dirp->search_handle);
-         dirp->search_handle = INVALID_HANDLE_VALUE;
-         return NULL;
-      }
-   }
-
-   /* copy as a multibyte character string */
-   DIRENT_STRNCPY ( dirp->curentry.d_name,
-             dirp->find_data.cFileName,
-             sizeof(dirp->curentry.d_name) );
-   dirp->curentry.d_name[MAX_PATH] = '\0';
-
-   /* compute the length of name */
-   dirp->curentry.d_namlen = strlen (dirp->curentry.d_name);
-
-   /* determine file type */
-   attr = dirp->find_data.dwFileAttributes;
-   if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
-      dirp->curentry.d_type = DT_CHR;
-   } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
-      dirp->curentry.d_type = DT_DIR;
-   } else {
-      dirp->curentry.d_type = DT_REG;
-   }
-   return &dirp->curentry;
-}
-
-
-/*****************************************************************************
- * Close directory stream opened by opendir() function.  Close of the
- * directory stream invalidates the DIR structure as well as any previously
- * read directory entry.
- */
-static int closedir(DIR *dirp)
-{
-   if (dirp == NULL) {
-      /* invalid directory stream */
-      DIRENT_SET_ERRNO (EBADF);
-      return -1;
-   }
-
-   /* release search handle */
-   if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-      FindClose (dirp->search_handle);
-      dirp->search_handle = INVALID_HANDLE_VALUE;
-   }
-
-   /* release directory structure */
-   free (dirp);
-   return 0;
-}
-
-
-/*****************************************************************************
- * Resets the position of the directory stream to which dirp refers to the
- * beginning of the directory.  It also causes the directory stream to refer
- * to the current state of the corresponding directory, as a call to opendir()
- * would have done.  If dirp does not refer to a directory stream, the effect
- * is undefined.
- */
-static void rewinddir(DIR* dirp)
-{
-   if (dirp != NULL) {
-      /* release search handle */
-      if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-         FindClose (dirp->search_handle);
-      }
-
-      /* open new search handle and retrieve the first entry */
-      dirp->search_handle = FindFirstFileA (dirp->patt, &dirp->find_data);
-      if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-         /* a directory entry is now waiting in memory */
-         dirp->cached = 1;
-      } else {
-         /* failed to re-open directory: no directory entry in memory */
-         dirp->cached = 0;
-      }
-   }
-}
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /*DIRENT_H*/
diff --git a/src/yarpdataplayer/src/utils.cpp b/src/yarpdataplayer/src/utils.cpp
index 91113b3faea..0d0983c51d4 100644
--- a/src/yarpdataplayer/src/utils.cpp
+++ b/src/yarpdataplayer/src/utils.cpp
@@ -21,14 +21,14 @@
     #pragma warning (disable : 4520)
 #endif
 
+#include <dirent.h>
+
 #if defined(_WIN32)
-    #include "include/msvc/dirent.h"
     #undef max                  /*conflict with pango lib coverage.h*/
     #include <direct.h>
     #define GetCurrentDir _getcwd
 #else
     #include <unistd.h>
-    #include <dirent.h>
     #include <cerrno>
     #include <sys/stat.h>
     #define GetCurrentDir getcwd
diff --git a/src/yarpmanager-console/CMakeLists.txt b/src/yarpmanager-console/CMakeLists.txt
index 578e2808fa6..f8c386e67b2 100644
--- a/src/yarpmanager-console/CMakeLists.txt
+++ b/src/yarpmanager-console/CMakeLists.txt
@@ -15,7 +15,10 @@ if(CREATE_YARPMANAGER_CONSOLE)
 
   include_directories(${YARP_OS_INCLUDE_DIRS})
   include_directories(${YARP_manager_INCLUDE_DIRS})
-  include_directories(${ACE_INCLUDE_DIRS})
+  include_directories(SYSTEM ${ACE_INCLUDE_DIRS})
+  if(MSVC)
+    include_directories(SYSTEM ${dirent_INCLUDE_DIRS})
+  endif()
 
   if (YARP_HAS_LIBEDIT)
     add_definitions( -DWITH_LIBEDIT )
diff --git a/src/yarpmanager-console/ymanager.cpp b/src/yarpmanager-console/ymanager.cpp
index 3fcf80d579f..fd5a912e415 100644
--- a/src/yarpmanager-console/ymanager.cpp
+++ b/src/yarpmanager-console/ymanager.cpp
@@ -11,7 +11,7 @@
 
 #include <yarp/manager/xmlapploader.h>
 #include <yarp/manager/application.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <yarp/os/ResourceFinder.h>
 
 /*
diff --git a/src/yarpmanager/CMakeLists.txt b/src/yarpmanager/CMakeLists.txt
index f151de4cda2..95b005d8cc1 100644
--- a/src/yarpmanager/CMakeLists.txt
+++ b/src/yarpmanager/CMakeLists.txt
@@ -16,6 +16,9 @@ if(CREATE_YARPMANAGER)
                       ${YARP_profiler_INCLUDE_DIRS}
                       ./src-builder
                       ./src-manager)
+  if(MSVC)
+    include_directories(SYSTEM ${dirent_INCLUDE_DIRS})
+  endif()
 
   set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
diff --git a/src/yarpmanager/src-manager/entitiestreewidget.cpp b/src/yarpmanager/src-manager/entitiestreewidget.cpp
index 21b1c8d4e9c..d69e9cf4f06 100644
--- a/src/yarpmanager/src-manager/entitiestreewidget.cpp
+++ b/src/yarpmanager/src-manager/entitiestreewidget.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "entitiestreewidget.h"
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <QProcess>
 #include <QHeaderView>
 #include <QMessageBox>
diff --git a/src/yarpmanager/src-manager/mainwindow.cpp b/src/yarpmanager/src-manager/mainwindow.cpp
index 718cd41d08d..da1a902b012 100644
--- a/src/yarpmanager/src-manager/mainwindow.cpp
+++ b/src/yarpmanager/src-manager/mainwindow.cpp
@@ -13,7 +13,7 @@
 
 #include <yarp/os/Log.h>
 #include <yarp/os/ResourceFinder.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <yarp/manager/xmlapploader.h>
 #include <yarp/manager/xmltemploader.h>
 #include <yarp/manager/localbroker.h>
diff --git a/src/yarpmanager/src-manager/newapplicationwizard.cpp b/src/yarpmanager/src-manager/newapplicationwizard.cpp
index 80daccdae1f..b4b0b5f300b 100644
--- a/src/yarpmanager/src-manager/newapplicationwizard.cpp
+++ b/src/yarpmanager/src-manager/newapplicationwizard.cpp
@@ -4,7 +4,7 @@
 #include <QFileInfo>
 #include <QMessageBox>
 
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <yarp/os/Network.h>
 
 using namespace std;