8 files changed, 29 insertions, 9 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 2773dba1d7..7a484607a7 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -38,7 +38,7 @@
 #include "libcli/ldap/ldap.h"
 #include "libcli/cldap/cldap.h"
 #include "lib/socket/socket.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 /*
diff --git a/source4/libcli/security/access_check.c b/source4/libcli/security/access_check.c
index 1617963998..cd877db9c5 100644
--- a/source4/libcli/security/access_check.c
+++ b/source4/libcli/security/access_check.c
@@ -21,8 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 
 /*
diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index 38192fc60c..46183ce237 100644
--- a/source4/libcli/security/sddl.c
+++ b/source4/libcli/security/sddl.c
@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "system/iconv.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 struct flag_map {
 	const char *name;
diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
new file mode 100644
index 0000000000..eca6878031
--- /dev/null
+++ b/source4/libcli/security/security.h
@@ -0,0 +1,22 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Stefan Metzmacher 2006
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "librpc/gen_ndr/security.h"
+#include "libcli/security/proto.h"
diff --git a/source4/libcli/security/security_descriptor.c b/source4/libcli/security/security_descriptor.c
index 1da3e2e750..f7972f57ac 100644
--- a/source4/libcli/security/security_descriptor.c
+++ b/source4/libcli/security/security_descriptor.c
@@ -21,8 +21,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 
 /*
   return a blank security descriptor (no owners, dacl or sacl)
diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index 5fcde246ef..6e380a62ad 100644
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /*
diff --git a/source4/libcli/smb_composite/appendacl.c b/source4/libcli/smb_composite/appendacl.c
index 55aa727729..f82714de5b 100644
--- a/source4/libcli/smb_composite/appendacl.c
+++ b/source4/libcli/smb_composite/appendacl.c
@@ -1,7 +1,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 /* the stages of this call */
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index fab392ac04..f5e49dd577 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -29,7 +29,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"