r14363: Remove credentials.h from the global includes.

(This used to be commit 98c4c3051391c6f89df5d133665f51bef66b1563)

48 files changed, 55 insertions, 7 deletions

diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index eb4e5c96d0..58d393f762 100644
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -20,6 +20,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#ifndef __CREDENTIALS_H__
+#define __CREDENTIALS_H__
 
 struct ccache_container;
 
@@ -103,3 +105,5 @@ struct cli_credentials {
 };
 
 #include "auth/credentials/credentials_proto.h"
+
+#endif /* __CREDENTIALS_H__ */
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index c4e384c2cd..dd510f97f1 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -28,6 +28,7 @@
 #include "passdb/secrets.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
+#include "auth/credentials/credentials.h"
 
 /**
  * Read a file descriptor, and parse it for a password (eg from a file or stdin)
diff --git a/source4/auth/credentials/credentials_ntlm.c b/source4/auth/credentials/credentials_ntlm.c
index eafd5e00a2..768ed9bb3f 100644
--- a/source4/auth/credentials/credentials_ntlm.c
+++ b/source4/auth/credentials/credentials_ntlm.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "lib/crypto/crypto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 void cli_credentials_get_ntlm_username_domain(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, 
diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 2084ebb97a..1e9c74566c 100644
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -21,6 +21,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __GENSEC_H__
+#define __GENSEC_H__
+
 #define GENSEC_OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10"
 #define GENSEC_OID_SPNEGO "1 3 6 1 5 5 2"
 #define GENSEC_OID_KERBEROS5 "1 2 840 113554 1 2 2"
@@ -124,4 +127,7 @@ struct gensec_critical_sizes {
 	int sizeof_gensec_security;
 };
 
+#include "auth/credentials/credentials.h"
 #include "gensec_proto.h"
+
+#endif /* __GENSEC_H__ */
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 2408291a48..d8f6155620 100644
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -21,6 +21,7 @@
 
 #if defined(HAVE_KRB5)
 
