diff --git a/src/compat/fnmatch.c b/src/fnmatch.c
similarity index 100%
rename from src/compat/fnmatch.c
rename to src/fnmatch.c
diff --git a/src/compat/fnmatch.h b/src/fnmatch.h
similarity index 100%
rename from src/compat/fnmatch.h
rename to src/fnmatch.h
diff --git a/src/posix.h b/src/posix.h
index 71bb82283..d565dc11f 100644
--- a/src/posix.h
+++ b/src/posix.h
@@ -10,6 +10,7 @@
 #include "common.h"
 #include <fcntl.h>
 #include <time.h>
+#include "fnmatch.h"
 
 #ifndef S_IFGITLINK
 #define S_IFGITLINK 0160000
diff --git a/src/unix/posix.h b/src/unix/posix.h
index 25038c827..bcd800301 100644
--- a/src/unix/posix.h
+++ b/src/unix/posix.h
@@ -7,13 +7,6 @@
 #ifndef INCLUDE_posix__w32_h__
 #define INCLUDE_posix__w32_h__
 
-#if !defined(__sun) && !defined(__amigaos4__)
-#	include <fnmatch.h>
-#	define p_fnmatch(p, s, f) fnmatch(p, s, f)
-#else
-#	include "compat/fnmatch.h"
-#endif
-
 #include <stdio.h>
 
 #define p_lstat(p,b) lstat(p,b)
diff --git a/src/win32/posix.h b/src/win32/posix.h
index da46cf514..80dcca5c1 100644
--- a/src/win32/posix.h
+++ b/src/win32/posix.h
@@ -8,7 +8,6 @@
 #define INCLUDE_posix__w32_h__
 
 #include "common.h"
-#include "compat/fnmatch.h"
 #include "utf-conv.h"
 
 GIT_INLINE(int) p_link(const char *old, const char *new)