Index: gcc/coretypes.h
===================================================================
--- gcc/coretypes.h	(revision 161214)
+++ gcc/coretypes.h	(working copy)
@@ -68,9 +68,6 @@ struct cl_optimization;
 struct gimple_seq_d;
 typedef struct gimple_seq_d *gimple_seq;
 typedef const struct gimple_seq_d *const_gimple_seq;
-struct gimple_seq_node_d;
-typedef struct gimple_seq_node_d *gimple_seq_node;
-typedef const struct gimple_seq_node_d *const_gimple_seq_node;
 
 /* Address space number for named address space support.  */
 typedef unsigned char addr_space_t;
Index: gcc/gimple.h
===================================================================
--- gcc/gimple.h	(revision 161214)
+++ gcc/gimple.h	(working copy)
@@ -33,6 +33,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-ssa-operands.h"
 #include "tree-ssa-alias.h"
 
+/* The types gimple & gimple_seq are defined in coretypes.h but
+   gimple_seq_node is not needed there.  */
+struct gimple_seq_node_d;
+typedef struct gimple_seq_node_d *gimple_seq_node;
+typedef const struct gimple_seq_node_d *const_gimple_seq_node;
+
 /* For each block, the PHI nodes that need to be rewritten are stored into
    these vectors.  */
 typedef VEC(gimple, heap) *gimple_vec;