diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c23273457ca..0ba07ac7b6d4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-03  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+	* basic-block.h (struct edge_prediction): Remove forward
+	declaration.
+	* tree-flow.h (struct edge_prediction): Move from here...
+	* predict.c (struct edge_prediction): ...to here.
+	* cselib.h (struct elt_list): Move from here...
+	* cselib.c (struct elt_list): ...to here.
+
 2010-12-02  Ian Lance Taylor  <iant@google.com>
 
 	* gcc.c (default_compilers): Add entry for ".go".
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 022dc9f95251..be0a1d17c69e 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -99,7 +99,6 @@ extern const struct gcov_ctr_summary *profile_info;
 struct loop;
 
 /* Declared in tree-flow.h.  */
-struct edge_prediction;
 struct rtl_bb_info;
 
 /* A basic block is a sequence of instructions with only entry and
diff --git a/gcc/cselib.c b/gcc/cselib.c
index 600930159fcf..8f5e45b08d26 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -44,6 +44,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "bitmap.h"
 
+/* A list of cselib_val structures.  */
+struct elt_list {
+    struct elt_list *next;
+    cselib_val *elt;
+};
+
 static bool cselib_record_memory;
 static bool cselib_preserve_constants;
 static int entry_and_rtx_equal_p (const void *, const void *);
diff --git a/gcc/cselib.h b/gcc/cselib.h
index 5964a4487ceb..d07c8330d47f 100644
--- a/gcc/cselib.h
+++ b/gcc/cselib.h
@@ -51,12 +51,6 @@ struct elt_loc_list {
   rtx setting_insn;
 };
 
-/* A list of cselib_val structures.  */
-struct elt_list {
-  struct elt_list *next;
-  cselib_val *elt;
-};
-
 /* Describe a single set that is part of an insn.  */
 struct cselib_set
 {
diff --git a/gcc/predict.c b/gcc/predict.c
index dbef3595c450..c69199083161 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -387,6 +387,15 @@ rtl_predicted_by_p (const_basic_block bb, enum br_predictor predictor)
 
 static struct pointer_map_t *bb_predictions;
 
+/*  Structure representing predictions in tree level. */
+
+struct edge_prediction {
+    struct edge_prediction *ep_next;
+    edge ep_edge;
+    enum br_predictor ep_predictor;
+    int ep_probability;
+};
+
 /* Return true if the one of outgoing edges is already predicted by
    PREDICTOR.  */
 
diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h
index 1486e33aeba3..682907c2f9dc 100644
--- a/gcc/tree-flow.h
+++ b/gcc/tree-flow.h
@@ -286,16 +286,6 @@ static inline var_ann_t get_var_ann (tree);
 static inline void update_stmt (gimple);
 static inline int get_lineno (const_gimple);
 
-/*---------------------------------------------------------------------------
-                  Structure representing predictions in tree level.
----------------------------------------------------------------------------*/
-struct edge_prediction {
-  struct edge_prediction *ep_next;
-  edge ep_edge;
-  enum br_predictor ep_predictor;
-  int ep_probability;
-};
-
 /* Accessors for basic block annotations.  */
 static inline gimple_seq phi_nodes (const_basic_block);
 static inline void set_phi_nodes (basic_block, gimple_seq);