12 files changed, 20 insertions, 12 deletions

diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index 7d8eca74c43..482ab4ce145 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -21,7 +21,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "lib/util/debug.h"
 #include "libcli/security/security.h"
 
 /* Map generic access rights to object specific rights.  This technique is
diff --git a/libcli/security/create_descriptor.c b/libcli/security/create_descriptor.c
index ef60d847033..5a2351511ce 100644
--- a/libcli/security/create_descriptor.c
+++ b/libcli/security/create_descriptor.c
@@ -26,7 +26,8 @@
  *
  *  Author: Nadezhda Ivanova
  */
-#include "includes.h"
+#include "replace.h"
+#include "lib/util/debug.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c
index d75b89071c3..3fc338fb233 100644
--- a/libcli/security/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "libcli/security/security.h"
 #include "librpc/ndr/libndr.h"
 #include "libcli/security/display_sec.h"
diff --git a/libcli/security/object_tree.c b/libcli/security/object_tree.c
index fd00068ef7a..c1025e766f6 100644
--- a/libcli/security/object_tree.c
+++ b/libcli/security/object_tree.c
@@ -28,7 +28,7 @@
  *
  *  Author: Nadezhda Ivanova
  */
-#include "includes.h"
+#include "replace.h"
 #include "libcli/security/security.h"
 #include "librpc/ndr/libndr.h"
 
diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 2df1187e6b5..076f040cfb8 100644
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -19,7 +19,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "lib/util/debug.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "system/locale.h"
diff --git a/libcli/security/secace.c b/libcli/security/secace.c
index c9ca823ce39..2452da24b0f 100644
--- a/libcli/security/secace.c
+++ b/libcli/security/secace.c
@@ -20,7 +20,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
 #include "lib/util/tsort.h"
diff --git a/libcli/security/secacl.c b/libcli/security/secacl.c
index a367ab676d2..6c92a2eda76 100644
--- a/libcli/security/secacl.c
+++ b/libcli/security/secacl.c
@@ -20,7 +20,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/secace.h"
 #include "libcli/security/secacl.h"
diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index cd944306ee1..010aec7fad3 100644
--- a/libcli/security/secdesc.c
+++ b/libcli/security/secdesc.c
@@ -20,7 +20,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
+#include "replace.h"
+#include "lib/util/debug.h"
+#include "lib/util/fault.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
 
diff --git a/libcli/security/security_descriptor.c b/libcli/security/security_descriptor.c
index 2d7c5e7a434..34139503060 100644
--- a/libcli/security/security_descriptor.c
+++ b/libcli/security/security_descriptor.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "libcli/security/security.h"
 #include "librpc/ndr/libndr.h"
 
diff --git a/libcli/security/security_token.c b/libcli/security/security_token.c
index 03e7bb70743..17e69f861ff 100644
--- a/libcli/security/security_token.c
+++ b/libcli/security/security_token.c
@@ -21,7 +21,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "lib/util/debug.h"
 #include "libcli/security/security_token.h"
 #include "libcli/security/dom_sid.h"
 #include "libcli/security/privileges.h"
diff --git a/libcli/security/session.c b/libcli/security/session.c
index 76574515e23..8db341d29bc 100644
--- a/libcli/security/session.c
+++ b/libcli/security/session.c
@@ -19,8 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "libcli/security/security.h"
+#include "libcli/util/werror.h"
 #include "librpc/gen_ndr/auth.h"
 
 enum security_user_level security_session_user_level(struct auth_session_info *session_info,
diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index bd5103659e1..30ac56789a5 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -23,7 +23,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "lib/util/samba_util.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"