11 files changed, 20 insertions, 0 deletions
diff --git a/source4/lib/com/dcom/dcom.h b/source4/lib/com/dcom/dcom.h
index 438bf8b9f7..65a4d0f6e9 100644
--- a/source4/lib/com/dcom/dcom.h
+++ b/source4/lib/com/dcom/dcom.h
@@ -21,6 +21,9 @@
 #ifndef _DCOM_H /* _DCOM_H */
 #define _DCOM_H 
 
+struct cli_credentials;
+struct dcerpc_pipe;
+
 #include "lib/com/com.h"
 #include "librpc/gen_ndr/orpc.h"
 #include "lib/com/dcom/proto.h"
diff --git a/source4/lib/com/tables.c b/source4/lib/com/tables.c
index 661f5d0b37..d9989ecdbe 100644
--- a/source4/lib/com/tables.c
+++ b/source4/lib/com/tables.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "lib/com/com.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 
 /* Specific implementation of one or more interfaces */
 struct com_class
diff --git a/source4/lib/db_wrap.h b/source4/lib/db_wrap.h
index 2d7a7b7244..cf60494b92 100644
--- a/source4/lib/db_wrap.h
+++ b/source4/lib/db_wrap.h
@@ -31,5 +31,6 @@ struct tdb_wrap {
 struct auth_session_info;
 struct ldb_message;
 struct ldb_dn;
+struct cli_credentials;
 
 #include "db_wrap_proto.h"
diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
index 3570229715..8c1b7cda21 100644
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __EVENTS_H__
+#define __EVENTS_H__
+
 struct event_context;
 struct event_ops;
 struct fd_event;
@@ -64,3 +67,5 @@ struct event_context *event_context_find(TALLOC_CTX *mem_ctx);
 	event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_WRITE)
 #define EVENT_FD_NOT_READABLE(fde) \
 	event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_READ)
+
+#endif /* __EVENTS_H__ */
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 8432eadf5e..5680060ee4 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -31,6 +31,7 @@
 #include "db_wrap.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "util/unix_privs.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* change the message version with any incompatible changes in the protocol */
 #define MESSAGING_VERSION 1
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
index 7f57a9244d..efe22573c2 100644
--- a/source4/lib/registry/registry.h
+++ b/source4/lib/registry/registry.h
@@ -22,6 +22,9 @@
 #ifndef _REGISTRY_H /* _REGISTRY_H */
 #define _REGISTRY_H 
 
+#include "librpc/gen_ndr/security.h"
+#include "auth/credentials/credentials.h"
+
 /* Handles for the predefined keys */
 #define HKEY_CLASSES_ROOT		 0x80000000
 #define HKEY_CURRENT_USER		 0x80000001
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index f1c5db1598..ae617bbe84 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 713d4b32cc..9392e66192 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/registry/reg_backend_rpc.h"
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index c0bffa78e5..0812cad73f 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/replace/readline.h"
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index ccdb24a4cc..a4fb69f073 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index f3e3ba8341..a50fb87619 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -21,6 +21,8 @@
 #ifndef _SAMBA_SOCKET_H
 #define _SAMBA_SOCKET_H
 
+#include "lib/events/events.h"
+
 struct socket_context;
 
 enum socket_type {