r12608: Remove some unused #include lines.

(This used to be commit 70e7449318aa0e9d2639c76730a7d1683b2f4981)

28 files changed, 0 insertions, 41 deletions

diff --git a/source4/lib/cmdline/credentials.c b/source4/lib/cmdline/credentials.c
index cb1ba5c963d..b19cbf73c0b 100644
--- a/source4/lib/cmdline/credentials.c
+++ b/source4/lib/cmdline/credentials.c
@@ -19,10 +19,7 @@
 */
 
 #include "includes.h"
-#include "version.h"
 #include "system/filesys.h"
-#include "system/passwd.h"
-#include "lib/cmdline/popt_common.h"
 
 static const char *cmdline_get_userpassword(struct cli_credentials *credentials)
 {
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index b8c5b5b9d31..f31408b5ada 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -22,8 +22,6 @@
 
 #include "includes.h"
 #include "version.h"
-#include "system/filesys.h"
-#include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"
 
 /* Handle command line options:
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index a974d808e34..49916d0ff34 100644
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -20,9 +20,6 @@
 */
 
 #include "includes.h"
-#include "version.h"
-#include "system/filesys.h"
-#include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"
 
 /* Handle command line options:
diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
index bfa41f9ef6d..9c18756da69 100644
--- a/source4/lib/com/dcom/main.c
+++ b/source4/lib/com/dcom/main.c
@@ -20,11 +20,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dlinklist.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_remact.h"
-#include "librpc/gen_ndr/ndr_oxidresolver.h"
-#include "librpc/gen_ndr/ndr_dcom.h"
 #include "librpc/gen_ndr/com_dcom.h"
 #include "lib/com/dcom/dcom.h"
 
diff --git a/source4/lib/com/dcom/tables.c b/source4/lib/com/dcom/tables.c
index a824413b34f..ce4f672d37a 100644
--- a/source4/lib/com/dcom/tables.c
+++ b/source4/lib/com/dcom/tables.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "dlinklist.h"
 #include "librpc/gen_ndr/com_dcom.h"
 
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
index 3a18f5df88d..c2e65cf8257 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/ldb_tdb/ldb_tdb.h"
 
 /*
diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c
index 84270195dc9..51cb3f8d78f 100644
--- a/source4/lib/ldb/samba/ldif_handlers.c
+++ b/source4/lib/ldb/samba/ldif_handlers.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
 
diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 058f4dc751b..c22cfde4ece 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -35,7 +35,6 @@
 #include "includes.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
 #ifdef _SAMBA_BUILD_
diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 6da8d0269f9..a6574a50885 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -35,7 +35,6 @@
 #include "includes.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
 #ifdef _SAMBA_BUILD_
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 4d47cf27c9f..8818777ceb2 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -35,7 +35,6 @@
 #include "includes.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
 #ifdef _SAMBA_BUILD_
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 4c78e485b5e..f067aef3f8c 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -34,7 +34,6 @@
 
 #include "includes.h"
 #include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
 #ifdef _SAMBA_BUILD_
diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c
index 4b3b27c1300..f225246cc78 100644
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -36,7 +36,6 @@
 
 #include "includes.h"
 #include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
 #ifdef _SAMBA_BUILD_
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index f8c06f0fa4a..c493356405a 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -35,7 +35,6 @@
 #include "includes.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
 #ifdef _SAMBA_BUILD_
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index 7abc1bfcef1..f79f5c6b4c9 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -35,7 +35,6 @@
 #include "includes.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
-#include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
 #ifdef _SAMBA_BUILD_
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index e3ad8e7e257..c7cce9c133e 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -22,16 +22,13 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
-#include "system/dir.h"
 #include "system/filesys.h"
-#include "system/time.h"
 #include "messages.h"
 #include "dlinklist.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "lib/messaging/irpc.h"
 #include "db_wrap.h"
-#include "lib/tdb/include/tdb.h"
 #include "lib/tdb/include/tdbutil.h"
 
 /* change the message version with any incompatible changes in the protocol */
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c
index 21c9c26b216..e498c296ae3 100644
--- a/source4/lib/registry/patchfile.c
+++ b/source4/lib/registry/patchfile.c
@@ -20,9 +20,7 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "lib/registry/registry.h"
-#include "lib/cmdline/popt_common.h"
 #include "system/filesys.h"
 
 #define DEFAULT_IDENT_STRING "SAMBA4 REGISTRY"
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 3720298df8e..68cc56f9dd3 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "smb_build.h"
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 2cc1507b3e3..b8b88054863 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -20,11 +20,8 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
-#include "system/filesys.h"
-#include "librpc/gen_ndr/winreg.h"
 #include "smb_build.h"
 
 int main(int argc, char **argv)
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 52bda8aa423..c858b37f4a1 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -20,11 +20,9 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/time.h"
-#include "librpc/gen_ndr/ndr_security.h"
 #include "smb_build.h"
 
 /* 
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 01e4f92f4a6..9a9121379b9 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "smb_build.h"
diff --git a/source4/lib/samba3/smbpasswd.c b/source4/lib/samba3/smbpasswd.c
index 483fbcfe05e..e6c52966d98 100644
--- a/source4/lib/samba3/smbpasswd.c
+++ b/source4/lib/samba3/smbpasswd.c
@@ -54,7 +54,6 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
 #include "lib/samba3/samba3.h"
 #include "system/iconv.h"
 
diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 4dc10530215..dd3a6047a68 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
-#include "librpc/gen_ndr/nbt.h"
 #include "libcli/composite/composite.h"
 
 
diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c
index 258560cec57..6a90ef9a05b 100644
--- a/source4/lib/socket/connect_multi.c
+++ b/source4/lib/socket/connect_multi.c
@@ -26,7 +26,6 @@
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
-#include "librpc/gen_ndr/nbt.h"
 
 #define MULTI_PORT_DELAY 2000 /* microseconds */
 
diff --git a/source4/lib/socket/socket_ipv6.c b/source4/lib/socket/socket_ipv6.c
index ee3e1183495..bc47d4f554b 100644
--- a/source4/lib/socket/socket_ipv6.c
+++ b/source4/lib/socket/socket_ipv6.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/socket/socket.h"
 #include "system/network.h"
-#include "system/filesys.h"
 
 static struct in6_addr interpret_addr6(const char *name)
 {
diff --git a/source4/lib/system.c b/source4/lib/system.c
index 629b2b07ffb..07afa904ca9 100644
--- a/source4/lib/system.c
+++ b/source4/lib/system.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "system/network.h"
-#include "system/wait.h"
 #include "system/filesys.h"
 
 /*
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 12087639c1d..bbb7fde9f35 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
-#include "lib/tls/tls.h"
 
 #if HAVE_LIBGNUTLS
 #include "gnutls/gnutls.h"
diff --git a/source4/lib/unix_privs.c b/source4/lib/unix_privs.c
index 2ea4d1b2a0b..3c0f3197767 100644
--- a/source4/lib/unix_privs.c
+++ b/source4/lib/unix_privs.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "system/passwd.h"
 
 /*
   there are times when smbd needs to temporarily gain root privileges
diff --git a/source4/lib/util.c b/source4/lib/util.c
index 3443d137d69..ed384572fe6 100644
--- a/source4/lib/util.c
+++ b/source4/lib/util.c
@@ -26,7 +26,6 @@
 #include "dynconfig.h"
 #include "system/network.h"
 #include "system/iconv.h"
-#include "system/dir.h"
 #include "system/filesys.h"
 
 /***************************************************************************