thodg/libgit2

diff --git a/src/path.c b/src/path.c
index c04b506..c2c90e4 100644
--- a/src/path.c
+++ b/src/path.c
@@ -891,7 +891,7 @@ void git_path_iconv_clear(git_path_iconv_t *ic)
 
 int git_path_iconv(git_path_iconv_t *ic, const char **in, size_t *inlen)
 {
-	char *nfd = *in, *nfc;
+	char *nfd = (char*)*in, *nfc;
 	size_t nfdlen = *inlen, nfclen, wantlen = nfdlen, alloclen, rv;
 	int retry = 1;
 
diff --git a/src/unix/posix.h b/src/unix/posix.h
index 425e6bb..c852936 100644
--- a/src/unix/posix.h
+++ b/src/unix/posix.h
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/param.h>
+#include <sys/time.h>
 
 typedef int GIT_SOCKET;
 #define INVALID_SOCKET -1
diff --git a/tests/checkout/checkout_helpers.c b/tests/checkout/checkout_helpers.c
index f6e36d3..42ed1db 100644
--- a/tests/checkout/checkout_helpers.c
+++ b/tests/checkout/checkout_helpers.c
@@ -132,7 +132,6 @@ int checkout_count_callback(
 
 void tick_index(git_index *index)
 {
-	int index_fd;
 	git_time_t ts;
 	struct timeval times[2];