9 files changed, 9 insertions, 7 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 0eff955c71..32a4f019f4 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -27,6 +27,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "libcli/security/proto.h"
 #include "libcli/ldap/ldap.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static const char *user_attrs[] = {
 	/* requried for the krb5 kdc*/
diff --git a/source4/auth/auth_winbind.c b/source4/auth/auth_winbind.c
index 86854dfcec..4a031e6b94 100644
--- a/source4/auth/auth_winbind.c
+++ b/source4/auth/auth_winbind.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "nsswitch/winbind_client.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response *response, struct netr_SamInfo3 *info3)
 {
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 01a00c3dfc..ee90c8228a 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "auth/gensec/gensec.h"
 #include "libcli/auth/libcli_auth.h"
 
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index dd510f97f1..6afd5ea828 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "passdb/secrets.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
diff --git a/source4/auth/credentials/credentials_ntlm.c b/source4/auth/credentials/credentials_ntlm.c
index 67c73d2230..aa9a113e8d 100644
--- a/source4/auth/credentials/credentials_ntlm.c
+++ b/source4/auth/credentials/credentials_ntlm.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index f3b5f8c119..8d1cef1cbd 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index e2c9596ac4..48f748cb19 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -27,7 +27,7 @@
 #include "includes.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"
diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c
index 61edcade34..20c5854098 100644
--- a/source4/auth/ntlm_check.c
+++ b/source4/auth/ntlm_check.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "lib/crypto/crypto.h"
-#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "librpc/gen_ndr/netlogon.h"
 #include "libcli/auth/libcli_auth.h"
 
 /****************************************************************************
diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
index 13d89c2db6..1efb1afd54 100644
--- a/source4/auth/ntlmssp/ntlmssp.h
+++ b/source4/auth/ntlmssp/ntlmssp.h
@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/gen_ndr/samr.h"
 
 /* NTLMSSP mode */
 enum ntlmssp_role