diff --git a/main/acl.c b/main/acl.c
index d803290e6c..f82a0805cf 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -30,13 +30,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
diff --git a/main/asterisk.c b/main/asterisk.c
index a94972cc5c..1f03484d24 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -70,7 +70,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <sys/resource.h>
@@ -88,13 +87,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #endif /* linux */
 #include <regex.h>
 
-#if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #if defined(SOLARIS)
 int daemon(int, int);  /* defined in libresolv of all places */
 #include <sys/loadavg.h>
 #endif
-#endif
 
 #include "asterisk/logger.h"
 #include "asterisk/options.h"