smbconf: only include smbconf headers where needed.

Guenther

diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c
index 501382cc5fd0416ab50fe61f69ffe7bc9ba69092..37b01df3d302f024166a92602971ae9f7c985d79 100644 (file)
--- a/lib/smbconf/smbconf_txt.c
+++ b/lib/smbconf/smbconf_txt.c
@@ -27,6 +27,7 @@
 
 #include "includes.h"
 #include "smbconf_private.h"
+#include "lib/smbconf/smbconf_txt.h"
 
 struct txt_cache {
        uint32_t current_share;

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 20a52e6e5d970d59e4cc47973f507f27e46cd241..3e48d16805492ce392cc014241491cfc2afe0d70 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -679,11 +679,6 @@ struct ntlmssp_state;
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 
-#include "lib/smbconf/smbconf.h"
-#include "lib/smbconf/smbconf_init.h"
-#include "lib/smbconf/smbconf_reg.h"
-#include "lib/smbconf/smbconf_txt.h"
-
 #include "nsswitch/winbind_nss.h"
 
 /* forward declaration from printing.h to get around 

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 51932a5a920c5020d9802d4dd090d8dbe29e1eda..edf41686c539ddb5576837c382829f1430dd4186 100644 (file)
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -24,6 +24,8 @@
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_reg.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/lib/smbconf/smbconf_init.c b/source3/lib/smbconf/smbconf_init.c
index 58bb9d93627e4d8ad079d3177a40ba23a8eca882..36c51de5f03f2d336aec52d5a15f8789b09e843d 100644 (file)
--- a/source3/lib/smbconf/smbconf_init.c
+++ b/source3/lib/smbconf/smbconf_init.c
@@ -21,6 +21,7 @@
 #include "lib/smbconf/smbconf_private.h"
 #include "lib/smbconf/smbconf_txt.h"
 #include "lib/smbconf/smbconf_reg.h"
+#include "lib/smbconf/smbconf_init.h"
 
 /**
  * smbconf initialization dispatcher

diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index 96b5f1ee24bdd422fce18306fc139f20637cb42b..6c500785a06ccfa564c33973b176fd302e26516a 100644 (file)
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -20,6 +20,8 @@
 #include "includes.h"
 #include "lib/smbconf/smbconf_private.h"
 #include "registry.h"
+#include "lib/smbconf/smbconf_init.h"
+#include "lib/smbconf/smbconf_reg.h"
 
 #define INCLUDES_VALNAME "includes"
 

diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index c83eeb805de506ce1359892956a4db665ce0a4ce..42ef76df11e69e9d3ea1ee375c8b9c9790ac69f0 100644 (file)
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -18,6 +18,10 @@
  */
 
 #include "includes.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_init.h"
+#include "lib/smbconf/smbconf_reg.h"
+#include "lib/smbconf/smbconf_txt.h"
 
 static void print_strings(const char *prefix,
                          uint32_t num_strings, const char **strings)

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 5271c910ddafcf84766ca40f8aba1ee96aacf720..7d19c63d757235c8b1a2ef179f589c06650d15c2 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -24,6 +24,8 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_reg.h"
 
 /****************************************************************
 ****************************************************************/

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 113b8677a141dc3ff217b4dd6106344d35b40445..8a762d70e90d08c410d13829afaa009537cb6c88 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -53,6 +53,9 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_init.h"
+#include "lib/smbconf/smbconf_reg.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 6fc03bfd86b360d758b9bb22bc5c46ce1e75771e..58e8cadf94c98145ba24e2dfe81f19c549b41536 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -29,6 +29,9 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_init.h"
+#include "lib/smbconf/smbconf_reg.h"
 
 /**********************************************************************
  *