diff --git a/headers/os/support/SupportDefs.h b/headers/os/support/SupportDefs.h
index b74c6e3d2a..cae1ba9b45 100644
--- a/headers/os/support/SupportDefs.h
+++ b/headers/os/support/SupportDefs.h
@@ -40,6 +40,7 @@ typedef unsigned short			ushort;
 // System Includes -------------------------------------------------------------
 #include <BeBuild.h>
 #include <sys/types.h>
+#include <stdbool.h>
 #include <Errors.h>
 
 // Project Includes ------------------------------------------------------------
@@ -116,11 +117,12 @@ extern _IMPEXP_BE const char *B_EMPTY_STRING;
 
 // Grandfathering --------------------------------------------------------------
 
-#ifndef __cplusplus
-typedef unsigned char			bool;
-#define false	0
-#define true	1
-#endif 
+//#ifndef __cplusplus
+//typedef enum { false = 0, true = 1 } _Bool;
+//#define	bool	_Bool
+//#define false	0
+//#define true	1
+//#endif 
 
 #ifndef NULL
 #define NULL 	(0)
diff --git a/headers/posix/stdbool.h b/headers/posix/stdbool.h
index 7d9995b0cd..f2af35d419 100644
--- a/headers/posix/stdbool.h
+++ b/headers/posix/stdbool.h
@@ -1,18 +1,21 @@
 #ifndef _STDBOOL_H_
 #define _STDBOOL_H_
 /* 
-** Distributed under the terms of the OpenBeOS License.
+ * Copyright 2005, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
 */
 
 #ifndef __cplusplus
 typedef enum { false = 0, true = 1 } _Bool;
+#define true 1
+#define false 0
 #else
 typedef bool _Bool;
+#define true true
+#define false false
 #endif
 #define bool _Bool
 
-#define true 1
-#define false 0
 #define __bool_true_false_are_defined 1
 
 #endif	/* _STDBOOL_H_ */