  #ifndef NO_SYS_POLL_H
  #include <sys/poll.h>
  #else
-@@ -199,13 +201,17 @@
- #include <sys/wait.h>
- #include <sys/resource.h>
- #include <sys/socket.h>
-+#if !defined(__redox__)
- #include <sys/ioctl.h>
-+#endif
- #include <termios.h>
- #ifndef NO_SYS_SELECT_H
- #include <sys/select.h>
- #endif
- #include <netinet/in.h>
-+#if !defined(__redox__)
- #include <netinet/tcp.h>
-+#endif
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <pwd.h>
-@@ -320,8 +326,20 @@
+@@ -320,8 +322,20 @@
  #endif
  
  #ifndef PATH_SEP

 #else
 
 char *git_terminal_prompt(const char *prompt, int echo)
diff -ruw source/connect.c source-new/connect.c
--- source/connect.c	2017-06-04 19:08:11.000000000 -0600
+++ source-new/connect.c	2018-12-26 18:56:40.601235949 -0700
@@ -450,7 +450,7 @@
 
 	he = gethostbyname(host);
 	if (!he)
-		die("Unable to look up %s (%s)", host, hstrerror(h_errno));
+		die("Unable to look up %s (%s)", host, strerror(errno));
 	nport = strtoul(port, &ep, 10);
 	if ( ep == port || *ep ) {
 		/* Not numeric */
diff -ruw source/daemon.c source-new/daemon.c
--- source/daemon.c	2017-06-04 19:08:11.000000000 -0600
+++ source-new/daemon.c	2018-12-26 19:15:52.002437841 -0700
@@ -71,13 +71,21 @@
 	return hi->ip_address.buf;
 }

 		/* avoid splitting a message in the middle */
 		setvbuf(stderr, NULL, _IOFBF, 4096);
 
diff -ruw source/git-compat-util.h source-new/git-compat-util.h
--- source/git-compat-util.h	2017-06-04 19:08:11.000000000 -0600
+++ source-new/git-compat-util.h	2019-03-13 15:56:28.419769725 -0600
@@ -179,7 +179,9 @@
 #include <assert.h>
 #include <regex.h>
