s3-server_id: only include server_id where needed.

Guenther

12 files changed, 11 insertions, 1 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 18b53879ad..4894b6cbb8 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -629,7 +629,6 @@ extern void *cmdline_lp_ctx;
 #include "module.h"
 #include "packet.h"
 #include "../lib/util/talloc_stack.h"
-#include "serverid.h"
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 41f67d07db..1bf2cf8685 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -49,6 +49,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/ndr_messaging.h"
 #include "dbwrap.h"
+#include "serverid.h"
 
 struct messaging_callback {
 	struct messaging_callback *prev, *next;
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 3cb94871cc..3cf72ccaf6 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
+#include "serverid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 00f384a13b..15c53d4161 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -40,6 +40,7 @@
 #include "smbd/globals.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
+#include "serverid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 2ed421246f..a5727ce14f 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -23,6 +23,7 @@
 #include "popt_common.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "nmbd/nmbd.h"
+#include "serverid.h"
 
 int ClientNMB       = -1;
 int ClientDGRAM     = -1;
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index a89081432d..b1aff3e6de 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -27,6 +27,7 @@
 #include "../librpc/gen_ndr/netlogon.h"
 #include "printing/notify.h"
 #include "printing/pcap.h"
+#include "serverid.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 510dde2cbd..dc036faf75 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -44,6 +44,7 @@
 #include "../librpc/gen_ndr/netlogon.h"
 #include "rpc_misc.h"
 #include "printing/notify.h"
+#include "serverid.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 9cc34d827d..eb6dfa35a9 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
+#include "serverid.h"
 
 extern fstring remote_proto;
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index b1553028f4..c06eaa12e7 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -35,6 +35,7 @@
 #include "rpc_server/rpc_ep_setup.h"
 #include "printing/pcap.h"
 #include "printing.h"
+#include "serverid.h"
 
 #ifdef WITH_DFS
 extern int dcelogin_atmost_once;
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 72bac8b127..c5cdc29380 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -42,6 +42,7 @@
 #include "../librpc/gen_ndr/srv_wkssvc.h"
 #include "printing/notify.h"
 #include "printing.h"
+#include "serverid.h"
 
 static struct files_struct *log_writeable_file_fn(
 	struct files_struct *fsp, void *private_data)
diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c
index ab4da1d26b..b2172da038 100644
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "dbwrap.h"
+#include "serverid.h"
 
 static int net_serverid_list_fn(const struct server_id *id,
 				uint32_t msg_flags, void *priv)
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index d9a302cbc3..a9ff410f52 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -33,6 +33,7 @@
 #include "secrets.h"
 #include "idmap.h"
 #include "lib/addrchange.h"
+#include "serverid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND