s3-popt: Only include popt-common.h when needed.

18 files changed, 18 insertions, 0 deletions

diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index 04e17946c29..14301618586 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 #if 0
 #include "lib/events/events.h"
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 5b946913d25..0b1230efe79 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -51,6 +51,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 /* We don't care about the paranoid malloc checker in this standalone
    program */
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 1c342858ee3..d9a1bf6912d 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -41,6 +41,7 @@
 /*****************************************************/
 
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/net.h"
 #include "secrets.h"
 
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 08142357a9d..cfc2a7ed8a9 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
 #include "includes.h"
+#include "popt_common.h"
 #include "registry.h"
 #include "utils/net.h"
 #include "utils/net_registry_util.h"
diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 3e93fc503c7..435af091e30 100644
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index b1de4d24c50..b04e6bd5b1f 100644
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -19,6 +19,7 @@
 
 
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
 
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 63c9a34dd88..1187c96d736 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;
 
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 1ddc94b8f70..d234a3cd055 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "utils/ntlm_auth.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index c6ccbc86a29..b3c6d14a96e 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 
 #define BIT_BACKEND	0x00000004
 #define BIT_VERBOSE	0x00000008
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index ce330a8b169..f6f500a2aae 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "registry/reg_objects.h"
 #include "regfio.h"
 
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index a29995b87bf..79078b234ab 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "popt_common.h"
 
 static TALLOC_CTX *ctx;
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 46361add764..65fec1041b5 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 58e03fb6b2a..09f4f3146fb 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 3f98b125031..f575872b0dc 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 8b88a0fef30..62ecb34c9e1 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "libsmbclient.h"
 
 #if _FILE_OFFSET_BITS==64
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index d7ba1234ede..f27011cdea0 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "popt_common.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"
 
 static int use_bcast;
diff --git a/source3/utils/status.c b/source3/utils/status.c
index d2b10c1810a..fb23789d0ee 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -31,6 +31,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 #define SMB_MAXPIDS		2048
 static uid_t 		Ucrit_uid = 0;               /* added by OH */
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 8ce0d58ce99..6d606bba41c 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -32,6 +32,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;