5 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 38eabb60a9..4ad7e162a3 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -59,7 +59,7 @@
 #define CMD_KEY 1
 #define CMD_VAL 2
 
-#include <include/includes.h>
+#include "includes.h"
 
 typedef struct val_spec_list {
   struct val_spec_list *next;
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c535509ca6..bbdf835e95 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -59,7 +59,7 @@
 #include "system/network.h"
 #include "system/printing.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
-#include "include/dlinklist.h"
+#include "dlinklist.h"
 
 BOOL in_client = False;		/* Not in the client by default */
 static BOOL bLoaded = False;
diff --git a/source4/utils/getntacl.c b/source4/utils/getntacl.c
index 0d6e86bf3b..2a35c93387 100644
--- a/source4/utils/getntacl.c
+++ b/source4/utils/getntacl.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_NO_ACLS
+#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT))
 
 int main(int argc, char **argv)
 {
diff --git a/source4/utils/setntacl.c b/source4/utils/setntacl.c
index 2ac6e6d6f3..a65a014f26 100644
--- a/source4/utils/setntacl.c
+++ b/source4/utils/setntacl.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_NO_ACLS
+#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT))
 
 int main(int argc, char **argv)
 {
diff --git a/source4/utils/setnttoken.c b/source4/utils/setnttoken.c
index e3f699fce4..b3b11a78ca 100644
--- a/source4/utils/setnttoken.c
+++ b/source4/utils/setnttoken.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_NO_ACLS
+#if (!defined(HAVE_NO_ACLS) || !defined(HAVE_XATTR_SUPPORT))
 
 int main(int argc, char **argv)
 {