From b2af281e508194d9548ea1119c19ee96a0dd1f0a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 24 Mar 2011 15:31:06 +0100
Subject: s3-messages: only include messages.h where needed.

Guenther
---
 source3/include/ctdbd_conn.h                | 2 ++
 source3/include/includes.h                  | 1 -
 source3/include/locking.h                   | 2 ++
 source3/include/smb.h                       | 2 ++
 source3/lib/ctdbd_conn.c                    | 1 +
 source3/lib/dbwrap_ctdb.c                   | 1 +
 source3/lib/dmallocmsg.c                    | 1 +
 source3/lib/g_lock.c                        | 1 +
 source3/lib/messages.c                      | 1 +
 source3/lib/messages_ctdbd.c                | 1 +
 source3/lib/messages_local.c                | 1 +
 source3/lib/server_contexts.c               | 1 +
 source3/lib/tallocmsg.c                     | 1 +
 source3/lib/util.c                          | 1 +
 source3/lib/util_sconn.c                    | 1 +
 source3/libnet/libnet_samsync.c             | 1 +
 source3/libsmb/clidgram.c                   | 1 +
 source3/locking/brlock.c                    | 1 +
 source3/locking/locking.c                   | 1 +
 source3/nmbd/nmbd.c                         | 1 +
 source3/printing/notify.c                   | 1 +
 source3/printing/nt_printing.c              | 1 +
 source3/printing/printing.c                 | 1 +
 source3/printing/spoolssd.c                 | 1 +
 source3/profile/profile.c                   | 1 +
 source3/rpc_server/epmd.c                   | 1 +
 source3/rpc_server/netlogon/srv_netlog_nt.c | 1 +
 source3/rpc_server/spoolss/srv_spoolss_nt.c | 1 +
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c   | 1 +
 source3/smbd/blocking.c                     | 1 +
 source3/smbd/close.c                        | 1 +
 source3/smbd/globals.c                      | 1 +
 source3/smbd/msg_idmap.c                    | 1 +
 source3/smbd/negprot.c                      | 1 +
 source3/smbd/notify_internal.c              | 1 +
 source3/smbd/open.c                         | 1 +
 source3/smbd/oplock.c                       | 1 +
 source3/smbd/process.c                      | 1 +
 source3/smbd/server.c                       | 1 +
 source3/smbd/server_reload.c                | 1 +
 source3/smbd/sesssetup.c                    | 1 +
 source3/smbd/smb2_lock.c                    | 1 +
 source3/smbd/statcache.c                    | 1 +
 source3/torture/msgtest.c                   | 1 +
 source3/utils/dbwrap_tool.c                 | 1 +
 source3/utils/dbwrap_torture.c              | 1 +
 source3/utils/net.c                         | 1 +
 source3/utils/net_g_lock.c                  | 1 +
 source3/utils/net_status.c                  | 1 +
 source3/utils/smbcontrol.c                  | 1 +
 source3/utils/status.c                      | 1 +
 source3/winbindd/winbindd.c                 | 1 +
 source3/winbindd/winbindd_cm.c              | 1 +
 source3/winbindd/winbindd_dual.c            | 1 +
 54 files changed, 56 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 9530d1e3fc..ef291fb4ad 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -21,6 +21,8 @@
 #define _CTDBD_CONN_H
 
 struct ctdbd_connection;
+struct messaging_context;
+struct messaging_rec;
 
 NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
 				    struct ctdbd_connection **pconn);
diff --git a/source3/include/includes.h b/source3/include/includes.h
index fc16866df8..a46025a54d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -535,7 +535,6 @@ typedef char fstring[FSTRING_LEN];
 #include "dynconfig.h"
 #include "debugparse.h"
 #include "../libcli/security/privileges.h"
-#include "messages.h"
 #include "locking.h"
 #include "smb_perfcount.h"
 #include "smb.h"
diff --git a/source3/include/locking.h b/source3/include/locking.h
index 5504da6dc3..77a04eee2b 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -31,6 +31,8 @@ enum brl_flavour {WINDOWS_LOCK = 0, POSIX_LOCK = 1};
 
 #define IS_PENDING_LOCK(type) ((type) == PENDING_READ_LOCK || (type) == PENDING_WRITE_LOCK)
 
+#include "librpc/gen_ndr/server_id.h"
+
 /* This contains elements that differentiate locks. The smbpid is a
    client supplied pid, and is essentially the locking context for
    this client */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f62da84a4f..338cd5b5e7 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -621,6 +621,8 @@ struct pending_message_list {
 
 #define SHARE_MODE_FLAG_POSIX_OPEN	0x1
 
+#include "librpc/gen_ndr/server_id.h"
+
 /* struct returned by get_share_modes */
 struct share_mode_entry {
 	struct server_id pid;
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 16e8cb915e..cc2f99782a 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_messaging.h"
 #include "ctdbd_conn.h"
 #include "packet.h"
+#include "messages.h"
 
 /* paths to these include files come from --with-ctdb= in configure */
 #include "ctdb.h"
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 9b0b66c1f0..835f1cf04e 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -25,6 +25,7 @@
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"
 #include "g_lock.h"
+#include "messages.h"
 
 struct db_ctdb_transaction_handle {
 	struct db_ctdb_ctx *ctx;
diff --git a/source3/lib/dmallocmsg.c b/source3/lib/dmallocmsg.c
index 59f7c3bd7e..837994a6ea 100644
--- a/source3/lib/dmallocmsg.c
+++ b/source3/lib/dmallocmsg.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /**
  * @file dmallocmsg.c
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 59f1d590b6..c9e16d0f77 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -24,6 +24,7 @@
 #include "ctdbd_conn.h"
 #include "../lib/util/select.h"
 #include "system/select.h"
+#include "messages.h"
 
 static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
 				    struct server_id pid);
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 1bf2cf8685..db916674c6 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -50,6 +50,7 @@
 #include "librpc/gen_ndr/ndr_messaging.h"
 #include "dbwrap.h"
 #include "serverid.h"
+#include "messages.h"
 
 struct messaging_callback {
 	struct messaging_callback *prev, *next;
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 871334649d..96a33abf50 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "messages.h"
 
 #ifdef CLUSTER_SUPPORT
 
diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c
index 9b3a7ed7c7..4bcae544e2 100644
--- a/source3/lib/messages_local.c
+++ b/source3/lib/messages_local.c
@@ -46,6 +46,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/ndr_messaging.h"
+#include "messages.h"
 
 struct messaging_tdb_context {
 	struct messaging_context *msg_ctx;
diff --git a/source3/lib/server_contexts.c b/source3/lib/server_contexts.c
index f8fe9dceac..a95ea9acc2 100644
--- a/source3/lib/server_contexts.c
+++ b/source3/lib/server_contexts.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "messages.h"
 
 struct tevent_context *server_event_ctx = NULL;
 
diff --git a/source3/lib/tallocmsg.c b/source3/lib/tallocmsg.c
index 6cea757457..a90d973151 100644
--- a/source3/lib/tallocmsg.c
+++ b/source3/lib/tallocmsg.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /**
  * @file tallocmsg.c
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 973670ede0..4e17e1e130 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -28,6 +28,7 @@
 #include "secrets.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"
+#include "messages.h"
 
 /* Max allowable allococation - 256mb - 0x10000000 */
 #define MAX_ALLOC_SIZE (1024*1024*256)
diff --git a/source3/lib/util_sconn.c b/source3/lib/util_sconn.c
index a98c046ada..51ba29e788 100644
--- a/source3/lib/util_sconn.c
+++ b/source3/lib/util_sconn.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "messages.h"
 
 struct server_id sconn_server_id(const struct smbd_server_connection *sconn)
 {
diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 3ae4baa3c3..6d371f4afd 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -29,6 +29,7 @@
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "../libcli/security/security.h"
+#include "messages.h"
 
 /**
  * Fix up the delta, dealing with encryption issues so that the final
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 78f9ea0692..128555d544 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "libsmb/clidgram.h"
 #include "libsmb/nmblib.h"
+#include "messages.h"
 
 /*
  * cli_send_mailslot, send a mailslot for client code ...
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index c09b10e271..b2409acd7d 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -31,6 +31,7 @@
 #include "smbd/globals.h"
 #include "dbwrap.h"
 #include "serverid.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index e541c04025..14a2c24f70 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -43,6 +43,7 @@
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
 #include "serverid.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index ac199c5051..8f6af875da 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "nmbd/nmbd.h"
 #include "serverid.h"
+#include "messages.h"
 
 int ClientNMB       = -1;
 int ClientDGRAM     = -1;
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index f1a7e4f928..db727e0b4f 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -25,6 +25,7 @@
 #include "../librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
 #include "printing/notify.h"
+#include "messages.h"
 
 static TALLOC_CTX *send_ctx;
 
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f82256d794..df1120121d 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -36,6 +36,7 @@
 #include "passdb/machine_sid.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 /* Map generic permissions to printer object specific permissions */
 
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 1dd053f69e..8aa2ac87b6 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -32,6 +32,7 @@
 #include "serverid.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index e6991c6f0f..00ca080109 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -22,6 +22,7 @@
 #include "locking/proto.h"
 
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 #include "include/printing.h"
 #include "printing/nt_printing_migrate.h"
 #include "librpc/gen_ndr/srv_winreg.h"
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index c2704a1f0e..f081e1bbd7 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 #ifdef WITH_PROFILE
 #define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)
diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 0cafccb4c0..011bfa8700 100644
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/srv_epmapper.h"
 #include "rpc_server/rpc_server.h"
 #include "rpc_server/epmapper/srv_epmapper.h"
+#include "messages.h"
 
 #define DAEMON_NAME "epmd"
 
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index dad4fcbdc7..c2dbdc2b2f 100644
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -45,6 +45,7 @@
 #include "../libcli/registry/util_reg.h"
 #include "passdb.h"
 #include "auth.h"
+#include "messages.h"
 
 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 4a114464cd..4735909b24 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -48,6 +48,7 @@
 #include "../libcli/registry/util_reg.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 01f3914827..2faf22eebd 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -34,6 +34,7 @@
 #include "../lib/util/util_pw.h"
 #include "smbd/smbd.h"
 #include "auth.h"
+#include "messages.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 548a3f0845..999931e640 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -21,6 +21,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index eb531ffaa9..a2e3d99ba8 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -28,6 +28,7 @@
 #include "fake_file.h"
 #include "transfer_file.h"
 #include "auth.h"
+#include "messages.h"
 
 /****************************************************************************
  Run a file if it is a magic script.
diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index 8a736993fb..63c1f5dcb5 100644
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -21,6 +21,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "memcache.h"
+#include "messages.h"
 
 #if defined(WITH_AIO)
 struct aio_extra *aio_list_head = NULL;
diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index 1a3ccb1950..9bf15a9734 100644
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -35,6 +35,7 @@
 #include "idmap_cache.h"
 #include "passdb/lookup_sid.h"
 #include "auth.h"
+#include "messages.h"
 
 struct id {
 	union {
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index e53504933c..d307c210c2 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -24,6 +24,7 @@
 #include "../libcli/auth/spnego.h"
 #include "serverid.h"
 #include "auth.h"
+#include "messages.h"
 
 extern fstring remote_proto;
 
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 2fa6c76d48..2af98f2dfa 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -29,6 +29,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "dbwrap.h"
 #include "smbd/smbd.h"
+#include "messages.h"
 
 struct notify_context {
 	struct db_context *db_recursive;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ae56bf8485..d6122ac91c 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -29,6 +29,7 @@
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "auth.h"
+#include "messages.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index e43ed6b9a6..f87c6667a1 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -24,6 +24,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 /****************************************************************************
  Get the number of current exclusive oplocks.
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6060cc7b0b..843d4d5194 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -31,6 +31,7 @@
 #include "system/select.h"
 #include "passdb.h"
 #include "auth.h"
+#include "messages.h"
 
 extern bool global_machine_password_needs_changing;
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index c8b45c12c8..bdf5baf668 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -40,6 +40,7 @@
 #include "serverid.h"
 #include "passdb.h"
 #include "auth.h"
+#include "messages.h"
 
 extern void start_epmd(struct tevent_context *ev_ctx,
 		       struct messaging_context *msg_ctx);
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 4d7c3376ea..84213ae0e8 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -29,6 +29,7 @@
 #include "printing/pcap.h"
 #include "printing/load.h"
 #include "auth.h"
+#include "messages.h"
 
 /****************************************************************************
  purge stale printers and reload from pre-populated pcap cache
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 4bbd790736..b8f82c0aa2 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -33,6 +33,7 @@
 #include "libads/kerberos_proto.h"
 #include "../lib/util/asn1.h"
 #include "auth.h"
+#include "messages.h"
 
 /* For split krb5 SPNEGO blobs. */
 struct pending_auth_data {
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index a2742b8e29..d4fbd1cdfe 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 struct smbd_smb2_lock_element {
 	uint64_t offset;
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index c21213f23b..bb3b070119 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "memcache.h"
 #include "smbd/smbd.h"
+#include "messages.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.
diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index adb45f75e3..73344e56e3 100644
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "messages.h"
 
 static int pong_count;
 
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index f65964d7f9..6809a0bc73 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "dbwrap.h"
+#include "messages.h"
 
 typedef enum { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS } dbwrap_op;
 
diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index e9bf98a078..c1c286e5ff 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "popt_common.h"
 #include "dbwrap.h"
+#include "messages.h"
 
 #if 0
 #include "lib/events/events.h"
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 9eace76661..ec202bb87c 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -47,6 +47,7 @@
 #include "lib/netapi/netapi.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "messages.h"
 
 #ifdef WITH_FAKE_KASERVER
 #include "utils/net_afs.h"
diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c
index 937c11c0c4..6ed5d1776a 100644
--- a/source3/utils/net_g_lock.c
+++ b/source3/utils/net_g_lock.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "net.h"
 #include "g_lock.h"
+#include "messages.h"
 
 static bool net_g_lock_init(TALLOC_CTX *mem_ctx,
 			    struct tevent_context **pev,
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 335920195e..d6027433a2 100644
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -19,6 +19,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "session.h"
+#include "messages.h"
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
 {
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 4555954fd5..04aeb8d6bd 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -31,6 +31,7 @@
 #include "nt_printing.h"
 #include "printing/notify.h"
 #include "libsmb/nmblib.h"
+#include "messages.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 18d338539d..cf625fb73f 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -37,6 +37,7 @@
 #include "../libcli/security/security.h"
 #include "session.h"
 #include "locking/proto.h"
+#include "messages.h"
 
 #define SMB_MAXPIDS		2048
 static uid_t 		Ucrit_uid = 0;               /* added by OH */
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 6e7dfce09a..f383e70962 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -35,6 +35,7 @@
 #include "lib/addrchange.h"
 #include "serverid.h"
 #include "auth.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index bb333b39ee..23eaa243b8 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -75,6 +75,7 @@
 #include "secrets.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 2490073262..7d6a97477b 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -35,6 +35,7 @@
 #include "../lib/util/select.h"
 #include "../libcli/security/security.h"
 #include "system/select.h"
+#include "messages.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
-- 
cgit