diff -urN ../linux-2.6.23-orig/include/linux/stddef.h include/linux/stddef.h
--- ../linux-2.6.23-orig/include/linux/stddef.h	2007-10-10 05:31:38 +0900
+++ include/linux/stddef.h	2007-11-19 14:40:20 +0900
@@ -12,10 +12,12 @@
 
 #ifdef __KERNEL__
 
+#ifndef __cplusplus
 enum {
 	false	= 0,
 	true	= 1
 };
+#endif
 
 #undef offsetof
 #ifdef __compiler_offsetof
diff -urN ../linux-2.6.23-orig/include/linux/types.h include/linux/types.h
--- ../linux-2.6.23-orig/include/linux/types.h	2007-10-10 05:31:38 +0900
+++ include/linux/types.h	2007-11-19 14:40:20 +0900
@@ -33,7 +33,9 @@
 typedef __kernel_mqd_t		mqd_t;
 
 #ifdef __KERNEL__
+#ifndef __cplusplus
 typedef _Bool			bool;
+#endif
 
 typedef __kernel_uid32_t	uid_t;
 typedef __kernel_gid32_t	gid_t;