16 files changed, 16 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2e45b7964d..7e3c381731 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -656,8 +656,6 @@ extern void *cmdline_lp_ctx;
 #include "ctdbd_conn.h"
 #include "../lib/util/talloc_stack.h"
 #include "serverid.h"
-#include "async_smb.h"
-#include "../lib/async_req/async_sock.h"
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 46926f6298..2b33816293 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "memcache.h"
+#include "../lib/async_req/async_sock.h"
 
 /****************************************************************************
  Get a port number in host byte order from a sockaddr_storage.
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8e08d6fc40..0aaeea2827 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -18,6 +18,8 @@
 */
 
 #include "includes.h"
+#include "../lib/async_req/async_sock.h"
+#include "async_smb.h"
 
 /*
  * Read an smb packet asynchronously, discard keepalives
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index ebfc98b179..92e5bb2021 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -26,6 +26,7 @@
 #include "../libcli/auth/ntlmssp.h"
 #include "libads/kerberos_proto.h"
 #include "krb5_env.h"
+#include "async_smb.h"
 
 static const struct {
 	int prot;
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index cdf51c75c3..2c49a8b3f0 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smb_signing.h"
+#include "async_smb.h"
 
 /*******************************************************************
  Setup the word count and byte count for a client smb message.
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index d6b2e31de7..ce8d7a593b 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /***********************************************************
  Common function for pushing stings, used by smb_bytes_push_str()
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 6cbf7104d4..5ca76ac16a 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
+#include "async_smb.h"
 
 /****************************************************************************
  Get UNIX extensions version info.
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index b580172317..280f876ba7 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /****************************************************************************
  Calculate a safe next_entry_offset.
diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c
index 3777c41482..4c730c4b76 100644
--- a/source3/libsmb/climessage.c
+++ b/source3/libsmb/climessage.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 struct cli_message_start_state {
 	uint16_t grp;
diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index 8904ac973f..09f9869420 100644
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /****************************************************************************
 send an ack for an oplock break request
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index a1b911cfbf..3ac9f4454f 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -23,6 +23,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/rap.h"
 #include "../lib/crypto/arcfour.h"
+#include "async_smb.h"
 
 /****************************************************************************
  Call a remote api
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 24c9d9f681..370c068fe4 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "async_smb.h"
 
 /****************************************************************************
   Calculate the recommended read buffer size
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index dd0873d824..4379e1480a 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-
+#include "async_smb.h"
 
 /****************************************************************************
  Send a SMB trans or trans2 request.
diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c
index b7bb7d70d5..359ec478cc 100644
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../lib/async_req/async_sock.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 40009c8a3c..434f52889b 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -22,6 +22,7 @@
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../lib/async_req/async_sock.h"
 
 extern bool global_machine_password_needs_changing;
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 06ed264deb..d19c983866 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -29,6 +29,7 @@
 #include "nsswitch/winbind_client.h"
 #include "dbwrap.h"
 #include "talloc_dict.h"
+#include "async_smb.h"
 
 extern char *optarg;
 extern int optind;