s3-build: avoid to globally include printing and spoolss headers.

This shrinks precompiled headers by 3MB and will slightly speed up any build.

Guenther

17 files changed, 20 insertions, 10 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7ffb630ff42..2573585f6ed 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -657,7 +657,6 @@ struct ntlmssp_state;
 #include "auth.h"
 #include "ntdomain.h"
 #include "librpc/rpc/dcerpc.h"
-#include "nt_printing.h"
 #include "idmap.h"
 #include "client.h"
 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index bf7a41e13e2..4e3ec7a24f3 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1908,9 +1908,6 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
 					  TALLOC_CTX *mem_ctx,
 					  ADS_MODLIST *mods,
 					  const char *printer);
-bool get_local_printer_publishing_data(TALLOC_CTX *mem_ctx,
-				       ADS_MODLIST *mods,
-				       NT_PRINTER_DATA *data);
 
 /* The following definitions come from libads/ldap_user.c  */
 
@@ -5460,7 +5457,6 @@ void reply_transs(struct smb_request *req);
 
 /* The following definitions come from smbd/lanman.c  */
 
-time_t spoolss_Time_to_time_t(const struct spoolss_Time *r);
 void api_reply(connection_struct *conn, uint16 vuid,
 	       struct smb_request *req,
 	       char *data, char *params,
diff --git a/source3/include/registry.h b/source3/include/registry.h
index 9e7a1d2d0f6..ca3a1d03642 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -23,6 +23,8 @@
 #ifndef _REGISTRY_H
 #define _REGISTRY_H
 
+#include "../librpc/gen_ndr/winreg.h"
+
 struct registry_value {
 	enum winreg_Type type;
 	DATA_BLOB data;
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 5266192f0d3..53228ba9796 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -180,7 +180,6 @@ typedef union unid_t {
 #include "librpc/gen_ndr/epmapper.h"
 #include "librpc/gen_ndr/krb5pac.h"
 #include "librpc/gen_ndr/dcerpc.h"
-#include "librpc/gen_ndr/spoolss.h"
 
 struct lsa_dom_info {
 	bool valid;
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 0aa21badf4e..c997218a480 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -22,6 +22,7 @@
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
+#include "nt_printing.h"
 
 #ifdef HAVE_ADS
 
@@ -396,7 +397,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
 	return result;
 }
 
-bool get_local_printer_publishing_data(TALLOC_CTX *mem_ctx,
+static bool get_local_printer_publishing_data(TALLOC_CTX *mem_ctx,
 				       ADS_MODLIST *mods,
 				       NT_PRINTER_DATA *data)
 {
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 1d155bb3a4c..df9a15073df 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/spoolss.h"
+#include "nt_printing.h"
 
 static TALLOC_CTX *send_ctx;
 
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 1186c6710cf..c9ce969b889 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -27,8 +27,9 @@
 #include "registry.h"
 #include "registry/reg_objects.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "rpc_server/srv_spoolss_util.h"
-
+#include "nt_printing.h"
 #include "../rpc_server/srv_spoolss_util.h"
 
 /* Map generic permissions to printer object specific permissions */
diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index 29f6463ff8f..90f11eee743 100644
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "printing/nt_printing_tdb.h"
-
+#include "librpc/gen_ndr/spoolss.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 #define FORMS_PREFIX "FORMS/"
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 3635e59c34d..a2737105c4e 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
+#include "nt_printing.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index d18b4e620ed..3fdea105b16 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -27,6 +27,7 @@
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
 #include "reg_objects.h"
+#include "nt_printing.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c
index 736de269478..d1dc7e6dce8 100644
--- a/source3/rpc_client/init_spoolss.c
+++ b/source3/rpc_client/init_spoolss.c
@@ -18,8 +18,8 @@
  */
 
 #include "includes.h"
-#include "rpc_client/init_spoolss.h"
 #include "../librpc/gen_ndr/ndr_spoolss.h"
+#include "rpc_client/init_spoolss.h"
 
 /*******************************************************************
 ********************************************************************/
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 0341b93c42a..0cfceec9e76 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -29,6 +29,7 @@
 #include "rpc_client/init_spoolss.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
+#include "nt_printing.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \
diff --git a/source3/rpcclient/cmd_test.c b/source3/rpcclient/cmd_test.c
index e854df9a780..3b91d877dc5 100644
--- a/source3/rpcclient/cmd_test.c
+++ b/source3/rpcclient/cmd_test.c
@@ -23,6 +23,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/winreg.h"
 
 static NTSTATUS cmd_testme(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 			   int argc, const char **argv)
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2b7852ecf00..ba4c90d5529 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -29,6 +29,7 @@
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
+#include "rpc_client/init_spoolss.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index e958d284f81..a4646462b01 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "nt_printing.h"
 
 /****************************************************************************
  Reload printers
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index c398253616b..589a5698797 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
+#include "nt_printing.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
 
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 9ddabc87574..ee96a02a6f8 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -25,6 +25,8 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "librpc/gen_ndr/spoolss.h"
+#include "nt_printing.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>