r13926: More header splitups.

(This used to be commit 930daa9f416ecba1d75b8ad46bb42e336545672f)

22 files changed, 23 insertions, 4 deletions

diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index ebd527c74b..dbab322511 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -1,6 +1,7 @@
 #################################
 # Start SUBSYSTEM KERBEROS
 [SUBSYSTEM::KERBEROS]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = kerberos.o \
 			clikrb5.o \
 			kerberos_verify.o \
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index f070c25e0e..2408291a48 100644
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -163,5 +163,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
 					  gss_cred_id_t gssapi_cred,
 					  enum credentials_obtained obtained); 
 
+#include "auth/kerberos/proto.h"
+
 #endif /* HAVE_KRB5 */
 
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index f522995bc4..ef2487cc9d 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -25,6 +25,7 @@
 #include "lib/socket/socket.h"
 #include "lib/messaging/irpc.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "cldap_server/cldap_server.h"
 #include "system/network.h"
 #include "netif/netif.h"
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 77ed9b6f15..97f8246002 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "smbd/service_stream.h"
 #include "smbd/process_model.h"
 #include "lib/events/events.h"
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index b1ef4ff006..40a1dc0b9b 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -30,6 +30,7 @@
 #include "ldap_server/ldap_server.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "lib/socket/socket.h"
 #include "lib/tls/tls.h"
 #include "lib/messaging/irpc.h"
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index adfb6cedb7..423fef567f 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -172,6 +172,7 @@ OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
+NOPROTO = NO
 OBJ_FILES= \
 		tools/cmdline.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS
diff --git a/source4/lib/registry/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc.c
index 0fda6c64cc..ced5f92e5e 100644
--- a/source4/lib/registry/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc.c
@@ -356,7 +356,7 @@ static struct hive_operations reg_backend_rpc = {
 	.num_values = rpc_num_values,
 };
 
-WERROR _PUBLIC_ reg_open_remote(struct registry_context **ctx, struct cli_credentials *credentials, 
+_PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, struct cli_credentials *credentials, 
 		       const char *location, struct event_context *ev)
 {
 	NTSTATUS status;
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 71adaaa8c9..b24c44977a 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -3,7 +3,7 @@ include ldap/config.mk
 include security/config.mk
 
 [SUBSYSTEM::LIBCLI_UTILS]
-PUBLIC_HEADERS = util/nterr.h util/doserr.h
+PUBLIC_HEADERS = util/nterr.h util/doserr.h util/nt_status.h
 OBJ_FILES = util/asn1.o \
 		util/doserr.o \
 		util/errormap.o \
diff --git a/source4/main.mk b/source4/main.mk
index 141278ad6b..ecc614ca7b 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -31,8 +31,7 @@ include scripting/config.mk
 include kdc/config.mk
 include passdb/config.mk
 
-DEFAULT_HEADERS = $(srcdir)/include/nt_status.h \
-				  $(srcdir)/include/smb.h $(srcdir)/include/core.h
+DEFAULT_HEADERS = $(srcdir)/include/smb.h $(srcdir)/include/core.h
 
 binaries: $(BINARIES)
 libraries: $(STATIC_LIBS) $(SHARED_LIBS)
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c
index 40ea2e5ef3..8943570f3f 100644
--- a/source4/nbt_server/irpc.c
+++ b/source4/nbt_server/irpc.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "smbd/service_task.h"
+#include "smbd/proto.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "lib/socket/socket.h"
diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 0d4940d459..a11783c238 100644
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "smbd/service_task.h"
+#include "smbd/proto.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
 #include "system/network.h"
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 3e92ce0ef3..3b38353ba4 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -28,6 +28,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "lib/events/events.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "system/filesys.h"
 #include "libcli/security/proto.h"
 #include "build.h"
diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c
index d696b75b20..bf701cb847 100644
--- a/source4/rpc_server/dcerpc_sock.c
+++ b/source4/rpc_server/dcerpc_sock.c
@@ -27,6 +27,7 @@
 #include "lib/events/events.h"
 #include "rpc_server/dcerpc_server.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "lib/messaging/irpc.h"
 #include "system/network.h"
 #include "netif/netif.h"
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 469f937219..dc2eb52a17 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 #include "lib/stream/packet.h"
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index b6a7cfd039..5e862f2b6b 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -105,6 +105,7 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM SERVICE
 [SUBSYSTEM::SERVER_SERVICE]
+PRIVATE_PROTO_HEADER = service.h
 OBJ_FILES = \
 		service.o \
 		service_stream.o \
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 9c45da302d..b9e0858b50 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -35,6 +35,7 @@
 #include "ntptr/ntptr.h"
 #include "auth/gensec/gensec.h"
 #include "smbd/process_model.h"
+#include "smbd/proto.h"
 
 /*
   recursively delete a directory tree
diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index c90780a249..749e881554 100644
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -24,6 +24,7 @@
 #include "smbd/service_task.h"
 #include "web_server/web_server.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "lib/events/events.h"
 #include "system/time.h"
 #include "lib/appweb/esp/esp.h"
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index e1d418a682..bf981ceccf 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/proto.h"
 #include "web_server/web_server.h"
 #include "lib/events/events.h"
 #include "system/filesys.h"
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 45684be0f4..f6083a6fc8 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -30,6 +30,7 @@
 #include "nsswitch/winbind_nss_config.h"
 #include "winbind/wb_server.h"
 #include "lib/stream/packet.h"
+#include "smbd/service.h"
 
 void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason)
 {
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 6e6d2db320..dabb550048 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -25,6 +25,7 @@
 #include "lib/stream/packet.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"
+#include "smbd/service.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
diff --git a/source4/wrepl_server/wrepl_periodic.c b/source4/wrepl_server/wrepl_periodic.c
index c598bb8e8a..c342656eef 100644
--- a/source4/wrepl_server/wrepl_periodic.c
+++ b/source4/wrepl_server/wrepl_periodic.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 29d3246d62..49eb13909a 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "smbd/service_task.h"
+#include "smbd/service.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"