4 files changed, 6 insertions, 1 deletions
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 9530d1e3fc..ef291fb4ad 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -21,6 +21,8 @@
 #define _CTDBD_CONN_H
 
 struct ctdbd_connection;
+struct messaging_context;
+struct messaging_rec;
 
 NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
 				    struct ctdbd_connection **pconn);
diff --git a/source3/include/includes.h b/source3/include/includes.h
index fc16866df8..a46025a54d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -535,7 +535,6 @@ typedef char fstring[FSTRING_LEN];
 #include "dynconfig.h"
 #include "debugparse.h"
 #include "../libcli/security/privileges.h"
-#include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"
 #include "smb.h"
diff --git a/source3/include/locking.h b/source3/include/locking.h
index 5504da6dc3..77a04eee2b 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -31,6 +31,8 @@ enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1};
 
 #define IS_PENDING_LOCK(type) ((type) == PENDING_READ_LOCK || (type) == PENDING_WRITE_LOCK)
 
+#include "librpc/gen_ndr/server_id.h"
+
 /* This contains elements that differentiate locks. The smbpid is a
    client supplied pid, and is essentially the locking context for
    this client */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f62da84a4f..338cd5b5e7 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -621,6 +621,8 @@ struct pending_message_list {
 
 #define SHARE_MODE_FLAG_POSIX_OPEN	0x1
 
+#include "librpc/gen_ndr/server_id.h"
+
 /* struct returned by get_share_modes */
 struct share_mode_entry {
 	struct server_id pid;