r12542: Move some more prototypes out to seperate headers

(This used to be commit 0aca5fd5130d980d07398f3291d294202aefe3c2)

9 files changed, 14 insertions, 0 deletions

diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index f3fccc77fc..f6ec5d3080 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -199,6 +199,7 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM DCERPC
 [SUBSYSTEM::DCERPC]
+PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
 OBJ_FILES = \
 		dcerpc_server.o \
 		dcerpc_sock.o \
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index e831b70060..783cdb58b1 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -238,4 +238,6 @@ struct dcesrv_critical_sizes {
 	int sizeof_dcesrv_handle;
 };
 
+#include "rpc_server/dcerpc_server_proto.h"
+
 #endif /* SAMBA_DCERPC_SERVER_H */
diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index 6caef7424d..d33b123f22 100644
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "auth/gensec/gensec.h"
 
 /*
   parse any auth information from a dcerpc bind request
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index a762b44878..68bac0f2ce 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -26,6 +26,7 @@
 #include "rpc_server/common/common.h"
 #include "rpc_server/drsuapi/dcesrv_drsuapi.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 /* 
   drsuapi_DsBind 
diff --git a/source4/rpc_server/dssetup/dcesrv_dssetup.c b/source4/rpc_server/dssetup/dcesrv_dssetup.c
index 1d391f588f..61e560299c 100644
--- a/source4/rpc_server/dssetup/dcesrv_dssetup.c
+++ b/source4/rpc_server/dssetup/dcesrv_dssetup.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_dssetup.h"
 #include "rpc_server/common/common.h"
 #include "ldb/include/ldb.h"
+#include "dsdb/samdb/samdb.h"
 /* 
   dssetup_DsRoleGetPrimaryDomainInformation 
 */
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 64da9f488f..2171ac48b0 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "db_wrap.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 /*
   this type allows us to distinguish handle types
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index e482a229b7..335cd3d9e7 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_dcom.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
+#include "dsdb/samdb/samdb.h"
 
 struct server_pipe_state {
 	struct netr_Credential client_challenge;
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index de08695502..b7d770af84 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -30,6 +30,8 @@
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
 #include "ads.h"
+#include "dsdb/samdb/samdb.h"
+#include "libcli/ldap/ldap.h"
 
 
 /*
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 0b4709fa97..3831be10af 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -30,6 +30,9 @@
 #include "lib/crypto/crypto.h"
 #include "lib/ldb/include/ldb.h"
 #include "ads.h"
+#include "libcli/ldap/ldap.h"
+#include "dsdb/samdb/samdb.h"
+#include "auth/auth.h"
 
 /* 
   samr_ChangePasswordUser