+#include "auth/credentials/credentials.h"
 #include "auth/kerberos/krb5_init_context.h"
 
 struct ccache_container {
@@ -166,4 +167,3 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
 #include "auth/kerberos/proto.h"
 
 #endif /* HAVE_KRB5 */
-
diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c
index 390caa0071..cea6eeafc1 100644
--- a/source4/auth/ntlm_check.c
+++ b/source4/auth/ntlm_check.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/crypto/crypto.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 /****************************************************************************
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 53027d33d5..a4015683d1 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,13 +1,11 @@
 - saner names for some of the .pc files
 - .pc files also when there is a public header?
-- get rid of include/structs.h and include/proto.h
- - support including a custom header by librpc/gen_ndr/*.c files
- - if a ndr_.*_man.h file exists, include it.
 - plugin loading support in ldb
 - proper #include dependencies:
   for each subsystem:
   - include line in Makefile
   - rule in Makefile
+- improve include paths and how they are handled
 - install autogenerated headers (seperate directory)
 - subdir handler for install headers into a specific directory
 
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index bdbbafd955..6943a5f356 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -36,6 +36,7 @@
 #include "ldb/include/ldb_private.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 9f9a8c229e..e666de1414 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -41,6 +41,7 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
+#include "auth/credentials/credentials.h"
 
 struct proxy_data {
 	struct ldb_context *upstream;
diff --git a/source4/gtk/common/credentials.c b/source4/gtk/common/credentials.c
index 01132ec6bd..0646131b73 100644
--- a/source4/gtk/common/credentials.c
+++ b/source4/gtk/common/credentials.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 static void gtk_get_credentials(struct cli_credentials *credentials)
 {
diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 72ba5f992b..fdbf5357ea 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -23,6 +23,7 @@
 #include "lib/registry/registry.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 static GtkTreeStore *store_keys;
 static GtkListStore *store_vals;
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index 020bae30f2..f2e42d01dd 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_atsvc.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 static struct dcerpc_pipe *at_pipe = NULL;
 static GtkWidget *mainwin;
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 55e11471e2..633b04851a 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
+#include "auth/credentials/credentials.h"
 
 struct policy_handle sam_handle;
 struct dcerpc_pipe *sam_pipe = NULL;
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 81105d227d..4ff67791f9 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -117,11 +117,8 @@ enum brl_type {
 #include "libcli/util/nterr.h"
 #include "libcli/util/doserr.h"
 #include "librpc/ndr/libndr.h"
-#include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/ndr_orpc.h"
-#include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
-#include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
 #include "libcli/util/proto.h"
 
diff --git a/source4/lib/cmdline/credentials.c b/source4/lib/cmdline/credentials.c
index b19cbf73c0..b2ec67a72e 100644
--- a/source4/lib/cmdline/credentials.c
+++ b/source4/lib/cmdline/credentials.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "auth/credentials/credentials.h"
 
 static const char *cmdline_get_userpassword(struct cli_credentials *credentials)
 {
diff --git a/source4/lib/samba3/secrets.c b/source4/lib/samba3/secrets.c
index 33992a9b32..02864b6016 100644
--- a/source4/lib/samba3/secrets.c
+++ b/source4/lib/samba3/secrets.c
@@ -30,6 +30,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/tdb/include/tdbutil.h"
+#include "auth/credentials/credentials.h"
 
 /**
  * Unpack SID into a pointer
diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index f267baa4c0..587fb98920 100644
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -28,6 +28,7 @@
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
 #include "lib/crypto/crypto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "pstring.h"
 
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 8616e42cd4..a718f43d96 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "libcli/smb_composite/smb_composite.h"
 
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 07da2d363a..b36e37a1a4 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -27,6 +27,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
+#include "auth/credentials/credentials.h"
 
 /* the stages of this call */
 enum connect_stage {CONNECT_RESOLVE, 
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index 9e345ab4f8..a62386b672 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -25,6 +25,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "auth/auth.h"
 #include "version.h"
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index d5d5863f31..914c2bfbb1 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -29,6 +29,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
+#include "auth/credentials/credentials.h"
 
 /*
  * complete a domain join, when joining to a AD domain:
diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index e7a474811f..7d738d8ee0 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -23,6 +23,7 @@
 #include "smb.h"
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 /*
diff --git a/source4/libnet/libnet_samdump_keytab.c b/source4/libnet/libnet_samdump_keytab.c
index de575ec668..ff527e2dfb 100644
--- a/source4/libnet/libnet_samdump_keytab.c
+++ b/source4/libnet/libnet_samdump_keytab.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "system/kerberos.h"
+#include "auth/credentials/credentials.h"
 
 static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX *mem_ctx,
 					    const char *keytab_name,
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index b425926e99..e92dbc281d 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
+#include "auth/credentials/credentials.h"
 #include "auth/gensec/schannel_proto.h"
 #include "libcli/auth/proto.h"
 
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index bea119d645..6e0fc0c743 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -30,6 +30,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
+#include "auth/credentials/credentials.h"
 
 
 struct dcerpc_pipe_connect;
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 93b385868d..8813270b1a 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -29,6 +29,7 @@
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "auth/credentials/credentials.h"
 
 /*
   find a dcerpc call on an interface by name
diff --git a/source4/scripting/ejs/ejsnet.c b/source4/scripting/ejs/ejsnet.c
index 6c7a0274cf..952ebeb575 100644
--- a/source4/scripting/ejs/ejsnet.c
+++ b/source4/scripting/ejs/ejsnet.c
@@ -26,6 +26,7 @@
 #include "scripting/ejs/ejsnet.h"
 #include "libnet/libnet.h"
 #include "events/events.h"
+#include "auth/credentials/credentials.h"
 
 static int ejs_net_userman(MprVarHandle, int, struct MprVar**);
 static int ejs_net_createuser(MprVarHandle, int, char**);
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index bc69c0653d..914d163ec7 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -27,6 +27,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/libcli.h"
+#include "auth/credentials/credentials.h"
 
 #if 0
 
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index a1b9446e9e..c6ad64933b 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/cmdline/popt_common.h"
+#include "auth/credentials/credentials.h"
 
 /*
   helper function to get the local objects credentials ptr
diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c
index 4527f7385a..e666aa65cc 100644
--- a/source4/scripting/ejs/smbcalls_rpc.c
+++ b/source4/scripting/ejs/smbcalls_rpc.c
@@ -30,6 +30,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc_table.h"
+#include "auth/credentials/credentials.h"
 
 /*
   state of a irpc 'connection'
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 20b7e8a579..eb0dad534d 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -26,6 +26,7 @@
 #include "libcli/libcli.h"
 #include "system/time.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "auth/credentials/credentials.h"
 
 static BOOL try_failed_login(struct smbcli_state *cli)
 {
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 7e0058cd9f..8e6ec290fa 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index bfcd2473e3..e733009931 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -26,6 +26,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
 #include "libcli/libcli.h"
+#include "auth/credentials/credentials.h"
 
 #define BASEDIR "\\rawcontext"
 
diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index d75d367a1e..b76cf605b2 100644
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 
 BOOL torture_rpc_alter_context(void)
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index e63915992a..f23bb5586b 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "torture/rpc/proto.h"
 
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index 227ddb200e..0a44084dde 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "torture/rpc/proto.h"
 #include "ldb/include/ldb.h"
diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index b9ffe32f2f..7dea5cdb26 100644
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -1,6 +1,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 
 #define TORTURE_NETBIOS_NAME "smbtorturejoin"
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 9b62faee8e..eaced4b3d3 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/events/events.h"
 #include "libcli/security/proto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 6d1b507c2b..f5bbed1805 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "smb.h"
 #include "lib/crypto/crypto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 #include "libcli/security/proto.h"
 
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index b5ff8bbfac..41ad88d109 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/gensec/schannel_proto.h"
diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index b5f8889ded..448c85c202 100644
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "libcli/auth/proto.h"
 
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 9f39224b68..02b6366b1e 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -34,6 +34,7 @@
 #include "smb.h"
 #include "lib/ldb/include/ldb.h"
 
+#include "auth/credentials/credentials.h"
 #include "torture/rpc/proto.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/proto.h"
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 572733d591..3236bbb89c 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -30,6 +30,7 @@
 #include "librpc/rpc/dcerpc_table.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
+#include "auth/credentials/credentials.h"
 
 #include "torture/basic/proto.h"
 #include "torture/raw/proto.h"
diff --git a/source4/utils/net/net_password.c b/source4/utils/net/net_password.c
index 8f6b989a5d..4c67f87b43 100644
--- a/source4/utils/net/net_password.c
+++ b/source4/utils/net/net_password.c
@@ -23,6 +23,7 @@
 #include "utils/net/net.h"
 #include "libnet/libnet.h"
 #include "system/filesys.h"
+#include "auth/credentials/credentials.h"
 
 /*
  * Code for Changing and setting a password
diff --git a/source4/utils/net/net_user.c b/source4/utils/net/net_user.c
index ecc1834fcf..75eec9716d 100644
--- a/source4/utils/net/net_user.c
+++ b/source4/utils/net/net_user.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "libnet/libnet.h"
+#include "auth/credentials/credentials.h"
 
 static int net_user_add(struct net_context *ctx, int argc, const char **argv)
 {
diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c
index fbffebc092..cf4c83d767 100644
--- a/source4/winbind/wb_async_helpers.c
+++ b/source4/winbind/wb_async_helpers.c
@@ -30,6 +30,7 @@
 #include "libcli/auth/credentials.h"
 #include "libcli/security/proto.h"
 #include "libcli/auth/proto.h"
+#include "auth/credentials/credentials.h"
 
 #include "winbind/wb_helper.h"
 
diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index 90371eb457..4c286cc6e6 100644
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -34,6 +34,7 @@
 
 #include "libcli/ldap/ldap_client.h"
 
+#include "auth/credentials/credentials.h"
 
 /*
  * Initialize a domain:
diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index b57f918669..97f0845467 100644
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -27,6 +27,7 @@
 #include "smbd/service_task.h"
 #include "libcli/auth/credentials.h"
 #include "libcli/auth/proto.h"
+#include "auth/credentials/credentials.h"
 
 /* Oh, there is so much to keep an eye on when authenticating a user.  Oh my! */
 struct pam_auth_crap_state {