From 442b4905f45e54b7265fe7356e7c7bb300b455f8 Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacleod@redhat.com>
Date: Wed, 23 Oct 2013 12:16:58 +0000
Subject: [PATCH] tree-ssa.h: Remove all #include's
* tree-ssa.h: Remove all #include's
* gengtype.c (open_base_files): Adjust include list for gtype-desc.c.
* alias.c: Move required includes from tree-ssa.h.
* asan.c: Likewise.
* builtins.c: Likewise.
* calls.c: Likewise.
* cfgexpand.c: Likewise.
* cfghooks.c: Likewise.
* cfgloop.c: Likewise.
* cfgloopmanip.c: Likewise.
* cgraph.c: Likewise.
* cgraphbuild.c: Likewise.
* cgraphclones.c: Likewise.
* cgraphunit.c: Likewise.
* dse.c: Likewise.
* except.c: Likewise.
* expr.c: Likewise.
* final.c: Likewise.
* fold-const.c: Likewise.
* ggc-page.c: Likewise.
* gimple-builder.c: Likewise.
* gimple-fold.c: Likewise.
* gimple-iterator.c: Likewise.
* gimple-low.c: Likewise.
* gimple-pretty-print.c: Likewise.
* gimple-ssa-strength-reduction.c: Likewise.
* gimple-streamer-in.c: Likewise.
* gimple-streamer-out.c: Likewise.
* gimplify.c: Likewise.
* graphite-blocking.c: Likewise.
* graphite-clast-to-gimple.c: Likewise.
* graphite-dependences.c: Likewise.
* graphite-interchange.c: Likewise.
* graphite-optimize-isl.c: Likewise.
* graphite-poly.c: Likewise.
* graphite-scop-detection.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* graphite.c: Likewise.
* ipa-cp.c: Likewise.
* ipa-inline-analysis.c: Likewise.
* ipa-inline-transform.c: Likewise.
* ipa-inline.c: Likewise.
* ipa-prop.c: Likewise.
* ipa-pure-const.c: Likewise.
* ipa-reference.c: Likewise.
* ipa-split.c: Likewise.
* ipa-utils.c: Likewise.
* loop-init.c: Likewise.
* lto-cgraph.c: Likewise.
* lto-section-in.c: Likewise.
* lto-section-out.c: Likewise.
* lto-streamer-in.c: Likewise.
* lto-streamer-out.c: Likewise.
* lto-streamer.c: Likewise.
* omp-low.c: Likewise.
* passes.c: Likewise.
* predict.c: Likewise.
* print-tree.c: Likewise.
* profile.c: Likewise.
* sese.c: Likewise.
* targhooks.c: Likewise.
* tracer.c: Likewise.
* trans-mem.c: Likewise.
* tree-call-cdce.c: Likewise.
* tree-cfg.c: Likewise.
* tree-cfgcleanup.c: Likewise.
* tree-chrec.c: Likewise.
* tree-complex.c: Likewise.
* tree-data-ref.c: Likewise.
* tree-dfa.c: Likewise.
* tree-eh.c: Likewise.
* tree-emutls.c: Likewise.
* tree-if-conv.c: Likewise.
* tree-inline.c: Likewise.
* tree-into-ssa.c: Likewise.
* tree-loop-distribution.c: Likewise.
* tree-mudflap.c: Likewise.
* tree-nested.c: Likewise.
* tree-nrv.c: Likewise.
* tree-object-size.c: Likewise.
* tree-outof-ssa.c: Likewise.
* tree-parloops.c: Likewise.
* tree-phinodes.c: Likewise.
* tree-predcom.c: Likewise.
* tree-pretty-print.c: Likewise.
* tree-profile.c: Likewise.
* tree-scalar-evolution.c: Likewise.
* tree-sra.c: Likewise.
* tree-ssa-address.c: Likewise.
* tree-ssa-alias.c: Likewise.
* tree-ssa-ccp.c: Likewise.
* tree-ssa-coalesce.c: Likewise.
* tree-ssa-copy.c: Likewise.
* tree-ssa-copyrename.c: Likewise.
* tree-ssa-dce.c: Likewise.
* tree-ssa-dom.c: Likewise.
* tree-ssa-dse.c: Likewise.
* tree-ssa-forwprop.c: Likewise.
* tree-ssa-ifcombine.c: Likewise.
* tree-ssa-live.c: Likewise.
* tree-ssa-loop-ch.c: Likewise.
* tree-ssa-loop-im.c: Likewise.
* tree-ssa-loop-ivcanon.c: Likewise.
* tree-ssa-loop-ivopts.c: Likewise.
* tree-ssa-loop-manip.c: Likewise.
* tree-ssa-loop-niter.c: Likewise.
* tree-ssa-loop-prefetch.c: Likewise.
* tree-ssa-loop-unswitch.c: Likewise.
* tree-ssa-loop.c: Likewise.
* tree-ssa-math-opts.c: Likewise.
* tree-ssa-operands.c: Likewise.
* tree-ssa-phiopt.c: Likewise.
* tree-ssa-phiprop.c: Likewise.
* tree-ssa-pre.c: Likewise.
* tree-ssa-propagate.c: Likewise.
* tree-ssa-reassoc.c: Likewise.
* tree-ssa-sccvn.c: Likewise.
* tree-ssa-sink.c: Likewise.
* tree-ssa-strlen.c: Likewise.
* tree-ssa-structalias.c: Likewise.
* tree-ssa-tail-merge.c: Likewise.
* tree-ssa-ter.c: Likewise.
* tree-ssa-threadedge.c: Likewise.
* tree-ssa-threadupdate.c: Likewise.
* tree-ssa-uncprop.c: Likewise.
* tree-ssa-uninit.c: Likewise.
* tree-ssa.c: Likewise.
* tree-ssanames.c: Likewise.
* tree-stdarg.c: Likewise.
* tree-streamer-in.c: Likewise.
* tree-switch-conversion.c: Likewise.
* tree-tailcall.c: Likewise.
* tree-vect-data-refs.c: Likewise.
* tree-vect-generic.c: Likewise.
* tree-vect-loop-manip.c: Likewise.
* tree-vect-loop.c: Likewise.
* tree-vect-patterns.c: Likewise.
* tree-vect-slp.c: Likewise.
* tree-vect-stmts.c: Likewise.
* tree-vectorizer.c: Likewise.
* tree-vrp.c: Likewise.
* tree.c: Likewise.
* tsan.c: Likewise.
* value-prof.c: Likewise.
* var-tracking.c: Likewise.
* varpool.c: Likewise.
* vtable-verify.c: Likewise.
From-SVN: r203967
---
gcc/ChangeLog | 150 ++++++++++++++++++++++++++++
gcc/alias.c | 4 +-
gcc/asan.c | 3 +-
gcc/builtins.c | 3 +-
gcc/calls.c | 1 -
gcc/cfgexpand.c | 10 +-
gcc/cfgloop.c | 3 +-
gcc/cfgloopmanip.c | 3 +-
gcc/cgraph.c | 3 +
gcc/cgraphbuild.c | 3 -
gcc/cgraphclones.c | 5 +-
gcc/cgraphunit.c | 6 +-
gcc/dse.c | 3 +-
gcc/except.c | 2 +-
gcc/expr.c | 5 +-
gcc/final.c | 2 +-
gcc/fold-const.c | 2 +-
gcc/gengtype.c | 5 +-
gcc/ggc-page.c | 2 +-
gcc/gimple-builder.c | 2 +-
gcc/gimple-fold.c | 6 ++
gcc/gimple-iterator.c | 5 +
gcc/gimple-low.c | 1 -
gcc/gimple-pretty-print.c | 8 +-
gcc/gimple-ssa-strength-reduction.c | 6 +-
gcc/gimple-streamer-in.c | 5 +-
gcc/gimple-streamer-out.c | 3 +-
gcc/gimplify.c | 6 +-
gcc/graphite-blocking.c | 3 +-
gcc/graphite-clast-to-gimple.c | 5 +-
gcc/graphite-dependences.c | 3 +-
gcc/graphite-interchange.c | 3 +-
gcc/graphite-optimize-isl.c | 3 +-
gcc/graphite-poly.c | 3 +-
gcc/graphite-scop-detection.c | 6 ++
gcc/graphite-sese-to-poly.c | 9 +-
gcc/graphite.c | 4 +-
gcc/ipa-cp.c | 4 +-
gcc/ipa-inline-analysis.c | 9 +-
gcc/ipa-inline-transform.c | 3 +-
gcc/ipa-inline.c | 5 +-
gcc/ipa-prop.c | 10 +-
gcc/ipa-pure-const.c | 6 +-
gcc/ipa-reference.c | 3 -
gcc/ipa-split.c | 9 +-
gcc/ipa-utils.c | 3 -
gcc/loop-init.c | 3 +-
gcc/lto-cgraph.c | 3 +-
gcc/lto-section-in.c | 2 -
gcc/lto-section-out.c | 3 -
gcc/lto-streamer-in.c | 7 +-
gcc/lto-streamer-out.c | 5 +-
gcc/lto-streamer.c | 4 +-
gcc/omp-low.c | 8 ++
gcc/passes.c | 8 +-
gcc/predict.c | 8 +-
gcc/print-tree.c | 3 +-
gcc/profile.c | 3 +-
gcc/sese.c | 9 +-
gcc/targhooks.c | 3 +-
gcc/tracer.c | 2 +
gcc/trans-mem.c | 6 +-
gcc/tree-call-cdce.c | 5 +-
gcc/tree-cfg.c | 10 ++
gcc/tree-cfgcleanup.c | 8 ++
gcc/tree-chrec.c | 3 +-
gcc/tree-complex.c | 8 +-
gcc/tree-data-ref.c | 2 +
gcc/tree-dfa.c | 7 +-
gcc/tree-eh.c | 9 +-
gcc/tree-emutls.c | 5 +-
gcc/tree-if-conv.c | 7 ++
gcc/tree-inline.c | 11 +-
gcc/tree-into-ssa.c | 10 +-
gcc/tree-loop-distribution.c | 8 ++
gcc/tree-mudflap.c | 5 +-
gcc/tree-nested.c | 3 +-
gcc/tree-nrv.c | 4 +-
gcc/tree-object-size.c | 5 +-
gcc/tree-outof-ssa.c | 7 +-
gcc/tree-parloops.c | 9 +-
gcc/tree-phinodes.c | 6 +-
gcc/tree-predcom.c | 8 ++
gcc/tree-pretty-print.c | 3 +-
gcc/tree-profile.c | 8 +-
gcc/tree-scalar-evolution.c | 6 ++
gcc/tree-sra.c | 8 +-
gcc/tree-ssa-address.c | 5 +-
gcc/tree-ssa-alias.c | 5 +-
gcc/tree-ssa-ccp.c | 7 +-
gcc/tree-ssa-coalesce.c | 6 +-
gcc/tree-ssa-copy.c | 7 +-
gcc/tree-ssa-copyrename.c | 5 +-
gcc/tree-ssa-dce.c | 9 +-
gcc/tree-ssa-dom.c | 8 +-
gcc/tree-ssa-dse.c | 9 +-
gcc/tree-ssa-forwprop.c | 9 +-
gcc/tree-ssa-ifcombine.c | 6 +-
gcc/tree-ssa-live.c | 8 +-
gcc/tree-ssa-loop-ch.c | 5 +-
gcc/tree-ssa-loop-im.c | 9 +-
gcc/tree-ssa-loop-ivcanon.c | 10 +-
gcc/tree-ssa-loop-ivopts.c | 9 ++
gcc/tree-ssa-loop-manip.c | 8 ++
gcc/tree-ssa-loop-niter.c | 7 +-
gcc/tree-ssa-loop-prefetch.c | 5 +-
gcc/tree-ssa-loop-unswitch.c | 8 +-
gcc/tree-ssa-loop.c | 3 +-
gcc/tree-ssa-math-opts.c | 7 ++
gcc/tree-ssa-operands.c | 7 +-
gcc/tree-ssa-phiopt.c | 8 +-
gcc/tree-ssa-phiprop.c | 6 +-
gcc/tree-ssa-pre.c | 11 +-
gcc/tree-ssa-propagate.c | 7 +-
gcc/tree-ssa-reassoc.c | 9 +-
gcc/tree-ssa-sccvn.c | 8 +-
gcc/tree-ssa-sink.c | 6 +-
gcc/tree-ssa-strlen.c | 8 +-
gcc/tree-ssa-structalias.c | 10 +-
gcc/tree-ssa-tail-merge.c | 8 +-
gcc/tree-ssa-ter.c | 6 +-
gcc/tree-ssa-threadedge.c | 7 +-
gcc/tree-ssa-threadupdate.c | 3 +
gcc/tree-ssa-uncprop.c | 6 +-
gcc/tree-ssa-uninit.c | 5 +-
gcc/tree-ssa.c | 9 +-
gcc/tree-ssa.h | 12 ---
gcc/tree-ssanames.c | 6 ++
gcc/tree-stdarg.c | 7 +-
gcc/tree-streamer-in.c | 1 -
gcc/tree-switch-conversion.c | 7 +-
gcc/tree-tailcall.c | 8 +-
gcc/tree-vect-data-refs.c | 7 +-
gcc/tree-vect-generic.c | 4 +-
gcc/tree-vect-loop-manip.c | 8 ++
gcc/tree-vect-loop.c | 7 +-
gcc/tree-vect-patterns.c | 6 +-
gcc/tree-vect-slp.c | 6 +-
gcc/tree-vect-stmts.c | 8 +-
gcc/tree-vectorizer.c | 7 +-
gcc/tree-vrp.c | 8 ++
gcc/tree.c | 9 +-
gcc/tsan.c | 6 +-
gcc/value-prof.c | 8 +-
gcc/var-tracking.c | 2 +
gcc/varpool.c | 1 -
gcc/vtable-verify.c | 6 +-
147 files changed, 817 insertions(+), 186 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 57c7406e4546..635dc545ffd8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,153 @@
+2013-10-23 Andrew MacLeod <amacleod@redhat.com>
+
+ * tree-ssa.h: Remove all #include's
+ * gengtype.c (open_base_files): Adjust include list for gtype-desc.c.
+ * alias.c: Move required includes from tree-ssa.h.
+ * asan.c: Likewise.
+ * builtins.c: Likewise.
+ * calls.c: Likewise.
+ * cfgexpand.c: Likewise.
+ * cfghooks.c: Likewise.
+ * cfgloop.c: Likewise.
+ * cfgloopmanip.c: Likewise.
+ * cgraph.c: Likewise.
+ * cgraphbuild.c: Likewise.
+ * cgraphclones.c: Likewise.
+ * cgraphunit.c: Likewise.
+ * dse.c: Likewise.
+ * except.c: Likewise.
+ * expr.c: Likewise.
+ * final.c: Likewise.
+ * fold-const.c: Likewise.
+ * ggc-page.c: Likewise.
+ * gimple-builder.c: Likewise.
+ * gimple-fold.c: Likewise.
+ * gimple-iterator.c: Likewise.
+ * gimple-low.c: Likewise.
+ * gimple-pretty-print.c: Likewise.
+ * gimple-ssa-strength-reduction.c: Likewise.
+ * gimple-streamer-in.c: Likewise.
+ * gimple-streamer-out.c: Likewise.
+ * gimplify.c: Likewise.
+ * graphite-blocking.c: Likewise.
+ * graphite-clast-to-gimple.c: Likewise.
+ * graphite-dependences.c: Likewise.
+ * graphite-interchange.c: Likewise.
+ * graphite-optimize-isl.c: Likewise.
+ * graphite-poly.c: Likewise.
+ * graphite-scop-detection.c: Likewise.
+ * graphite-sese-to-poly.c: Likewise.
+ * graphite.c: Likewise.
+ * ipa-cp.c: Likewise.
+ * ipa-inline-analysis.c: Likewise.
+ * ipa-inline-transform.c: Likewise.
+ * ipa-inline.c: Likewise.
+ * ipa-prop.c: Likewise.
+ * ipa-pure-const.c: Likewise.
+ * ipa-reference.c: Likewise.
+ * ipa-split.c: Likewise.
+ * ipa-utils.c: Likewise.
+ * loop-init.c: Likewise.
+ * lto-cgraph.c: Likewise.
+ * lto-section-in.c: Likewise.
+ * lto-section-out.c: Likewise.
+ * lto-streamer-in.c: Likewise.
+ * lto-streamer-out.c: Likewise.
+ * lto-streamer.c: Likewise.
+ * omp-low.c: Likewise.
+ * passes.c: Likewise.
+ * predict.c: Likewise.
+ * print-tree.c: Likewise.
+ * profile.c: Likewise.
+ * sese.c: Likewise.
+ * targhooks.c: Likewise.
+ * tracer.c: Likewise.
+ * trans-mem.c: Likewise.
+ * tree-call-cdce.c: Likewise.
+ * tree-cfg.c: Likewise.
+ * tree-cfgcleanup.c: Likewise.
+ * tree-chrec.c: Likewise.
+ * tree-complex.c: Likewise.
+ * tree-data-ref.c: Likewise.
+ * tree-dfa.c: Likewise.
+ * tree-eh.c: Likewise.
+ * tree-emutls.c: Likewise.
+ * tree-if-conv.c: Likewise.
+ * tree-inline.c: Likewise.
+ * tree-into-ssa.c: Likewise.
+ * tree-loop-distribution.c: Likewise.
+ * tree-mudflap.c: Likewise.
+ * tree-nested.c: Likewise.
+ * tree-nrv.c: Likewise.
+ * tree-object-size.c: Likewise.
+ * tree-outof-ssa.c: Likewise.
+ * tree-parloops.c: Likewise.
+ * tree-phinodes.c: Likewise.
+ * tree-predcom.c: Likewise.
+ * tree-pretty-print.c: Likewise.
+ * tree-profile.c: Likewise.
+ * tree-scalar-evolution.c: Likewise.
+ * tree-sra.c: Likewise.
+ * tree-ssa-address.c: Likewise.
+ * tree-ssa-alias.c: Likewise.
+ * tree-ssa-ccp.c: Likewise.
+ * tree-ssa-coalesce.c: Likewise.
+ * tree-ssa-copy.c: Likewise.
+ * tree-ssa-copyrename.c: Likewise.
+ * tree-ssa-dce.c: Likewise.
+ * tree-ssa-dom.c: Likewise.
+ * tree-ssa-dse.c: Likewise.
+ * tree-ssa-forwprop.c: Likewise.
+ * tree-ssa-ifcombine.c: Likewise.
+ * tree-ssa-live.c: Likewise.
+ * tree-ssa-loop-ch.c: Likewise.
+ * tree-ssa-loop-im.c: Likewise.
+ * tree-ssa-loop-ivcanon.c: Likewise.
+ * tree-ssa-loop-ivopts.c: Likewise.
+ * tree-ssa-loop-manip.c: Likewise.
+ * tree-ssa-loop-niter.c: Likewise.
+ * tree-ssa-loop-prefetch.c: Likewise.
+ * tree-ssa-loop-unswitch.c: Likewise.
+ * tree-ssa-loop.c: Likewise.
+ * tree-ssa-math-opts.c: Likewise.
+ * tree-ssa-operands.c: Likewise.
+ * tree-ssa-phiopt.c: Likewise.
+ * tree-ssa-phiprop.c: Likewise.
+ * tree-ssa-pre.c: Likewise.
+ * tree-ssa-propagate.c: Likewise.
+ * tree-ssa-reassoc.c: Likewise.
+ * tree-ssa-sccvn.c: Likewise.
+ * tree-ssa-sink.c: Likewise.
+ * tree-ssa-strlen.c: Likewise.
+ * tree-ssa-structalias.c: Likewise.
+ * tree-ssa-tail-merge.c: Likewise.
+ * tree-ssa-ter.c: Likewise.
+ * tree-ssa-threadedge.c: Likewise.
+ * tree-ssa-threadupdate.c: Likewise.
+ * tree-ssa-uncprop.c: Likewise.
+ * tree-ssa-uninit.c: Likewise.
+ * tree-ssa.c: Likewise.
+ * tree-ssanames.c: Likewise.
+ * tree-stdarg.c: Likewise.
+ * tree-streamer-in.c: Likewise.
+ * tree-switch-conversion.c: Likewise.
+ * tree-tailcall.c: Likewise.
+ * tree-vect-data-refs.c: Likewise.
+ * tree-vect-generic.c: Likewise.
+ * tree-vect-loop-manip.c: Likewise.
+ * tree-vect-loop.c: Likewise.
+ * tree-vect-patterns.c: Likewise.
+ * tree-vect-slp.c: Likewise.
+ * tree-vect-stmts.c: Likewise.
+ * tree-vectorizer.c: Likewise.
+ * tree-vrp.c: Likewise.
+ * tree.c: Likewise.
+ * tsan.c: Likewise.
+ * value-prof.c: Likewise.
+ * var-tracking.c: Likewise.
+ * varpool.c: Likewise.
+ * vtable-verify.c: Likewise.
+
2013-10-23 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* config/tilegx/tilegx.c: Include "tree.h".
diff --git a/gcc/alias.c b/gcc/alias.c
index a48bb51ed962..0f9ae73e3d26 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -40,11 +40,11 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "dumpfile.h"
#include "target.h"
-#include "cgraph.h"
#include "df.h"
#include "tree-ssa-alias.h"
#include "pointer-set.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
/* The aliasing API provided here solves related but different problems:
diff --git a/gcc/asan.c b/gcc/asan.c
index a5978df42143..6f3c0b894c8f 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -25,7 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "gimple.h"
#include "tree-iterator.h"
-#include "tree-ssa.h"
+#include "cgraph.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "asan.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 5df5c548bd73..df6f4af3d8a0 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -43,7 +43,8 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "langhooks.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "value-prof.h"
#include "diagnostic-core.h"
#include "builtins.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index e25f2ab74f0b..c04ed32801fb 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "except.h"
#include "dbgcnt.h"
-#include "tree-ssa.h"
/* Like PREFERRED_STACK_BOUNDARY but in units of bytes, not bits. */
#define STACK_BYTES (PREFERRED_STACK_BOUNDARY / BITS_PER_UNIT)
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 5a78bb68b35a..ba4c0e66e766 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -28,6 +28,15 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "expr.h"
#include "langhooks.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "except.h"
@@ -41,7 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "value-prof.h"
#include "target.h"
#include "tree-outof-ssa.h"
-#include "bitmap.h"
#include "sbitmap.h"
#include "cfgloop.h"
#include "regs.h" /* For reg_renumber. */
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index 3babf777fae7..3ff8e841bac0 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -28,7 +28,8 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "flags.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
#include "pointer-set.h"
#include "ggc.h"
#include "dumpfile.h"
diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c
index cf9a7fc6ee9d..3715644a6237 100644
--- a/gcc/cfgloopmanip.c
+++ b/gcc/cfgloopmanip.c
@@ -25,7 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "cfgloop.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "dumpfile.h"
static void copy_loops_to (struct loop **, int,
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 6ebd0c71e026..d05d14b7954b 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -42,6 +42,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "timevar.h"
#include "dumpfile.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
#include "tree-ssa.h"
#include "value-prof.h"
#include "except.h"
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index 1b73a144f082..be2d79eeabfa 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "tree-ssa.h"
#include "langhooks.h"
#include "pointer-set.h"
-#include "cgraph.h"
#include "intl.h"
-#include "gimple.h"
#include "tree-pass.h"
#include "ipa-utils.h"
#include "except.h"
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index cad10a7dcb0a..800dd2c57a5c 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -70,7 +70,8 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "rtl.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "tree-cfg.h"
#include "tree-inline.h"
#include "langhooks.h"
#include "pointer-set.h"
@@ -79,13 +80,11 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "debug.h"
#include "target.h"
-#include "cgraph.h"
#include "diagnostic.h"
#include "params.h"
#include "intl.h"
#include "function.h"
#include "ipa-prop.h"
-#include "gimple.h"
#include "tree-iterator.h"
#include "tree-dump.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index e01918cfbd49..820e618c8956 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -164,6 +164,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "output.h"
#include "rtl.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-inline.h"
#include "langhooks.h"
@@ -173,14 +177,12 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "debug.h"
#include "target.h"
-#include "cgraph.h"
#include "diagnostic.h"
#include "params.h"
#include "fibheap.h"
#include "intl.h"
#include "function.h"
#include "ipa-prop.h"
-#include "gimple.h"
#include "tree-iterator.h"
#include "tree-pass.h"
#include "tree-dump.h"
diff --git a/gcc/dse.c b/gcc/dse.c
index 1d04a2525837..b602caa291ff 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -46,7 +46,8 @@ along with GCC; see the file COPYING3. If not see
#include "dbgcnt.h"
#include "target.h"
#include "params.h"
-#include "tree-ssa.h" /* for may_be_aliased */
+#include "gimple.h"
+#include "gimple-ssa.h"
/* This file contains three techniques for performing Dead Store
Elimination (dse).
diff --git a/gcc/except.c b/gcc/except.c
index fb47fbb06cb1..a52d317ddae9 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -139,7 +139,7 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-pass.h"
-#include "tree-ssa.h"
+#include "gimple.h"
#include "cfgloop.h"
/* Provide defaults for stuff that may not be defined when using
diff --git a/gcc/expr.c b/gcc/expr.c
index e672e454219b..54f22468400a 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -43,7 +43,10 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "tm_p.h"
#include "tree-iterator.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-ssanames.h"
#include "target.h"
#include "common/common-target.h"
#include "timevar.h"
diff --git a/gcc/final.c b/gcc/final.c
index 641ebe48eee5..efefe1a8ee55 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -70,8 +70,8 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "expr.h"
#include "tree-pass.h"
-#include "tree-ssa.h"
#include "cgraph.h"
+#include "tree-ssa.h"
#include "coverage.h"
#include "df.h"
#include "ggc.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 021d670acf07..c346063f925d 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -58,7 +58,7 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "md5.h"
#include "gimple.h"
-#include "tree-ssa.h"
+#include "tree-dfa.h"
/* Nonzero if we are folding constants inside an initializer; zero
otherwise. */
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index b9bef4df76c1..85be41bf0fc5 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -1736,8 +1736,11 @@ open_base_files (void)
"tree.h", "rtl.h", "function.h", "insn-config.h", "expr.h",
"hard-reg-set.h", "basic-block.h", "cselib.h", "insn-addr.h",
"optabs.h", "libfuncs.h", "debug.h", "ggc.h", "cgraph.h",
+ "gimple.h", "gimple-ssa.h", "tree-cfg.h", "tree-phinodes.h",
+ "ssa-iterators.h", "tree-ssanames.h", "tree-ssa-loop.h",
+ "tree-into-ssa.h", "tree-dfa.h",
"tree-ssa.h", "reload.h", "cpp-id-data.h", "tree-chrec.h",
- "except.h", "output.h", "gimple.h", "cfgloop.h",
+ "except.h", "output.h", "cfgloop.h",
"target.h", "ipa-prop.h", "lto-streamer.h", "target-globals.h",
"ipa-inline.h", "dwarf2out.h", NULL
};
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 249aa0105077..f68129e4da6e 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -30,7 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include "ggc-internal.h"
#include "timevar.h"
#include "params.h"
-#include "tree-ssa.h"
+#include "cgraph.h"
#include "cfgloop.h"
#include "plugin.h"
diff --git a/gcc/gimple-builder.c b/gcc/gimple-builder.c
index 665c8020b93e..6b53221b6b3f 100644
--- a/gcc/gimple-builder.c
+++ b/gcc/gimple-builder.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "gimple.h"
-#include "tree-ssa.h"
+#include "tree-ssanames.h"
/* Return the expression type to use based on the CODE and type of
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index d1349588fbdf..1d6ca6c47aae 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -26,6 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "function.h"
#include "dumpfile.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-ssa-propagate.h"
#include "target.h"
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index 574e31f298f8..e430050fcf76 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -24,6 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
#include "tree-ssa.h"
#include "value-prof.h"
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index cf61204c411a..d527d86ab22c 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "tree-iterator.h"
#include "tree-inline.h"
-#include "tree-ssa.h"
#include "flags.h"
#include "function.h"
#include "diagnostic-core.h"
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index 439851b5831c..e4b0f81481d2 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -27,9 +27,13 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "hashtab.h"
-#include "tree-ssa.h"
-#include "dumpfile.h" /* for dump_flags */
+#include "bitmap.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
+#include "dumpfile.h" /* for dump_flags */
#include "value-prof.h"
#include "trans-mem.h"
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index 2b5e69f77251..88afc91200fa 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -42,7 +42,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "cfgloop.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "domwalk.h"
#include "pointer-set.h"
#include "expmed.h"
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index 8161a0876562..2a19aab44fe7 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -24,7 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "tree-ssanames.h"
#include "data-streamer.h"
#include "tree-streamer.h"
#include "gimple-streamer.h"
diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c
index 33699bbbfa90..976f57ecef43 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@@ -23,7 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
#include "data-streamer.h"
#include "gimple-streamer.h"
#include "lto-streamer.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 193e0170178e..fa1b15500760 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -30,8 +30,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-pretty-print.h"
#include "langhooks.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple-ssa.h"
#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
+#include "tree-ssa.h"
#include "timevar.h"
#include "hashtab.h"
#include "flags.h"
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index 491c815c9e59..1fff36c53bc7 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -35,7 +35,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "dumpfile.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
index 7db4da6eac29..de513e5de3a6 100644
--- a/gcc/graphite-clast-to-gimple.c
+++ b/gcc/graphite-clast-to-gimple.c
@@ -36,7 +36,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index a561d2517a63..545881bc0ac5 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -34,7 +34,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "tree-pass.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index 060ec8fda2fa..36e1b55757db 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -36,7 +36,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "dumpfile.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index 856402f6235b..d039c1b74e1a 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -33,7 +33,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "dumpfile.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index e1a4207daa89..2749555c3710 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -36,7 +36,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "dumpfile.h"
#include "gimple-pretty-print.h"
#include "cfgloop.h"
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index d7266f8c3f5c..82be45331848 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -32,6 +32,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 70e01260efd4..92536814a62f 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -34,7 +34,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/graphite.c b/gcc/graphite.c
index cb8cc7ecd478..176c47c980ed 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-cfg.h"
+#include "tree-ssa-loop.h"
#include "tree-dump.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 54afbfc22e17..57ec2dbd98a2 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -105,10 +105,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "target.h"
-#include "gimple.h"
-#include "cgraph.h"
#include "ipa-prop.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
#include "tree-pass.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 304f9f5d7cc8..fa2aaadf776a 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -72,14 +72,19 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "langhooks.h"
#include "flags.h"
-#include "cgraph.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "params.h"
#include "tree-pass.h"
#include "coverage.h"
#include "ggc.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
#include "ipa-prop.h"
#include "lto-streamer.h"
#include "data-streamer.h"
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index d8a637cb8504..fb5c5541611d 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -34,11 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "langhooks.h"
-#include "cgraph.h"
#include "intl.h"
#include "coverage.h"
#include "ggc.h"
-#include "tree-ssa.h"
+#include "tree-cfg.h"
#include "ipa-prop.h"
#include "ipa-inline.h"
#include "tree-inline.h"
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 26c410ba39c7..3046b6087dad 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -97,7 +97,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "langhooks.h"
#include "flags.h"
-#include "cgraph.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "params.h"
@@ -107,7 +106,9 @@ along with GCC; see the file COPYING3. If not see
#include "coverage.h"
#include "ggc.h"
#include "rtl.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
#include "ipa-prop.h"
#include "except.h"
#include "target.h"
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 7ec3c49e42fe..9a4b528169af 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -24,13 +24,17 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "ggc.h"
#include "target.h"
-#include "cgraph.h"
#include "ipa-prop.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-pass.h"
#include "tree-inline.h"
#include "ipa-inline.h"
-#include "gimple.h"
#include "flags.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 85e5736d770e..9b99ee4a6171 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -36,15 +36,15 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-cfg.h"
+#include "tree-ssa-loop.h"
#include "tree-inline.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "pointer-set.h"
#include "ggc.h"
#include "ipa-utils.h"
-#include "gimple.h"
-#include "cgraph.h"
#include "flags.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index d9463804ea2c..b3e137e10151 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -41,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "tree-ssa.h"
#include "tree-inline.h"
#include "tree-pass.h"
#include "pointer-set.h"
@@ -49,8 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "ipa-utils.h"
#include "ipa-reference.h"
-#include "gimple.h"
-#include "cgraph.h"
#include "flags.h"
#include "diagnostic.h"
#include "data-streamer.h"
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 874e7b835423..3bec895180c3 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -79,9 +79,14 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "target.h"
-#include "cgraph.h"
#include "ipa-prop.h"
-#include "tree-ssa.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-pass.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index 5802884afdf6..a99d3513129e 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "tree-ssa.h"
#include "tree-inline.h"
#include "dumpfile.h"
#include "langhooks.h"
@@ -32,8 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "ipa-utils.h"
#include "ipa-reference.h"
-#include "gimple.h"
-#include "cgraph.h"
#include "flags.h"
#include "diagnostic.h"
#include "langhooks.h"
diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index b381745aba31..f4251fcc4835 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -31,7 +31,8 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "df.h"
#include "ggc.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
/* Apply FLAGS to the loop state. */
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 211eda972690..3d32fe4ffa55 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -32,8 +32,7 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "langhooks.h"
#include "basic-block.h"
-#include "tree-ssa.h"
-#include "cgraph.h"
+#include "bitmap.h"
#include "function.h"
#include "ggc.h"
#include "diagnostic-core.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index d96cdb475485..2288e86d0a97 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -30,8 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "hashtab.h"
#include "basic-block.h"
-#include "tree-ssa.h"
-#include "cgraph.h"
#include "function.h"
#include "ggc.h"
#include "diagnostic-core.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index 59eed7166304..37e9c4e3be05 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -29,14 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "hashtab.h"
#include "basic-block.h"
-#include "tree-ssa.h"
-#include "cgraph.h"
#include "function.h"
#include "ggc.h"
#include "except.h"
#include "vec.h"
#include "pointer-set.h"
-#include "bitmap.h"
#include "langhooks.h"
#include "data-streamer.h"
#include "lto-streamer.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 72d450ca9d9b..7b27b972ea68 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -32,9 +32,14 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "hashtab.h"
#include "basic-block.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
-#include "cgraph.h"
#include "function.h"
#include "ggc.h"
#include "diagnostic.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 35ad1cf0c80b..4970d173455c 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -31,9 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "hashtab.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
-#include "cgraph.h"
#include "function.h"
#include "ggc.h"
#include "diagnostic-core.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index f1d3b69127d1..14d51ce766ee 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -27,10 +27,8 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "flags.h"
#include "tree.h"
-#include "gimple.h"
-#include "tree-ssa.h"
-#include "diagnostic-core.h"
#include "bitmap.h"
+#include "diagnostic-core.h"
#include "vec.h"
#include "tree-streamer.h"
#include "lto-streamer.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 3326e9ecf0cf..a5b92107a1d5 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "langhooks.h"
#include "diagnostic-core.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "flags.h"
#include "function.h"
diff --git a/gcc/passes.c b/gcc/passes.c
index 95fc66694408..f92057bdbc84 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -56,11 +56,17 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "cfgloop.h"
#include "hosthooks.h"
-#include "cgraph.h"
#include "opts.h"
#include "coverage.h"
#include "value-prof.h"
#include "tree-inline.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "tree-dump.h"
diff --git a/gcc/predict.c b/gcc/predict.c
index 2f1cb89c4aba..04478c226aea 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -50,7 +50,13 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "target.h"
#include "cfgloop.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssa-loop.h"
#include "ggc.h"
#include "tree-pass.h"
#include "tree-scalar-evolution.h"
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 2b9aa704becb..e5d6664c2292 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -28,7 +28,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h" /* FIXME */
-#include "tree-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
#include "tree-dump.h"
#include "dumpfile.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index edc202cf767a..7118ac8ac292 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -61,7 +61,8 @@ along with GCC; see the file COPYING3. If not see
#include "coverage.h"
#include "value-prof.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-cfg.h"
#include "cfgloop.h"
#include "dumpfile.h"
diff --git a/gcc/sese.c b/gcc/sese.c
index a78a79677725..1daf45762588 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -25,7 +25,14 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "tree.h"
#include "tree-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "cfgloop.h"
#include "tree-chrec.h"
#include "tree-data-ref.h"
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index ec73a6406d29..2504436ecf10 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -68,7 +68,8 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "intl.h"
#include "opts.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssanames.h"
#include "tree-ssa-alias.h"
#include "insn-codes.h"
diff --git a/gcc/tracer.c b/gcc/tracer.c
index 57055662ea54..86557febab7d 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -46,6 +46,8 @@
#include "params.h"
#include "coverage.h"
#include "tree-pass.h"
+#include "gimple.h"
+#include "tree-cfg.h"
#include "tree-ssa.h"
#include "tree-inline.h"
#include "cfgloop.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 037cbcef7436..e8abad81c13d 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -23,7 +23,11 @@
#include "hash-table.h"
#include "tree.h"
#include "gimple.h"
-#include "tree-ssa.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "tree-inline.h"
#include "diagnostic-core.h"
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index c38f694a5db0..578b21118d20 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -25,8 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "tree.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "flags.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 3a1319132d56..6091561bfbd2 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -30,6 +30,16 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "ggc.h"
#include "gimple-pretty-print.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-dump.h"
#include "tree-pass.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 830cdf36b6b9..844687a53297 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -29,6 +29,14 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "ggc.h"
#include "langhooks.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "except.h"
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index 64f2dcb13bfc..af46b38b6339 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -29,7 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tree-pretty-print.h"
#include "cfgloop.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "tree-chrec.h"
#include "dumpfile.h"
#include "params.h"
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index 7d9b696d9a88..6439402ba758 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.c
@@ -23,8 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "flags.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
+#include "tree-ssa.h"
#include "tree-iterator.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 9133df4a2b75..39cc8573fb1a 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -78,6 +78,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "gimple-pretty-print.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "tree-ssa.h"
#include "cfgloop.h"
#include "tree-data-ref.h"
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index bc825be82324..238438e5a9b7 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -33,12 +33,15 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "tree-pretty-print.h"
#include "gimple.h"
-#include "tree-ssa.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-inline.h"
#include "tree-pass.h"
#include "convert.h"
#include "params.h"
-#include "cgraph.h"
/* Build and maintain data flow information for trees. */
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 9c7817d42e25..cee178a4a97d 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -27,13 +27,20 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "except.h"
#include "pointer-set.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-inline.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "ggc.h"
#include "diagnostic-core.h"
-#include "gimple.h"
#include "target.h"
#include "cfgloop.h"
#include "gimple-low.h"
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index 735929539128..f85be89791e8 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -23,8 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "gimple.h"
#include "tree-pass.h"
-#include "tree-ssa.h"
+#include "gimple-ssa.h"
#include "cgraph.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "langhooks.h"
#include "target.h"
#include "targhooks.h"
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index b487381e4be9..feb51deb882b 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -88,6 +88,13 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 2221b9c54869..88523116920b 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -33,12 +33,18 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "basic-block.h"
#include "tree-iterator.h"
-#include "cgraph.h"
#include "intl.h"
#include "tree-mudflap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "function.h"
-#include "tree-ssa.h"
#include "tree-pretty-print.h"
#include "except.h"
#include "debug.h"
@@ -53,7 +59,6 @@ along with GCC; see the file COPYING3. If not see
/* I'm not real happy about this, but we need to handle gimple and
non-gimple trees. */
-#include "gimple.h"
/* Inlining, Cloning, Versioning, Parallelization
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 5a04ee7924fa..981e9f4bfb4b 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -29,9 +29,15 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
+#include "tree-ssa.h"
#include "tree-inline.h"
#include "hash-table.h"
#include "tree-pass.h"
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 9b6936d32146..246314d4ea7f 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -45,6 +45,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c
index 4c0d71d757bd..a1503118af84 100644
--- a/gcc/tree-mudflap.c
+++ b/gcc/tree-mudflap.c
@@ -32,7 +32,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "gimple.h"
#include "tree-iterator.h"
-#include "tree-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
#include "tree-mudflap.h"
#include "tree-pass.h"
#include "hashtab.h"
@@ -40,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "demangle.h"
#include "langhooks.h"
#include "ggc.h"
-#include "cgraph.h"
-#include "gimple.h"
#include "tree-ssa-address.h"
extern void add_bb_to_loop (basic_block, struct loop *);
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index b0922f6aabdd..0d5677982458 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -28,8 +28,9 @@
#include "tree-inline.h"
#include "gimple.h"
#include "tree-iterator.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
#include "cgraph.h"
+#include "tree-cfg.h"
#include "expr.h" /* FIXME: For STACK_SAVEAREA_MODE and SAVE_NONLOCAL. */
#include "langhooks.h"
#include "pointer-set.h"
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 1fec697589ca..1425d1952520 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -25,7 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "basic-block.h"
#include "tree-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "flags.h" /* For "optimize" in gate_pass_return_slot.
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index 0bdbc489f8ca..2d7ebfd764f0 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -25,7 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "diagnostic-core.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index f732e09d6fe7..98a0c2ce9e82 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -28,7 +28,12 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "bitmap.h"
#include "sbitmap.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "dumpfile.h"
#include "diagnostic-core.h"
#include "tree-outof-ssa.h"
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index 1119310c522a..9e447f0b7907 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -23,7 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "cfgloop.h"
#include "tree-data-ref.h"
#include "tree-scalar-evolution.h"
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index f96dafa476c9..2cef1c4ab232 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -24,9 +24,13 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "ggc.h"
#include "basic-block.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-ssa.h"
#include "diagnostic-core.h"
-#include "gimple.h"
/* Rewriting a function into SSA form can create a huge number of PHIs
many of which may be thrown away shortly after their creation if jumps
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index ba3e1318e7b7..d180535dd4dc 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -191,6 +191,14 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tm_p.h"
#include "cfgloop.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "ggc.h"
#include "tree-data-ref.h"
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index f8a0342f9441..b3bd8faa76fb 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -25,7 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tree-pretty-print.h"
#include "hashtab.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "cgraph.h"
#include "langhooks.h"
#include "tree-iterator.h"
#include "tree-chrec.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index d5713ac65213..8a3039725ecd 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -34,10 +34,14 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "coverage.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "value-prof.h"
-#include "cgraph.h"
#include "profile.h"
#include "target.h"
#include "tree-cfgcleanup.h"
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 16d9d7d4b230..7ccf7d619119 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -259,6 +259,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "hash-table.h"
#include "gimple-pretty-print.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
#include "tree-ssa.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 82520bafcdbe..6feb8fb81345 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -79,7 +79,13 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "gimple.h"
-#include "cgraph.h"
+#include "bitmap.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "ipa-prop.h"
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index 49b69b82da3b..97d5c3bca747 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -28,7 +28,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "tree-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-dfa.h"
#include "dumpfile.h"
#include "flags.h"
#include "tree-inline.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 605377e6feb8..2fdd3d77aebc 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -34,11 +34,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "dumpfile.h"
#include "gimple.h"
-#include "tree-ssa.h"
+#include "gimple-ssa.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-inline.h"
#include "params.h"
#include "vec.h"
-#include "bitmap.h"
#include "pointer-set.h"
#include "alloc-pool.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 15df8da7a3f2..d30bd8b2493f 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -119,7 +119,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
#include "value-prof.h"
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index 2f5507ca8fca..c92c7c5f4d53 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -27,7 +27,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "bitmap.h"
#include "dumpfile.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "hash-table.h"
#include "tree-outof-ssa.h"
#include "diagnostic-core.h"
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index 4ec941bcbf0b..15c6896e9451 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -27,7 +27,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
#include "langhooks.h"
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index d8660c56e620..30b339def7d2 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -29,8 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "tree-pretty-print.h"
#include "bitmap.h"
-#include "tree-ssa.h"
-#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-inline.h"
#include "hashtab.h"
#include "tree-ssa-live.h"
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index 7b0cd2819bc1..f76f10c382b6 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -50,8 +50,15 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "gimple-pretty-print.h"
#include "basic-block.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-pass.h"
#include "flags.h"
#include "cfgloop.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 4ce29aed54e3..211bfcf5cc4e 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -30,7 +30,13 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
#include "domwalk.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index f73fb3c522b9..202eb3e673b1 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -26,7 +26,14 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-pass.h"
#include "domwalk.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 456725d3e3b0..93b89704a2f5 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -25,11 +25,16 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "flags.h"
-#include "gimple.h"
#include "expr.h"
#include "cfgloop.h"
#include "optabs.h"
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index 268275e3968e..0b9de258bf34 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -25,7 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "basic-block.h"
#include "tree-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
#include "tree-pass.h"
/* This pass combines COND_EXPRs to simplify control flow. It
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 94a9beead585..17849a211594 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -27,14 +27,18 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "bitmap.h"
#include "sbitmap.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "timevar.h"
#include "dumpfile.h"
#include "tree-ssa-live.h"
#include "diagnostic-core.h"
#include "debug.h"
#include "flags.h"
-#include "gimple.h"
#ifdef ENABLE_CHECKING
static void verify_live_on_entry (tree_live_info_p);
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index 15b34bb9d0c1..b74c56de330d 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -24,7 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tm_p.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "cfgloop.h"
#include "tree-inline.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 15af428f51fb..91356444f1a2 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -25,7 +25,14 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "cfgloop.h"
#include "domwalk.h"
#include "params.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index a506706b6e8f..6e7d50c01b84 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -40,7 +40,15 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "cfgloop.h"
#include "tree-pass.h"
#include "tree-chrec.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 798f57f6c284..9e30be4deb02 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -69,6 +69,15 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "cfgloop.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index e44458e4a0fe..f6bb8e4d05b6 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -24,6 +24,14 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "dumpfile.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index 113c7d103be6..4f0347f3d4ae 100644
--- a/gcc/tree-ssa-loop-niter.c
+++ b/gcc/tree-ssa-loop-niter.c
@@ -26,7 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "intl.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssa-loop.h"
#include "dumpfile.h"
#include "cfgloop.h"
#include "ggc.h"
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index 5a51ba66c490..d8f6887efbfb 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.c
@@ -25,7 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "tree-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "cfgloop.h"
#include "tree-pass.h"
#include "insn-config.h"
diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index 74af9758b1ad..55d23ca9ef39 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -24,7 +24,13 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tm_p.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "cfgloop.h"
#include "params.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index cbb14e6066d6..aaa42cfddfbd 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -24,7 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tm_p.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "tree-ssa-loop.h"
#include "tree-pass.h"
#include "cfgloop.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index f7f8ec91fcec..1817c20772c0 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -90,6 +90,13 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "tree.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "alloc-pool.h"
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index f397bb94f0ae..4e05d2df0467 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -25,7 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-inline.h"
#include "timevar.h"
#include "dumpfile.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index adf8a2800632..87aa28cbffff 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -27,7 +27,13 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm_p.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "pointer-set.h"
diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index f3ea552795d6..e0e682e5dc2c 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -26,7 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 4774f39ae7cb..4d97b13c999a 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -27,15 +27,22 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
+#include "tree-ssa.h"
#include "hash-table.h"
#include "tree-iterator.h"
#include "alloc-pool.h"
#include "obstack.h"
#include "tree-pass.h"
#include "flags.h"
-#include "bitmap.h"
#include "langhooks.h"
#include "cfgloop.h"
#include "tree-ssa-sccvn.h"
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index 180ae85e091a..d5bcc9c8cf7a 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -30,12 +30,17 @@
#include "gimple-pretty-print.h"
#include "dumpfile.h"
#include "sbitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-ssa.h"
#include "tree-ssa-propagate.h"
#include "langhooks.h"
#include "vec.h"
#include "value-prof.h"
-#include "gimple.h"
/* This file implements a generic value propagation engine based on
the same propagation used by the SSA-CCP algorithm [1].
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 17541c643d2d..7fed7f26e574 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -29,8 +29,15 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-dfa.h"
+#include "tree-ssa.h"
#include "tree-iterator.h"
#include "tree-pass.h"
#include "alloc-pool.h"
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 91604e2a54e2..ed4e1db718c6 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -26,13 +26,17 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
+#include "tree-ssa.h"
#include "dumpfile.h"
#include "hash-table.h"
#include "alloc-pool.h"
#include "flags.h"
-#include "bitmap.h"
#include "cfgloop.h"
#include "params.h"
#include "tree-ssa-propagate.h"
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index e3d62fb9b4e7..a8b149287c91 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -26,14 +26,16 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
#include "hashtab.h"
#include "tree-iterator.h"
#include "alloc-pool.h"
#include "tree-pass.h"
#include "flags.h"
-#include "bitmap.h"
#include "cfgloop.h"
#include "params.h"
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 1c0db1449cab..ea73179eea88 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -23,7 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "hash-table.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "tree-pass.h"
#include "domwalk.h"
#include "alloc-pool.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index b8cfebd31105..5b093e497a86 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -29,18 +29,20 @@
#include "flags.h"
#include "basic-block.h"
#include "tree.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "tree-inline.h"
#include "diagnostic-core.h"
-#include "gimple.h"
#include "hash-table.h"
#include "function.h"
-#include "cgraph.h"
#include "tree-pass.h"
#include "alloc-pool.h"
#include "splay-tree.h"
#include "params.h"
-#include "cgraph.h"
#include "alias.h"
#include "pointer-set.h"
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index 9094935391c8..785d986c65d8 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -194,8 +194,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "flags.h"
#include "function.h"
-#include "tree-ssa.h"
-#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-into-ssa.h"
#include "tree-ssa-alias.h"
#include "params.h"
#include "hash-table.h"
diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index 3659cf0c428f..d45307725cc8 100644
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.c
@@ -26,7 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "dumpfile.h"
#include "tree-outof-ssa.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index ebd93cbfd27e..bbc4f9b71c6b 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -30,7 +30,12 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "timevar.h"
#include "dumpfile.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-ssa-propagate.h"
#include "tree-ssa-threadupdate.h"
#include "langhooks.h"
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 737a6a2b62a5..bde81a88c190 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -24,6 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "basic-block.h"
#include "function.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
#include "tree-ssa.h"
#include "tree-ssa-threadupdate.h"
#include "dumpfile.h"
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index 28ff546c6274..71c1f5d395d5 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.c
@@ -26,7 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "function.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
#include "domwalk.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index 0174ee1748a4..5e376a1df514 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -30,8 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "bitmap.h"
#include "pointer-set.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssa.h"
#include "tree-inline.h"
#include "hashtab.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 421e200da9ff..d8cea7173428 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -30,10 +30,15 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "function.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
#include "pointer-set.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
+#include "tree-ssa.h"
#include "tree-inline.h"
#include "hashtab.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa.h b/gcc/tree-ssa.h
index c68a044221c4..ab1c920ff837 100644
--- a/gcc/tree-ssa.h
+++ b/gcc/tree-ssa.h
@@ -20,18 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_SSA_H
#define GCC_TREE_SSA_H
-#include "bitmap.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
-#include "cgraph.h"
-#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "tree-ssanames.h"
-#include "tree-ssa-loop.h"
-#include "tree-into-ssa.h"
-#include "tree-dfa.h"
-
/* Mapping for redirected edges. */
struct _edge_var_map {
tree result; /* PHI result. */
diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index a51f60307ec1..435cdc78965c 100644
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -22,6 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 3314fbaf56ea..2c8aac289b69 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -27,7 +27,12 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "gimple-pretty-print.h"
#include "target.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "sbitmap.h"
#include "tree-pass.h"
#include "tree-stdarg.h"
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index c36d4f6368cf..70162f248f9d 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "tree.h"
-#include "tree-ssa.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 862cb3870c8c..46b9efe3aa7e 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -31,7 +31,12 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "flags.h"
#include "tree.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "gimple-pretty-print.h"
#include "cfgloop.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 415d19acbbbb..70d167a58e92 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -25,7 +25,13 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "function.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "tree-ssanames.h"
+#include "tree-into-ssa.h"
+#include "tree-dfa.h"
#include "gimple-pretty-print.h"
#include "except.h"
#include "tree-pass.h"
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index e87e774e5e45..5a1f4626c085 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -30,7 +30,12 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
#include "dumpfile.h"
#include "cfgloop.h"
#include "tree-chrec.h"
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index df2f894e0f44..1521b2ba2c58 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.c
@@ -23,8 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tm.h"
#include "langhooks.h"
-#include "tree-ssa.h"
#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
#include "tree-iterator.h"
#include "tree-pass.h"
#include "flags.h"
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 1cc563c3cbbd..f093a524e053 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -28,6 +28,14 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "cfgloop.h"
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index d9125f690d24..bfe4a004cb9f 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -28,7 +28,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
#include "tree-pass.h"
#include "cfgloop.h"
#include "expr.h"
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 0a4e812fd823..e601baaf6261 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -27,7 +27,11 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "cfgloop.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index b3b3abec1100..80f75bc84224 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -29,7 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "cfgloop.h"
#include "expr.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 7d9c9ed8d7d9..de04a819edab 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -29,7 +29,13 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
#include "cfgloop.h"
#include "expr.h"
#include "recog.h" /* FIXME: for insn_data */
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 511972ae313d..6d8c578c6d93 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -62,7 +62,12 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "tree.h"
#include "tree-pretty-print.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssa-loop.h"
#include "cfgloop.h"
#include "tree-vectorizer.h"
#include "tree-pass.h"
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 0a059645c50c..cb2005204aa0 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -26,6 +26,14 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tree.h"
#include "basic-block.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
+#include "tree-ssa-loop.h"
+#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "tree-dump.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index f1dddb75de96..4560b724ad13 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -47,7 +47,13 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-iterator.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "bitmap.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-phinodes.h"
+#include "tree-ssanames.h"
+#include "tree-dfa.h"
#include "params.h"
#include "pointer-set.h"
#include "tree-pass.h"
@@ -55,7 +61,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "tree-diagnostic.h"
#include "tree-pretty-print.h"
-#include "cgraph.h"
#include "except.h"
#include "debug.h"
#include "intl.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index 3619f25045d4..bceb5979de15 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -28,14 +28,16 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple.h"
#include "function.h"
-#include "tree-ssa.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "tree-cfg.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-iterator.h"
#include "langhooks.h"
#include "output.h"
#include "options.h"
#include "target.h"
-#include "cgraph.h"
#include "diagnostic.h"
#include "tree-ssa-propagate.h"
#include "tsan.h"
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 0364c48c5575..fd993c405cf2 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -33,13 +33,17 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "regs.h"
#include "ggc.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-cfg.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "coverage.h"
#include "tree.h"
#include "gcov-io.h"
-#include "cgraph.h"
#include "timevar.h"
#include "dumpfile.h"
#include "pointer-set.h"
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 24c61ccd2a2c..f957c0c52ac3 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -104,6 +104,8 @@
#include "regs.h"
#include "expr.h"
#include "tree-pass.h"
+#include "bitmap.h"
+#include "tree-dfa.h"
#include "tree-ssa.h"
#include "cselib.h"
#include "target.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index d5324adb52b4..2eb1fc1859fc 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "output.h"
#include "gimple.h"
-#include "tree-ssa.h"
#include "flags.h"
/* List of hooks triggered on varpool_node events. */
diff --git a/gcc/vtable-verify.c b/gcc/vtable-verify.c
index d954d1f91e06..fb26978d2736 100644
--- a/gcc/vtable-verify.c
+++ b/gcc/vtable-verify.c
@@ -138,7 +138,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "basic-block.h"
-#include "tree-ssa.h"
+#include "gimple.h"
+#include "gimple-ssa.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+#include "tree-ssanames.h"
#include "tree-pass.h"
#include "cfgloop.h"
--
GitLab