diff --git a/libssh/auth.c b/libssh/auth.c
index 5ca7934d..0dba3da6 100644
--- a/libssh/auth.c
+++ b/libssh/auth.c
@@ -24,7 +24,7 @@ MA 02111-1307, USA. */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <netdb.h>
+
 /** defgroup ssh_auth
  * \brief functions to authenticate
  */
diff --git a/libssh/buffer.c b/libssh/buffer.c
index 673c6c55..8d63b4b2 100644
--- a/libssh/buffer.c
+++ b/libssh/buffer.c
@@ -22,7 +22,6 @@ MA 02111-1307, USA. */
 
 #include <stdlib.h>
 #include <string.h>
-#include <netdb.h>
 #include "libssh/priv.h"
 
 /** defgroup ssh_buffer
diff --git a/libssh/channels.c b/libssh/channels.c
index ffcac465..3d2747b9 100644
--- a/libssh/channels.c
+++ b/libssh/channels.c
@@ -25,7 +25,6 @@ MA 02111-1307, USA. */
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
-#include <netdb.h>
 
 #include "libssh/priv.h"
 #include "libssh/ssh2.h"
diff --git a/libssh/channels1.c b/libssh/channels1.c
index 065bfbd0..c8ab3e24 100644
--- a/libssh/channels1.c
+++ b/libssh/channels1.c
@@ -24,7 +24,6 @@ MA 02111-1307, USA. */
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <netdb.h>
 #include "libssh/priv.h"
 #include "libssh/ssh1.h"
 
diff --git a/libssh/client.c b/libssh/client.c
index e931fe4e..d8dffcc6 100644
--- a/libssh/client.c
+++ b/libssh/client.c
@@ -22,7 +22,6 @@ MA 02111-1307, USA. */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <netdb.h>
 #include "libssh/priv.h"
 #include "libssh/ssh2.h"
 
diff --git a/libssh/crypt.c b/libssh/crypt.c
index 589fc978..e2f53aa1 100644
--- a/libssh/crypt.c
+++ b/libssh/crypt.c
@@ -24,7 +24,6 @@ MA 02111-1307, USA. */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <netdb.h>
 
 #ifdef OPENSSL_CRYPTO
 #include <openssl/blowfish.h>
diff --git a/libssh/dh.c b/libssh/dh.c
index 9cb6907b..b8d68248 100644
--- a/libssh/dh.c
+++ b/libssh/dh.c
@@ -38,7 +38,6 @@ MA 02111-1307, USA. */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <netdb.h>
 
 #include "libssh/priv.h"
 #include "libssh/crypto.h"
diff --git a/libssh/kex.c b/libssh/kex.c
index 21d920d3..9a2c30f7 100644
--- a/libssh/kex.c
+++ b/libssh/kex.c
@@ -22,7 +22,6 @@ MA 02111-1307, USA. */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <netdb.h>
 #include "libssh/priv.h"
 #include "libssh/ssh2.h"
 #include "libssh/ssh1.h"
diff --git a/libssh/messages.c b/libssh/messages.c
index 730aa54b..5743ab80 100644
--- a/libssh/messages.c
+++ b/libssh/messages.c
@@ -28,7 +28,6 @@ MA 02111-1307, USA. */
 
 #include <string.h>
 #include <stdlib.h>
-#include <netdb.h>
 #include "libssh/libssh.h"
 #include "libssh/priv.h"
 #include "libssh/server.h"
diff --git a/libssh/misc.c b/libssh/misc.c
index 84dd4eaf..963748fb 100644
--- a/libssh/misc.c
+++ b/libssh/misc.c
@@ -32,7 +32,6 @@ MA 02111-1307, USA. */
 #include <winsock2.h>
 #else
 #include <pwd.h>
-#include <netdb.h>
 #endif
 
 #include "libssh/libssh.h"
diff --git a/libssh/packet.c b/libssh/packet.c
index fcb37c54..d0dcc716 100644
--- a/libssh/packet.c
+++ b/libssh/packet.c
@@ -24,7 +24,6 @@ MA 02111-1307, USA. */
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <netdb.h>
 #include "libssh/priv.h"
 #include "libssh/ssh2.h"
 #include "libssh/ssh1.h"
diff --git a/libssh/sftp.c b/libssh/sftp.c
index 5a49fb7b..7299be41 100644
--- a/libssh/sftp.c
+++ b/libssh/sftp.c
@@ -25,7 +25,6 @@ MA 02111-1307, USA. */
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-#include <netdb.h>
 #include "libssh/priv.h"
 #include "libssh/ssh2.h"
 #include "libssh/sftp.h"
diff --git a/libssh/sftpserver.c b/libssh/sftpserver.c
index 23286c82..9279025f 100644
--- a/libssh/sftpserver.c
+++ b/libssh/sftpserver.c
@@ -23,7 +23,6 @@ MA 02111-1307, USA. */
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <netdb.h>
 #include "libssh/libssh.h"
 #include "libssh/sftp.h"
 #include "libssh/ssh2.h"
diff --git a/libssh/string.c b/libssh/string.c
index 5f27326c..2aa47956 100644
--- a/libssh/string.c
+++ b/libssh/string.c
@@ -23,7 +23,6 @@ MA 02111-1307, USA. */
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <netdb.h>
 #include "libssh/priv.h"
 
 STRING *string_new(unsigned int size){