diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2103a6637058724ce3dd7a2692c0e119c7043e11..9a3f53ff404abafd5d3788cd137090daeac00ddb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-27  Kazu Hirata  <kazu@codesourcery.com>
+
+	* global.c, tree-ssa-pre.c: Move DEF_VEC_P(basic_block) and
+	DEF_VEC_ALLOC_P(basic_block,{gc,heap}) to ...
+	* basic-block.h: ... here.
+
 2005-12-27  Roger Sayle  <roger@eyesopen.com>
 
 	* fold-const.c (int_const_binop): Return NULL_TREE when an expression
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 69dba56dd8163e9ed0c20a1cbc1866bfebc77517..101f48610b20e3556fc030bc9a947c1a11caf73b 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -282,6 +282,10 @@ struct rtl_bb_info GTY(())
 
 typedef struct basic_block_def *basic_block;
 
+DEF_VEC_P(basic_block);
+DEF_VEC_ALLOC_P(basic_block,gc);
+DEF_VEC_ALLOC_P(basic_block,heap);
+
 #define BB_FREQ_MAX 10000
 
 /* Masks for basic_block.flags.
diff --git a/gcc/global.c b/gcc/global.c
index e92a4cb7a95af81ad9d755e0867463ed0f901804..e88e1012a5e8332b36d3d8f7ea1197f0154aeaae 100644
--- a/gcc/global.c
+++ b/gcc/global.c
@@ -2301,9 +2301,6 @@ rpost_cmp (const void *bb1, const void *bb2)
 /* Temporary bitmap used for live_pavin, live_pavout calculation.  */
 static bitmap temp_bitmap;
 
-DEF_VEC_P(basic_block);
-DEF_VEC_ALLOC_P(basic_block,heap);
-
 /* The function calculates partial register availability according to
    the following equations:
 
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 1f469292622693489e350e8d50c0695a216992b4..e8ef1220b19538ab7e981a7f8c7e95bd807295ad 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -1334,8 +1334,6 @@ clean (value_set_t set)
     }
 }
 
-DEF_VEC_P (basic_block);
-DEF_VEC_ALLOC_P (basic_block, heap);
 static sbitmap has_abnormal_preds;
 
 /* Compute the ANTIC set for BLOCK.