From b23fb4cbefbb7fc5574fe593cb955ff56e3aeaf9 Mon Sep 17 00:00:00 2001
From: amacleod <amacleod@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 29 Oct 2013 12:55:50 +0000
Subject: [PATCH] 	* tree-outof-ssa.h: Remove include files. 	*
 tree-outof-ssa.c: Add required include files from tree-outof-ssa.h. 	*
 expr.c: Likewise. 	* tree-ssa-coalesce.c: Likewise. 	* cfgexpand.c:
 Likewise. 	* tree-ssa-ter.c: Likewise. 	* ipa-prop.h: Remove gimple.h
 and tree-core.h from include list. 	* lto-streamer.h: Likewise. 	*
 cgraphbuild.c: Add gimple.h to include list. 	* data-streamer-in.c:
 Likewise. 	* ipa-cp.c: Likewise. 	* tree-streamer.c: Likewise. 	*
 lto-compress.c: Likewise. 	* ipa-reference.c: Likewise. 	*
 data-streamer-out.c: Likewise. 	* lto-cgraph.c: Likewise. 	*
 cgraphclones.c: Likewise. 	* ipa-utils.c: Likewise. 	*
 data-streamer.c: Likewise. 	* ipa-split.c: Likewise. 	*
 lto-section-in.c: Likewise. 	* tree-streamer-out.c: Likewise. 	*
 ipa-prop.c: Likewise. 	* tree-streamer-in.c: Likewise. 	* symtab.c:
 Likewise. 	* opts-global.c: Likewise. 	* lto-opts.c: Likewise. 
 * lto-section-out.c: Likewise. 	* lto-streamer.c: Likewise. 	*
 rtl.h: Add tree-core.h to include list. 	* expr.h: Remove tree-core.h
 from include list. 	* gimple.h: Likewise. 	* ipa-utils.h: Likewise. 
 * streamer-hooks.h: Likewise. 	* streamer-hooks.c: Include input.h.

	* lto/lto-object.c: Add gimple.h to include list.
	* lto/lto-partition.c: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204158 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog           | 38 ++++++++++++++++++++++++++++++++++++++
 gcc/cfgexpand.c         |  1 +
 gcc/cgraphbuild.c       |  1 +
 gcc/cgraphclones.c      |  1 +
 gcc/data-streamer-in.c  |  1 +
 gcc/data-streamer-out.c |  1 +
 gcc/data-streamer.c     |  1 +
 gcc/expr.c              |  1 +
 gcc/expr.h              |  3 ---
 gcc/gimple.h            |  1 -
 gcc/ipa-cp.c            |  1 +
 gcc/ipa-prop.c          |  1 +
 gcc/ipa-prop.h          |  2 --
 gcc/ipa-reference.c     |  1 +
 gcc/ipa-split.c         |  1 +
 gcc/ipa-utils.c         |  1 +
 gcc/ipa-utils.h         |  1 -
 gcc/lto-cgraph.c        |  1 +
 gcc/lto-compress.c      |  1 +
 gcc/lto-opts.c          |  1 +
 gcc/lto-section-in.c    |  1 +
 gcc/lto-section-out.c   |  1 +
 gcc/lto-streamer.c      |  1 +
 gcc/lto-streamer.h      |  2 --
 gcc/lto/ChangeLog       |  5 +++++
 gcc/lto/lto-object.c    |  1 +
 gcc/lto/lto-partition.c |  1 +
 gcc/opts-global.c       |  1 +
 gcc/rtl.h               |  1 +
 gcc/streamer-hooks.c    |  1 +
 gcc/streamer-hooks.h    |  2 --
 gcc/symtab.c            |  1 +
 gcc/tree-outof-ssa.c    |  3 +++
 gcc/tree-outof-ssa.h    |  3 ---
 gcc/tree-ssa-coalesce.c |  3 ++-
 gcc/tree-ssa-ter.c      |  2 ++
 gcc/tree-streamer-in.c  |  1 +
 gcc/tree-streamer-out.c |  1 +
 gcc/tree-streamer.c     |  1 +
 39 files changed, 77 insertions(+), 15 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5855f116b1e2..a683e9a2546f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,41 @@
