diff --git a/include/libssh/dh.h b/include/libssh/dh.h
index dc4c69a0..c82cba79 100644
--- a/include/libssh/dh.h
+++ b/include/libssh/dh.h
@@ -21,10 +21,8 @@
 
 #ifndef DH_H_
 #define DH_H_
-#include "config.h"
 
-/* DH key generation */
-#include "libssh/keys.h"
+#include "config.h"
 
 void ssh_print_bignum(const char *which,bignum num);
 int dh_generate_e(ssh_session session);
diff --git a/src/agent.c b/src/agent.c
index 420b23d9..fb3e975f 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -52,7 +52,6 @@
 #include "libssh/socket.h"
 #include "libssh/buffer.h"
 #include "libssh/session.h"
-#include "libssh/keys.h"
 #include "libssh/poll.h"
 #include "libssh/pki.h"
 
diff --git a/src/dh.c b/src/dh.c
index ea41c1c4..44251714 100644
--- a/src/dh.c
+++ b/src/dh.c
@@ -53,7 +53,6 @@
 #include "libssh/crypto.h"
 #include "libssh/buffer.h"
 #include "libssh/session.h"
-#include "libssh/keys.h"
 #include "libssh/misc.h"
 #include "libssh/dh.h"
 #include "libssh/ssh2.h"
diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c
index 61883341..cf770611 100644
--- a/src/pki_gcrypt.c
+++ b/src/pki_gcrypt.c
@@ -34,7 +34,6 @@
 #include "libssh/session.h"
 #include "libssh/wrapper.h"
 #include "libssh/misc.h"
-#include "libssh/keys.h"
 #include "libssh/pki.h"
 #include "libssh/pki_priv.h"