diff --git a/src/channel.c b/src/channel.c
index d872ea9d..e3ab8bfe 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -37,9 +37,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
 
 #include <assert.h>
 
diff --git a/src/hostkey.c b/src/hostkey.c
index aae34b08..57cbe224 100644
--- a/src/hostkey.c
+++ b/src/hostkey.c
@@ -33,11 +33,6 @@
 
 #include "libssh2_priv.h"
 
-/* Needed for struct iovec on some platforms */
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
 #if LIBSSH2_RSA
 /* *********
  * ssh-rsa *
diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h
index 4c6f3b7e..db56b486 100644
--- a/src/libssh2_priv.h
+++ b/src/libssh2_priv.h
@@ -65,9 +65,8 @@
 #include <sys/select.h>
 #endif
 
-/* Needed for struct iovec on some platforms */
 #ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
+#include <sys/uio.h>  /* for struct iovec on some platforms */
 #endif
 
 #ifndef _WIN32
diff --git a/src/packet.c b/src/packet.c
index 17115197..1b98cebd 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -38,13 +38,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-/* Needed for struct iovec on some platforms */
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
 
 #include "transport.h"
 #include "channel.h"
diff --git a/src/userauth.c b/src/userauth.c
index 06769954..202335f3 100644
--- a/src/userauth.c
+++ b/src/userauth.c
@@ -36,11 +36,6 @@
 
 #include <ctype.h>
 
-/* Needed for struct iovec on some platforms */
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
 #include "transport.h"
 #include "session.h"
 #include "userauth.h"