2 files changed, 1 insertions, 85 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 958e7cba1f..9c5ea08f6d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -702,6 +702,7 @@ typedef char fstring[FSTRING_LEN];
 #include "rpc_perfcount_defs.h"
 #include "librpc/gen_ndr/notify.h"
 #include "librpc/gen_ndr/xattr.h"
+#include "librpc/gen_ndr/messaging.h"
 #include "librpc/rpc/dcerpc.h"
 #include "nt_printing.h"
 #include "idmap.h"
diff --git a/source3/include/messages.h b/source3/include/messages.h
index b3ac5e4d98..db805a2093 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -24,91 +24,6 @@
 /* change the message version with any incompatible changes in the protocol */
 #define MESSAGE_VERSION 2
 
-
-#define MSG_TYPE_MASK			0xFFFF
-
-/* general messages */
-#define MSG_DEBUG			0x0001
-#define MSG_PING			0x0002
-#define MSG_PONG			0x0003
-#define MSG_PROFILE			0x0004
-#define MSG_REQ_DEBUGLEVEL		0x0005
-#define MSG_DEBUGLEVEL			0x0006
-#define MSG_REQ_PROFILELEVEL		0x0007
-#define MSG_PROFILELEVEL		0x0008
-#define MSG_REQ_POOL_USAGE		0x0009
-#define MSG_POOL_USAGE			0x000A
-
-/* If dmalloc is included, set a steady-state mark */
-#define MSG_REQ_DMALLOC_MARK		0x000B
-
-/* If dmalloc is included, dump to the dmalloc log a description of
- * what has changed since the last MARK */
-#define MSG_REQ_DMALLOC_LOG_CHANGED	0x000C
-
-#define MSG_SHUTDOWN			0x000D
-
-/* nmbd messages */
-#define MSG_FORCE_ELECTION		0x0101
-#define MSG_WINS_NEW_ENTRY		0x0102
-#define MSG_SEND_PACKET			0x0103
-
-/* printing messages */
-/* #define MSG_PRINTER_NOTIFY  2001*/ /* Obsolete */
-#define MSG_PRINTER_NOTIFY2		0x0202
-
-#define MSG_PRINTER_DRVUPGRADE		0x0203
-#define MSG_PRINTERDATA_INIT_RESET	0x0204
-#define MSG_PRINTER_UPDATE		0x0205
-#define MSG_PRINTER_MOD			0x0206
-
-/* smbd messages */
-#define MSG_SMB_CONF_UPDATED		0x0301
-#define MSG_SMB_FORCE_TDIS		0x0302
-#define MSG_SMB_SAM_SYNC		0x0303
-#define MSG_SMB_SAM_REPL		0x0304
-#define MSG_SMB_UNLOCK			0x0305
-#define MSG_SMB_BREAK_REQUEST		0x0306
-#define MSG_SMB_BREAK_RESPONSE		0x0307
-#define MSG_SMB_ASYNC_LEVEL2_BREAK	0x0308
-#define MSG_SMB_OPEN_RETRY		0x0309
-#define MSG_SMB_KERNEL_BREAK		0x030A
-#define MSG_SMB_FILE_RENAME		0x030B
-#define MSG_SMB_INJECT_FAULT		0x030C
-#define MSG_SMB_BLOCKING_LOCK_CANCEL	0x030D
-#define MSG_SMB_NOTIFY			0x030E
-#define MSG_SMB_STAT_CACHE_DELETE	0x030F
-/*
- * Samba4 compatibility
- */
-#define MSG_PVFS_NOTIFY			0x0310
-/*
- * cluster reconfigure events
- */
-#define MSG_SMB_BRL_VALIDATE		0x0311
-#define MSG_SMB_RELEASE_IP		0x0312
-/*
- * Close a specific file given a share entry.
- */
-#define MSG_SMB_CLOSE_FILE		0x0313
-
-/* winbind messages */
-#define MSG_WINBIND_FINISHED		0x0401
-#define MSG_WINBIND_FORGET_STATE	0x0402
-#define MSG_WINBIND_ONLINE		0x0403
-#define MSG_WINBIND_OFFLINE		0x0404
-#define MSG_WINBIND_ONLINESTATUS	0x0405
-#define MSG_WINBIND_TRY_TO_GO_ONLINE	0x0406
-#define MSG_WINBIND_FAILED_TO_GO_ONLINE 0x0407
-#define MSG_WINBIND_VALIDATE_CACHE	0x0408
-#define MSG_WINBIND_DUMP_DOMAIN_LIST	0x0409
-
-/* event messages */
-#define MSG_DUMP_EVENT_LIST		0x0500
-
-/* dbwrap messages 4001-4999 */
-#define MSG_DBWRAP_TDB2_CHANGES		4001
-
 /*
  * Special flags passed to message_send. Allocated from the top, lets see when
  * it collides with the message types in the lower 16 bits :-)