This is 0.9.6-maint only, but similar changes are upstream
#include <sys/stat.h>
#include <unistd.h>
#include <mntent.h>
-#include <dirent.h>
/* Yes, we want linux private one, for _syscall2() macro */
#include <linux/unistd.h>
#include <sys/types.h>
#include <sys/poll.h>
-#include <dirent.h>
#include <limits.h>
#include <string.h>
#include <stdio.h>
#include "memory.h"
#include "logging.h"
#include "virfile.h"
-#include <dirent.h>
#define VIR_FROM_THIS VIR_FROM_NODEDEV
#include <sys/types.h>
#include <sys/poll.h>
-#include <dirent.h>
#include <limits.h>
#include <string.h>
#include <stdio.h>
#include <config.h>
-#include <dirent.h>
#include <string.h>
#include <limits.h>
#include <sys/types.h>
#include <regex.h>
#include <fcntl.h>
#include <unistd.h>
-#include <dirent.h>
#include <sys/stat.h>
#include "virterror_internal.h"
#include <unistd.h>
#include <stdio.h>
-#include <dirent.h>
#include <fcntl.h>
#include <libdevmapper.h>
#include <config.h>
-#include <dirent.h>
#include <string.h>
#include <limits.h>
#include <sys/types.h>
#include <sys/types.h>
#include <sys/poll.h>
-#include <dirent.h>
#include <limits.h>
#include <string.h>
#include <stdio.h>