thodg/libgit2

diff --git a/src/path.c b/src/path.c
index cf9a377..c9716ef 100644
--- a/src/path.c
+++ b/src/path.c
@@ -8,7 +8,6 @@
 #include "path.h"
 #include "posix.h"
 #ifdef GIT_WIN32
-#include "win32/dir.h"
 #include "win32/posix.h"
 #else
 #include <dirent.h>
diff --git a/src/win32/dir.c b/src/win32/dir.c
index f75b8d5..cd3c7de 100644
--- a/src/win32/dir.c
+++ b/src/win32/dir.c
@@ -5,8 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 #define GIT__WIN32_NO_WRAP_DIR
-#include "dir.h"
-#include "utf-conv.h"
+#include "posix.h"
 
 static int init_filter(char *filter, size_t n, const char *dir)
 {
diff --git a/src/win32/posix.h b/src/win32/posix.h
index 0d5effe..b573f49 100644
--- a/src/win32/posix.h
+++ b/src/win32/posix.h
@@ -9,6 +9,7 @@
 
 #include "common.h"
 #include "utf-conv.h"
+#include "dir.h"
 
 GIT_INLINE(int) p_link(const char *old, const char *new)
 {