+2013-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* tree-outof-ssa.h: Remove include files.
+	* tree-outof-ssa.c: Add required include files from tree-outof-ssa.h.
+	* expr.c: Likewise.
+	* tree-ssa-coalesce.c: Likewise.
+	* cfgexpand.c: Likewise.
+	* tree-ssa-ter.c: Likewise.
+	* ipa-prop.h: Remove gimple.h and tree-core.h from include list.
+	* lto-streamer.h: Likewise.
+	* cgraphbuild.c: Add gimple.h to include list.
+	* data-streamer-in.c: Likewise.
+	* ipa-cp.c: Likewise.
+	* tree-streamer.c: Likewise.
+	* lto-compress.c: Likewise.
+	* ipa-reference.c: Likewise.
+	* data-streamer-out.c: Likewise.
+	* lto-cgraph.c: Likewise.
+	* cgraphclones.c: Likewise.
+	* ipa-utils.c: Likewise.
+	* data-streamer.c: Likewise.
+	* ipa-split.c: Likewise.
+	* lto-section-in.c: Likewise.
+	* tree-streamer-out.c: Likewise.
+	* ipa-prop.c: Likewise.
+	* tree-streamer-in.c: Likewise.
+	* symtab.c: Likewise.
+	* opts-global.c: Likewise.
+	* lto-opts.c: Likewise.
+	* lto-section-out.c: Likewise.
+	* lto-streamer.c: Likewise.
+	* rtl.h: Add tree-core.h to include list.
+	* expr.h: Remove tree-core.h from include list.
+	* gimple.h: Likewise.
+	* ipa-utils.h: Likewise.
+	* streamer-hooks.h: Likewise.
+	* streamer-hooks.c: Include input.h.
+
 2013-10-29  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* config/arm/arm.c (cortexa7_extra_costs): New table.
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 97050360f2b6..c312c37c6348 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -49,6 +49,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "value-prof.h"
 #include "target.h"
+#include "tree-ssa-live.h"
 #include "tree-outof-ssa.h"
 #include "sbitmap.h"
 #include "cfgloop.h"
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index be2d79eeabfa..f033bddfd530 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "langhooks.h"
 #include "pointer-set.h"
 #include "intl.h"
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index 800dd2c57a5c..05a9067b3bdb 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -69,6 +69,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "rtl.h"
 #include "bitmap.h"
 #include "tree-cfg.h"
diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index 84db7cfc7c3a..842424869412 100644
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "diagnostic.h"
 #include "tree.h"
+#include "gimple.h"
 #include "data-streamer.h"
 
 /* Read a string from the string table in DATA_IN using input block
diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index 2e55e3df759a..fbbe0db27592 100644
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "data-streamer.h"
 
 /* Return index used to reference STRING of LEN characters in the string table
diff --git a/gcc/data-streamer.c b/gcc/data-streamer.c
index 5915a416a043..675b50933148 100644
--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "data-streamer.h"
 
 /* Pack WORK into BP in a variant of uleb format.  */
diff --git a/gcc/expr.c b/gcc/expr.c
index 4bb4d666968f..89e3979bd8c3 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -52,6 +52,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "timevar.h"
 #include "df.h"
 #include "diagnostic.h"
+#include "tree-ssa-live.h"
 #include "tree-outof-ssa.h"
 #include "target-globals.h"
 #include "params.h"
diff --git a/gcc/expr.h b/gcc/expr.h
index 56f504ac1552..2d7916488783 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -26,9 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl.h"
 /* For optimize_size */
 #include "flags.h"
-/* For host_integerp, tree_low_cst, fold_convert, size_binop, ssize_int,
-   TREE_CODE, TYPE_SIZE, int_size_in_bytes,    */
-#include "tree-core.h"
 /* For GET_MODE_BITSIZE, word_mode */
 #include "machmode.h"
 
