Merge branch 'master' into next

diff --git a/compat/strcasestr.c b/compat/strcasestr.c
index b96414d36b4d246f6adf47c14335052119bd0269..26896deca64c531f57b4c48ea92134f876b8e537 100644 (file)
--- a/compat/strcasestr.c
+++ b/compat/strcasestr.c
@@ -1,5 +1,4 @@
-#include <string.h>
-#include <ctype.h>
+#include "../git-compat-util.h"
 
 char *gitstrcasestr(const char *haystack, const char *needle)
 {