--- include/linux/stddef.h.old	2006-12-05 03:27:56 +0900
+++ include/linux/stddef.h	2006-12-05 03:28:03 +0900
@@ -12,10 +12,12 @@
 
 #ifdef __KERNEL__
 
+#ifndef __cplusplus
 enum {
 	false	= 0,
 	true	= 1
 };
+#endif
 
 #undef offsetof
 #ifdef __compiler_offsetof
--- include/linux/types.h.old	2006-12-05 03:26:41 +0900
+++ include/linux/types.h	2006-12-05 03:27:46 +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;