Merge branch 'fc/cleanups'

diff --git a/compat/unsetenv.c b/compat/unsetenv.c
index 3a5e4ec04ae4a523823e633031b85559bf5dc973..4ea18569c240900b0e889873ddc782614c7724a6 100644 (file)
--- a/compat/unsetenv.c
+++ b/compat/unsetenv.c
@@ -1,9 +1,7 @@
-#include <stdlib.h>
-#include <string.h>
+#include "../git-compat-util.h"
 
 void gitunsetenv (const char *name)
 {
-     extern char **environ;
      int src, dst;
      size_t nmln;