diff --git a/libssh/kex.c b/libssh/kex.c
index 5851e9e5..e66c0aa4 100644
--- a/libssh/kex.c
+++ b/libssh/kex.c
@@ -40,6 +40,8 @@
 #include "libssh/wrapper.h"
 #include "libssh/keys.h"
 #include "libssh/dh.h"
+#include "libssh/kex.h"
+#include "libssh/string.h"
 
 #ifdef HAVE_LIBGCRYPT
 #define BLOWFISH "blowfish-cbc,"
diff --git a/libssh/keys.c b/libssh/keys.c
index 45b79390..56f80ebf 100644
--- a/libssh/keys.c
+++ b/libssh/keys.c
@@ -36,6 +36,7 @@
 #include "libssh/keys.h"
 #include "libssh/dh.h"
 #include "libssh/messages.h"
+#include "libssh/string.h"
 
 /** \addtogroup ssh_auth
  * @{