2 files changed, 6 insertions, 5 deletions
diff --git a/source4/include/core.h b/source4/include/core.h
index 20bf7c3def..a31b4c59c7 100644
--- a/source4/include/core.h
+++ b/source4/include/core.h
@@ -25,12 +25,7 @@
 
 #include "libcli/util/nt_status.h"
 
-#include <stdbool.h>
 #include <stdlib.h>
-typedef bool BOOL;
-
-#define False false
-#define True true
 
 /* used to hold an arbitrary blob of data */
 typedef struct datablob {
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 54f6fe9385..ac6204921c 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -111,11 +111,17 @@
 /* Lists, trees, caching, database... */
 #include "talloc/talloc.h"
 #include "core.h"
+#include <stdbool.h>
 #include "charset/charset.h"
 #include "util/util.h"
 #include "param/param.h"
 #include "librpc/gen_ndr/misc.h"
 
+typedef bool BOOL;
+
+#define False false
+#define True true
+
 struct smbcli_tree;
 #include "libcli/util/error.h"