r14380: Reduce the size of structs.h

(This used to be commit 1a16a6f1dfa66499af43a6b88b3ea69a6a75f1fe)

8 files changed, 11 insertions, 3 deletions

diff --git a/source4/rpc_server/common/common.h b/source4/rpc_server/common/common.h
index d0807d849d..5f0dd9127e 100644
--- a/source4/rpc_server/common/common.h
+++ b/source4/rpc_server/common/common.h
@@ -66,4 +66,6 @@
 #define DCESRV_PULL_HANDLE(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, NT_STATUS_INVALID_HANDLE)
 #define DCESRV_PULL_HANDLE_WERR(h, inhandle, t) DCESRV_PULL_HANDLE_RETVAL(h, inhandle, t, WERR_BADFID)
 
+struct dcesrv_context;
+
 #include "rpc_server/common/proto.h"
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index a5f8ce15fc..9d0a884803 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "rpc_server/dcerpc_server.h"
 
 /* 
     Here are common server info functions used by some dcerpc server interfaces
diff --git a/source4/rpc_server/common/share_info.c b/source4/rpc_server/common/share_info.c
index ec744a5039..c98fe98059 100644
--- a/source4/rpc_server/common/share_info.c
+++ b/source4/rpc_server/common/share_info.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "rpc_server/dcerpc_server.h"
 
 /* 
     Here are common server info functions used by some dcerpc server interfaces
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 85449c1a60..98cee05f88 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -240,6 +240,8 @@ struct dcesrv_critical_sizes {
 	int sizeof_dcesrv_handle;
 };
 
+struct model_ops;
+
 #include "rpc_server/dcerpc_server_proto.h"
 
 #endif /* SAMBA_DCERPC_SERVER_H */
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 72c53183df..3772b62b30 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -28,8 +28,9 @@
 #include "dsdb/samdb/samdb.h"
 #include "libcli/ldap/ldap.h"
 #include "libcli/security/proto.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
 #include "smb.h"
+#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "passdb/secrets.h"
 #include "db_wrap.h"
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index f434086425..9f1b84f77e 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -29,7 +29,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "rpc_server/samr/proto.h"
 #include "db_wrap.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
 #include "auth/gensec/schannel_state.h"
 
 struct server_pipe_state {
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 00d2f589ae..6341dda681 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -32,7 +32,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "rpc_server/samr/proto.h"
-#include "libcli/auth/proto.h"
+#include "libcli/auth/libcli_auth.h"
 #include "db_wrap.h"
 
 /* 
diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
index 3aa18dfe77..fe608524a1 100644
--- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
+++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_unixinfo.h"
 #include "lib/events/events.h"
 #include "smb.h"
+#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 #include <sys/types.h>