diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 8363e785c67..c6adbc87b10 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* paranoia.cc (ENUM_BITFIELD): Remove.
+
 2011-04-08  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc_update (gcc/config/arm/arm-tables.opt): New dependencies.
diff --git a/contrib/paranoia.cc b/contrib/paranoia.cc
index ce21d3520ca..8e8500e2389 100644
--- a/contrib/paranoia.cc
+++ b/contrib/paranoia.cc
@@ -169,7 +169,6 @@ lines
     };
 #undef DEFTREECODE
 
-#define ENUM_BITFIELD(X) enum X
 #define class klass
 
 #include "real.h"
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a115d78fddc..bc726797d34 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* system.h (ENUM_BITFIELD): Remove.
+
 2011-04-25  Maxim Kuvyrkov  <maxim@codesourcery.com>
 	    Eric Botcazou <ebotcazou@adacore.com>
 
diff --git a/gcc/system.h b/gcc/system.h
index 81daaf1320d..147801b5a47 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -598,15 +598,6 @@ extern int vsnprintf(char *, size_t, const char *, va_list);
 #define HOST_BIT_BUCKET "/dev/null"
 #endif
 
-/* Be conservative and only use enum bitfields with GCC.
-   FIXME: provide a complete autoconf test for buggy enum bitfields.  */
-
-#if (GCC_VERSION > 2000)
-#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
-#else
-#define ENUM_BITFIELD(TYPE) unsigned int
-#endif
-
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER)	((size_t) &((TYPE *) 0)->MEMBER)
 #endif
diff --git a/include/ChangeLog b/include/ChangeLog
index 4d05ba0c4bf..fcabfb8384c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* ansidecl.h (ENUM_BITFIELD): New, from gcc/system.h.
+
 2011-03-31  Tristan Gingold  <gingold@adacore.com>
 
 	* dwarf2.h (dwarf_line_number_hp_sfc_ops): New enum.
diff --git a/include/ansidecl.h b/include/ansidecl.h
index 8b76647426b..c39ce2f5d70 100644
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -416,6 +416,15 @@ So instead we use the macro below and test it against specific values.  */
 #define EXPORTED_CONST const
 #endif
 
+/* Be conservative and only use enum bitfields with GCC.
+   FIXME: provide a complete autoconf test for buggy enum bitfields.  */
+
+#if (GCC_VERSION > 2000)
+#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
+#else
+#define ENUM_BITFIELD(TYPE) unsigned int
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 26013027b69..d287d127e80 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* system.h (ENUM_BITFIELD): Remove.
+
 2011-04-24  Jakub Jelinek  <jakub@redhat.com>
 
 	PR preprocessor/48740
diff --git a/libcpp/system.h b/libcpp/system.h
index 5bdfeeda018..aa458fca39b 100644
--- a/libcpp/system.h
+++ b/libcpp/system.h
@@ -357,15 +357,6 @@ extern void abort (void);
    || (__STDC_VERSION__ >= 199901L))
 #endif
 
-/* Be conservative and only use enum bitfields with GCC.
-   FIXME: provide a complete autoconf test for buggy enum bitfields.  */
-
-#if (GCC_VERSION > 2000)
-#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
-#else
-#define ENUM_BITFIELD(TYPE) unsigned int
-#endif
-
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER)	((size_t) &((TYPE *) 0)->MEMBER)
 #endif