diff --git a/gcc/gimple.h b/gcc/gimple.h
index fef64cdb8708..e34411dfe618 100644
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "vec.h"
 #include "ggc.h"
 #include "basic-block.h"
-#include "tree-core.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-fold.h"
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 57ec2dbd98a2..aa19b44810d6 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -104,6 +104,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "target.h"
 #include "ipa-prop.h"
 #include "bitmap.h"
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 9a4b528169af..aa3fd3b72f22 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "langhooks.h"
 #include "ggc.h"
 #include "target.h"
diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h
index 363d035b2cb4..4da22a1c05d2 100644
--- a/gcc/ipa-prop.h
+++ b/gcc/ipa-prop.h
@@ -20,10 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef IPA_PROP_H
 #define IPA_PROP_H
 
-#include "tree-core.h"
 #include "vec.h"
 #include "cgraph.h"
-#include "gimple.h"
 #include "alloc-pool.h"
 
 /* The following definitions and interfaces are used by
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index b3e137e10151..4aa2655577c2 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -41,6 +41,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "tree-inline.h"
 #include "tree-pass.h"
 #include "pointer-set.h"
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 3bec895180c3..1a974fa4b3e3 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -78,6 +78,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "target.h"
 #include "ipa-prop.h"
 #include "gimple-ssa.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index a99d3513129e..d33beec1188a 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "tree-inline.h"
 #include "dumpfile.h"
 #include "langhooks.h"
diff --git a/gcc/ipa-utils.h b/gcc/ipa-utils.h
index d2424f75e57c..cc72619348e9 100644
--- a/gcc/ipa-utils.h
+++ b/gcc/ipa-utils.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #ifndef GCC_IPA_UTILS_H
 #define GCC_IPA_UTILS_H
-#include "tree-core.h"
 #include "cgraph.h"
 
 struct ipa_dfs_info {
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 3d32fe4ffa55..e02fa9ed3016 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "expr.h"
 #include "flags.h"
 #include "params.h"
diff --git a/gcc/lto-compress.c b/gcc/lto-compress.c
index 238bb64574e4..3a67616cf8b2 100644
--- a/gcc/lto-compress.c
+++ b/gcc/lto-compress.c
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3.  If not see
 #include <zlib.h>
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "diagnostic-core.h"
 #include "langhooks.h"
 #include "lto-streamer.h"
diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c
index 4d9cdfd07eb3..0a63f89c8827 100644
--- a/gcc/lto-opts.c
+++ b/gcc/lto-opts.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "hashtab.h"
 #include "ggc.h"
 #include "vec.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index 2288e86d0a97..2d062e854d80 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "expr.h"
 #include "flags.h"
 #include "params.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index 37e9c4e3be05..4a2867376d5f 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "expr.h"
 #include "params.h"
 #include "input.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index 14d51ce766ee..1540e4c4be8a 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "flags.h"
 #include "tree.h"
+#include "gimple.h"
 #include "bitmap.h"
 #include "diagnostic-core.h"
 #include "vec.h"
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index de428928d1ea..86616d931bf9 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -25,8 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "plugin-api.h"
 #include "hash-table.h"
-#include "tree-core.h"
-#include "gimple.h"
 #include "target.h"
 #include "cgraph.h"
 #include "vec.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 6314ce0bba00..65ea3a39afed 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* lto/lto-object.c: Add gimple.h to include list.
+	* lto/lto-partition.c: Likewise.
+
 2013-10-18  Andrew MacLeod  <amacleod@redhat.com>
 
 	* lto.c: Remove tree-flow.h from include list.
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index 2f51952ef760..19f10ccb9783 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "diagnostic-core.h"
 #include "lto.h"
 #include "tm.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index e05f805fea44..e131d069b76f 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "toplev.h"
 #include "tree.h"
+#include "gimple.h"
 #include "tm.h"
 #include "cgraph.h"
 #include "lto-streamer.h"
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 8ce705ea6369..ba1bb4c11fd5 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "ggc.h"
 #include "tree.h" /* Required by langhooks.h.  */
