5 files changed, 29 insertions, 47 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 9df5e23816..7ff466b7d7 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -651,13 +651,6 @@ extern int errno;
 #include "md5.h"
 #include "hmacmd5.h"
 
-#include "libcli/auth/ntlmssp.h"
-#include "libcli/auth/credentials.h"
-#include "libcli/auth/kerberos.h"
-#include "libcli/auth/gensec.h"
-#include "libcli/auth/spnego.h"
-
-#include "auth/auth.h"
 
 #include "module.h"
 
@@ -665,8 +658,21 @@ extern int errno;
 
 #include "mutex.h"
 
+#include "librpc/ndr/libndr.h"
+#include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
+#include "librpc/ndr/ndr_sec.h"
+#include "librpc/gen_ndr/tables.h"
+
+#include "libcli/auth/ntlmssp.h"
+#include "libcli/auth/credentials.h"
+#include "libcli/auth/kerberos.h"
+#include "libcli/auth/gensec.h"
+#include "libcli/auth/spnego.h"
+#include "auth/auth.h"
 
+#include "smb_interfaces.h"
 #include "smbd/server.h"
 #include "smbd/service.h"
 #include "rpc_server/dcerpc_server.h"
diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index eb4419fcbd..599503be12 100644
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -60,11 +60,18 @@ typedef struct data_blob {
 	size_t length;
 } DATA_BLOB;
 
+/* Globally Unique ID */
+#define GUID_SIZE 16
+
+/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30 */
+typedef uint64_t NTTIME;
+
+/* 8 byte aligned 'hyper' type from MS IDL */
+typedef uint64_t HYPER_T;
+
+
 #include "enums.h"
 #include "events.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "smb_interfaces.h"
-#include "librpc/ndr/libndr.h"
 
 /* used for network interfaces */
 struct interface
@@ -75,26 +82,6 @@ struct interface
 	struct in_addr nmask;
 };
 
-/* key and data in the connections database - used in smbstatus and smbd */
-struct connections_key {
-	pid_t pid;
-	int cnum;
-	fstring name;
-};
-
-struct connections_data {
-	int magic;
-	pid_t pid;
-	int cnum;
-	uid_t uid;
-	gid_t gid;
-	char name[24];
-	char addr[24];
-	char machine[FSTRING_LEN];
-	time_t start;
-	uint32_t bcast_msg_flags;
-};
-
 /* the following are used by loadparm for option lists */
 typedef enum
 {
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index 771dce8803..bdf8282356 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -20,16 +20,6 @@
 */
 
 
-/* Globally Unique ID */
-#define GUID_SIZE 16
-
-/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30 */
-typedef uint64_t NTTIME;
-
-/* 8 byte aligned 'hyper' type from MS IDL */
-typedef uint64_t HYPER_T;
-
-
 
 /* this structure is just a wrapper for a string, the only reason we
    bother with this is that it allows us to check the length provided
diff --git a/source4/librpc/config.m4 b/source4/librpc/config.m4
index 22abcc6f20..5c5ba9321c 100644
--- a/source4/librpc/config.m4
+++ b/source4/librpc/config.m4
@@ -4,8 +4,11 @@ SMB_SUBSYSTEM(LIBNDR_RAW,[],
 		[librpc/ndr/ndr.o
 		librpc/ndr/ndr_basic.o
 		librpc/ndr/ndr_sec.o
-		librpc/ndr/ndr_spoolss_buf.o
-		librpc/gen_ndr/tables.o
+		librpc/ndr/ndr_spoolss_buf.o])
+
+SMB_SUBSYSTEM_NOPROTO(LIBNDR_GEN)
+SMB_SUBSYSTEM(LIBNDR_GEN,[],
+		[librpc/gen_ndr/tables.o
 		librpc/gen_ndr/ndr_audiosrv.o
 		librpc/gen_ndr/ndr_dcerpc.o
 		librpc/gen_ndr/ndr_echo.o
@@ -59,4 +62,4 @@ SMB_SUBSYSTEM(LIBRPC_RAW,[],
 		librpc/rpc/dcerpc_sock.o])
 
 SMB_SUBSYSTEM(LIBRPC,[],[],[],
-		[LIBNDR_RAW LIBRPC_RAW])
+		[LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW])
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 0efa4af19c..09d06a7c7f 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -252,7 +252,3 @@ typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, void *);
 typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, void *);
 typedef void (*ndr_print_union_fn_t)(struct ndr_print *, const char *, uint32_t, void *);
 
-#include "librpc/ndr/ndr_sec.h"
-
-/* now pull in the individual parsers */
-#include "librpc/gen_ndr/tables.h"