More include file splitting

16 files changed, 25 insertions, 1 deletions

diff --git a/libssh/agent.c b/libssh/agent.c
index 1f425b63..a4e0efbf 100644
--- a/libssh/agent.c
+++ b/libssh/agent.c
@@ -53,6 +53,7 @@
 #include "libssh/socket.h"
 #include "libssh/buffer.h"
 #include "libssh/session.h"
+#include "libssh/keys.h"
 
 /* macro to check for "agent failure" message */
 #define agent_failed(x) \
diff --git a/libssh/auth.c b/libssh/auth.c
index 36e06ae7..3b64e0f6 100644
--- a/libssh/auth.c
+++ b/libssh/auth.c
@@ -38,6 +38,7 @@
 #include "libssh/packet.h"
 #include "libssh/session.h"
 #include "libssh/options.h"
+#include "libssh/keys.h"
 
 /** \defgroup ssh_auth SSH Authentication functions
  * \brief functions to authenticate to servers
diff --git a/libssh/channels.c b/libssh/channels.c
index cb7e5439..f96051ef 100644
--- a/libssh/channels.c
+++ b/libssh/channels.c
@@ -39,6 +39,7 @@
 #include "libssh/socket.h"
 #include "libssh/channels.h"
 #include "libssh/session.h"
+#include "libssh/misc.h"
 
 #define WINDOWBASE 128000
 #define WINDOWLIMIT (WINDOWBASE/2)
diff --git a/libssh/client.c b/libssh/client.c
index 3ff92da9..8c5e8ba7 100644
--- a/libssh/client.c
+++ b/libssh/client.c
@@ -36,6 +36,7 @@
 #include "libssh/socket.h"
 #include "libssh/session.h"
 #include "libssh/options.h"
+#include "libssh/dh.h"
 
 #define set_status(opt,status) do {\
         if (opt->callbacks && opt->callbacks->connect_status_function) \
diff --git a/libssh/dh.c b/libssh/dh.c
index 9088bb9d..abb07629 100644
--- a/libssh/dh.c
+++ b/libssh/dh.c
@@ -54,6 +54,8 @@
 #include "libssh/buffer.h"
 #include "libssh/session.h"
 #include "libssh/options.h"
+#include "libssh/keys.h"
+#include "libssh/dh.h"
 
 /* todo: remove it */
 #include "libssh/string.h"
diff --git a/libssh/init.c b/libssh/init.c
index 99288206..bab9cdfb 100644
--- a/libssh/init.c
+++ b/libssh/init.c
@@ -21,8 +21,10 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include "libssh/priv.h"
 #include "libssh/socket.h"
+#include "libssh/dh.h"
 
 #ifdef _WIN32
 #include <winsock2.h>
diff --git a/libssh/kex.c b/libssh/kex.c
index d5eba61e..d8d5b849 100644
--- a/libssh/kex.c
+++ b/libssh/kex.c
@@ -39,6 +39,8 @@
 #include "libssh/session.h"
 #include "libssh/wrapper.h"
 #include "libssh/options.h"
+#include "libssh/keys.h"
+#include "libssh/dh.h"
 
 #ifdef HAVE_LIBGCRYPT
 #define BLOWFISH "blowfish-cbc,"
diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c
index 7ac1161b..193fd115 100644
--- a/libssh/keyfiles.c
+++ b/libssh/keyfiles.c
@@ -43,6 +43,8 @@
 #include "libssh/session.h"
 #include "libssh/wrapper.h"
 #include "libssh/options.h"
+#include "libssh/misc.h"
+#include "libssh/keys.h"
 
 /*todo: remove this include */
 #include "libssh/string.h"
diff --git a/libssh/keys.c b/libssh/keys.c
index eea217c3..4908608d 100644
--- a/libssh/keys.c
+++ b/libssh/keys.c
@@ -33,6 +33,8 @@
 #include "libssh/buffer.h"
 #include "libssh/agent.h"
 #include "libssh/session.h"
+#include "libssh/keys.h"
+#include "libssh/dh.h"
 
 /** \addtogroup ssh_auth
  * @{
diff --git a/libssh/messages.c b/libssh/messages.c
index 2be7b21c..1540dd66 100644
--- a/libssh/messages.c
+++ b/libssh/messages.c
@@ -46,6 +46,9 @@
 #include "libssh/packet.h"
 #include "libssh/channels.h"
 #include "libssh/session.h"
+#include "libssh/misc.h"
+#include "libssh/keys.h"
+#include "libssh/dh.h"
 
 static ssh_message message_new(ssh_session session){
   ssh_message msg = malloc(sizeof(struct ssh_message_struct));
diff --git a/libssh/misc.c b/libssh/misc.c
index bcc79061..690de3a8 100644
--- a/libssh/misc.c
+++ b/libssh/misc.c
@@ -43,6 +43,7 @@
 #endif
 
 #include "libssh/priv.h"
+#include "libssh/misc.h"
 
 #ifdef HAVE_LIBGCRYPT
 #define GCRYPT_STRING "/gnutls"
diff --git a/libssh/options.c b/libssh/options.c
index e670f2bb..d7502e64 100644
--- a/libssh/options.c
+++ b/libssh/options.c
@@ -34,6 +34,7 @@
 #include <sys/types.h>
 #include "libssh/priv.h"
 #include "libssh/options.h"
+#include "libssh/misc.h"
 
 /** \defgroup ssh_options SSH Options
  * \brief options settings for a new SSH session
diff --git a/libssh/server.c b/libssh/server.c
index 7e9ad0b8..ebd5dc20 100644
--- a/libssh/server.c
+++ b/libssh/server.c
@@ -46,6 +46,9 @@
 #include "libssh/channels.h"
 #include "libssh/session.h"
 #include "libssh/options.h"
+#include "libssh/misc.h"
+#include "libssh/keys.h"
+#include "libssh/dh.h"
 
 #ifdef _WIN32
 
diff --git a/libssh/session.c b/libssh/session.c
index 9b646a86..25245608 100644
--- a/libssh/session.c
+++ b/libssh/session.c
@@ -33,7 +33,7 @@
 #include "libssh/packet.h"
 #include "libssh/session.h"
 #include "libssh/options.h"
-
+#include "libssh/misc.h"
 
 #define FIRST_CHANNEL 42 // why not ? it helps to find bugs.
 
diff --git a/libssh/sftp.c b/libssh/sftp.c
index e0b082ef..ec244a2c 100644
--- a/libssh/sftp.c
+++ b/libssh/sftp.c
@@ -49,6 +49,7 @@
 #include "libssh/buffer.h"
 #include "libssh/channels.h"
 #include "libssh/session.h"
+#include "libssh/misc.h"
 
 #ifdef WITH_SFTP
 
diff --git a/libssh/sftpserver.c b/libssh/sftpserver.c
index d42d0eb3..431b40da 100644
--- a/libssh/sftpserver.c
+++ b/libssh/sftpserver.c
@@ -34,6 +34,7 @@
 #include "libssh/ssh2.h"
 #include "libssh/priv.h"
 #include "libssh/buffer.h"
+#include "libssh/misc.h"
 
 SFTP_CLIENT_MESSAGE *sftp_get_client_message(SFTP_SESSION *sftp) {
   SFTP_PACKET *packet;