diff --git a/.gnulib b/.gnulib
index e2843e30e8..28e58203a7 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit e2843e30e8c2885eb8cbc77e20c4e0f4d562d44d
+Subproject commit 28e58203a7ab14264f8fa450884a89e9ae48025c
diff --git a/bootstrap.conf b/bootstrap.conf
index fa2880a693..1e193d9ac0 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -39,6 +39,7 @@ ioctl
 maintainer-makefile
 mkstemp
 mktempd
+netdb
 perror
 physmem
 poll
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 91d19e9725..51c9afc3a8 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -38,12 +38,6 @@
 
 #define VIR_FROM_THIS VIR_FROM_ESX
 
-/* AI_ADDRCONFIG is missing on some systems. */
-#ifndef AI_ADDRCONFIG
-# define AI_ADDRCONFIG 0
-#endif
-
-
 
 int
 esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter,
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index bd7d617ace..e4a68ad5e0 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -68,11 +68,6 @@
 
 #include <poll.h>
 
-/* AI_ADDRCONFIG is missing on some systems. */
-#ifndef AI_ADDRCONFIG
-# define AI_ADDRCONFIG 0
-#endif
-
 #include "virterror_internal.h"
 #include "logging.h"
 #include "datatypes.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 21325c3e54..693d40917e 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -21,6 +21,7 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/wait.h>
 #include "c-ctype.h"
 #include <fcntl.h>
 #include <locale.h>
@@ -82,9 +83,6 @@ static char *progname;
 #define LVL_WARNING   "WARNING"
 #define LVL_ERROR     "ERROR"
 
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(x) ((x) & 0xff)
-#endif
 /**
  * vshErrorLevel:
  *
@@ -9930,9 +9928,6 @@ vshInit(vshControl *ctl)
     return TRUE;
 }
 
-#ifndef O_SYNC
-# define O_SYNC 0
-#endif
 #define LOGFILE_FLAGS (O_WRONLY | O_APPEND | O_CREAT | O_SYNC)
 
 /**