6 files changed, 21 insertions, 11 deletions
diff --git a/source3/include/adt_tree.h b/source3/include/adt_tree.h
index 51b6fb1c88..a053013a9b 100644
--- a/source3/include/adt_tree.h
+++ b/source3/include/adt_tree.h
@@ -21,9 +21,9 @@
 #ifndef ADT_TREE_H
 #define ADT_TREE_H
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-#define _BOOL  
+#define _UPPER_BOOL  
 #endif
 
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index bcf0fa4277..1dbf92f036 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -612,9 +612,9 @@ struct timespec {
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-#define _BOOL       /* So we don't typedef BOOL again in vfs.h */
+#define _UPPER_BOOL
 #endif
 
 #ifdef HAVE_BROKEN_GETGROUPS
diff --git a/source3/include/privileges.h b/source3/include/privileges.h
index 3f425f6d72..eac42e0ba9 100644
--- a/source3/include/privileges.h
+++ b/source3/include/privileges.h
@@ -93,9 +93,9 @@ typedef struct {
 	uint32 attr;
 } LUID_ATTR;
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-#define _BOOL       /* So we don't typedef BOOL again in vfs.h */
+#define _UPPER_BOOL
 #endif
 
 typedef struct {
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index 61adb999d9..edcdebe6bd 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -333,6 +333,7 @@ typedef int bool;
  *
  * IRIX, HPUX, MacOS 10 and Solaris need BOOL_DEFINED
  * Tru64 needs _BOOL_EXISTS
+ * AIX needs _BOOL,_TRUE,_FALSE
  */
 #ifndef BOOL_DEFINED
 #define BOOL_DEFINED
@@ -340,6 +341,9 @@ typedef int bool;
 #ifndef _BOOL_EXISTS
 #define _BOOL_EXISTS
 #endif
+#ifndef _BOOL
+#define _BOOL
+#endif
 
 #ifndef __bool_true_false_are_defined
 #define __bool_true_false_are_defined
@@ -352,6 +356,13 @@ typedef int bool;
 #define false (0)
 #endif
 
+#ifndef _TRUE
+#define _TRUE
+#endif
+#ifndef _FALSE
+#define _FALSE
+#endif
+
 #ifndef HAVE_FUNCTION_MACRO
 #ifdef HAVE_func_MACRO
 #define __FUNCTION__ __func__
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h
index a5d5ca0450..70c6d0bd22 100644
--- a/source3/libaddns/dns.h
+++ b/source3/libaddns/dns.h
@@ -279,10 +279,9 @@ TXT             16 text strings
 
 typedef long HANDLE;
 
-#ifndef _BOOL
+#ifndef _UPPER_BOOL
 typedef int BOOL;
-
-#define _BOOL			/* So we don't typedef BOOL again */
+#define _UPPER_BOOL
 #endif
 
 
diff --git a/source3/nsswitch/winbind_nss_config.h b/source3/nsswitch/winbind_nss_config.h
index f9d3852660..f7fa261f7d 100644
--- a/source3/nsswitch/winbind_nss_config.h
+++ b/source3/nsswitch/winbind_nss_config.h
@@ -95,8 +95,8 @@ typedef char pstring[PSTRING_LEN];
 typedef char fstring[FSTRING_LEN];
 #endif
 
-#ifndef _BOOL
-#define _BOOL			/* So we don't typedef BOOL again in vfs.h */
+#ifndef _UPPER_BOOL
+#define _UPPER_BOOL
 #define False (0)
 #define True (1)
 #define Auto (2)