diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 845e42c361d..25004af66c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* config/bfin/bfin.c (enum bfin_builtins): Moved here from...
+	* config/bfin/bfin.h (enum bfin_builtins): ... here.
+
 2005-06-09  Adrian Straetling  <straetling@de.ibm.com>
 
 	* target.h (insn_valid_within_doloop): Rename into
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 36a94993ecc..ad31579b745 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -2671,6 +2671,14 @@ bfin_output_mi_thunk (FILE *file ATTRIBUTE_UNUSED,
     output_asm_insn ("jump.l\t%P0", xops);
 }
 
+/* Codes for all the Blackfin builtins.  */
+enum bfin_builtins
+{
+  BFIN_BUILTIN_CSYNC,
+  BFIN_BUILTIN_SSYNC,
+  BFIN_BUILTIN_MAX
+};
+
 #define def_builtin(NAME, TYPE, CODE)				\
 do {								\
   builtin_function ((NAME), (TYPE), (CODE), BUILT_IN_MD,	\
diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h
index 12e5f2cc091..c31072a6e18 100644
--- a/gcc/config/bfin/bfin.h
+++ b/gcc/config/bfin/bfin.h
@@ -989,14 +989,6 @@ do {                                              \
 #define EXTRA_CONSTRAINT(VALUE, D) \
     ((D) == 'Q' ? GET_CODE (VALUE) == SYMBOL_REF : 0)
 
-/* Codes for all the Blackfin builtins.  */
-enum bfin_builtins
-{
-  BFIN_BUILTIN_CSYNC,
-  BFIN_BUILTIN_SSYNC,
-  BFIN_BUILTIN_MAX
-};
-
 /* `FINALIZE_PIC'
      By generating position-independent code, when two different
      programs (A and B) share a common library (libC.a), the text of