+#include "gimple.h"
 #include "langhooks.h"
 #include "tm.h" /* Required by rtl.h.  */
 #include "rtl.h"
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 247a0d067018..b7b3516314b1 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "alias.h"
 #include "hashtab.h"
 #include "flags.h"
+#include "tree-core.h"
 
 /* Value used by some passes to "recognize" noop moves as valid
  instructions.  */
diff --git a/gcc/streamer-hooks.c b/gcc/streamer-hooks.c
index 86fc10b75b30..c4f8475ddd85 100644
--- a/gcc/streamer-hooks.c
+++ b/gcc/streamer-hooks.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "input.h"
 #include "streamer-hooks.h"
 
 /* Streamer hooks.  */
diff --git a/gcc/streamer-hooks.h b/gcc/streamer-hooks.h
index aeb86b911f22..afbe01326396 100644
--- a/gcc/streamer-hooks.h
+++ b/gcc/streamer-hooks.h
@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_STREAMER_HOOKS_H
 #define GCC_STREAMER_HOOKS_H
 
-#include "tree-core.h"
-
 /* Forward declarations to avoid including unnecessary headers.  */
 struct output_block;
 struct lto_input_block;
diff --git a/gcc/symtab.c b/gcc/symtab.c
index 62fe166bd61a..acffbdd6f654 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "gimple.h"
 #include "tree-inline.h"
 #include "langhooks.h"
 #include "hashtab.h"
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index 98a0c2ce9e82..1e982857e141 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -36,6 +36,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-ssanames.h"
 #include "dumpfile.h"
 #include "diagnostic-core.h"
+#include "tree-ssa-live.h"
+#include "tree-ssa-ter.h"
+#include "tree-ssa-coalesce.h"
 #include "tree-outof-ssa.h"
 
 /* FIXME: A lot of code here deals with expanding to RTL.  All that code
diff --git a/gcc/tree-outof-ssa.h b/gcc/tree-outof-ssa.h
index 8c37f55ce50c..69a329f8b2f4 100644
--- a/gcc/tree-outof-ssa.h
+++ b/gcc/tree-outof-ssa.h
@@ -21,9 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_TREE_OUTOF_SSA_H
 #define GCC_TREE_OUTOF_SSA_H
 
-#include "tree-ssa-live.h"
-#include "tree-ssa-ter.h"
-#include "tree-ssa-coalesce.h"
 
 /* This structure (of which only a singleton SA exists) is used to
    pass around information between the outof-SSA functions, cfgexpand
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index c92c7c5f4d53..c445c78626e2 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -33,7 +33,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "ssa-iterators.h"
 #include "tree-ssanames.h"
 #include "hash-table.h"
-#include "tree-outof-ssa.h"
+#include "tree-ssa-live.h"
+#include "tree-ssa-coalesce.h"
 #include "diagnostic-core.h"
 
 
diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index d45307725cc8..6090c5ff5f53 100644
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.c
@@ -32,6 +32,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "ssa-iterators.h"
 #include "tree-ssanames.h"
 #include "dumpfile.h"
+#include "tree-ssa-live.h"
+#include "tree-ssa-ter.h"
 #include "tree-outof-ssa.h"
 #include "flags.h"
 
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 70162f248f9d..92598e39941e 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "diagnostic.h"
 #include "tree.h"
+#include "gimple.h"
 #include "tree-streamer.h"
 #include "data-streamer.h"
 #include "streamer-hooks.h"
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 942ba1ee44fd..ea1a0546516d 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "diagnostic.h"
 #include "tree.h"
+#include "gimple.h"
 #include "tree-streamer.h"
 #include "data-streamer.h"
 #include "streamer-hooks.h"
diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c
index 55c9ad571f67..8534f4a9b8b4 100644
--- a/gcc/tree-streamer.c
+++ b/gcc/tree-streamer.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
+#include "gimple.h"
 #include "streamer-hooks.h"
 #include "tree-streamer.h"
 
-- 
2.39.5