diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a87a41da66abfa49d827becbc5f6899cd6021164..ffe05035027ee57e6514ea32680b395b1db0b339 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,98 @@
+2010-06-01 Steven Bosscher <steven@gcc.gnu.org>
+
+ * gimplify.c: Do not include except.h and optabs.h.
+ (gimplify_body): Do not initialize RTL profiling.
+ * gimple-low.c: Do not include rtl.h, diagnostic.h, langhooks.h,
+ langhooks-def.h, timevar.h, except.h, hashtab.h, and expr.h.
+ * gimple-fold.c: Do not include rtl.h, tm_p.h, ggc.h, basic-block.h,
+ output.h, expr.h, diagnostic.h, timevar.h, value-prof.h, and
+ langhooks.h.
+
+ * tree-pretty-print.h: Include pretty-print.h.
+ * gimple-pretty-print.h: Include pretty-print.h.
+
+ * tree-pretty-print.c: Do not include diagnostic.h.
+ * tree-vrp.c: Likewise.
+ * tree-tailcall.c: Likewise
+ * tree-scalar-evolution.c: Likewise
+ * tree-ssa-dse.c: Likewise
+ * tree-chrec.c: Likewise
+ * tree-ssa-sccvn.c: Likewise
+ * tree-ssa-copyrename.c: Likewise
+ * tree-nomudflap.c: Likewise
+ * tree-call-cdce.c: Likewise
+ * tree-stdarg.c: Likewise
+ * tree-ssa-math-opts.c: Likewise
+ * tree-nrv.c: Likewise
+ * tree-ssa-sink.c: Likewise
+ * tree-browser.c: Likewise
+ * tree-ssa-loop-ivcanon.c: Likewise
+ * tree-ssa-loop.c: Likewise
+ * tree-parloops.c: Likewise
+ * tree-ssa-address.c: Likewise
+ * tree-ssa-ifcombine.c: Likewise
+ * tree-if-conv.c: Likewise
+ * tree-data-ref.c: Likewise
+ * tree-affine.c: Likewise
+ * tree-ssa-phiopt.c: Likewise
+ * tree-ssa-coalesce.c: Likewise
+ * tree-ssa-pre.c: Likewise
+ * tree-ssa-live.c: Likewise
+ * tree-predcom.c: Likewise
+ * tree-ssa-forwprop.c: Likewise
+ * tree-ssa-dce.c: Likewise
+ * tree-ssa-ter.c: Likewise
+ * tree-ssa-loop-prefetch.c: Likewise
+ * tree-optimize.c: Likewise
+ * tree-ssa-phiprop.c: Likewise
+ * tree-object-size.c: Likewise
+ * tree-outof-ssa.c: Likewise
+ * tree-ssa-structalias.c: Likewise
+ * tree-switch-conversion.c: Likewise
+ * tree-ssa-reassoc.c: Likewise
+ * tree-ssa-operands.c: Likewise
+ * tree-vectorizer.c: Likewise
+ * tree-vect-data-refs.c: Likewise
+ * tree-vect-generic.c: Likewise
+ * tree-vect-stmts.c: Likewise
+ * tree-vect-patterns.c: Likewise
+ * tree-vect-slp.c: Likewise
+ * tree-vect-loop.c: Likewise
+ * tree-ssa-loop-ivopts.c: Likewise
+ * tree-ssa-loop-im.c: Likewise
+ * tree-ssa-loop-niter.c: Likewise
+ * tree-ssa-loop-unswitch.c: Likewise
+ * tree-ssa-loop-manip.c: Likewise
+ * tree-ssa-loop-ch.c: Likewise
+ * tree-dump.c: Likewise
+ * tree-complex.c: Likewise
+
+ * tree-into-ssa.c: Do not include diagnostic.h and expr.h.
+ * tree-ssa-uninit.c: Likewise
+ * tree-ssa-threadupdate.c: Likewise
+ * tree-ssa-uncprop.c: Likewise
+ * tree-ssa-ccp.c: Likewise
+ * tree-ssa-dom.c: Likewise
+ * tree-ssa-propagate.c: Likewise
+ * tree-ssa-alias.c: Likewise
+ * tree-dfa.c: Likewise
+ * tree-cfgcleanup.c: Likewise
+ * tree-sra.c: Likewise
+ * tree-ssa-copy.c: Likewise
+ * tree-ssa.c: Likewise
+ * tree-profile.c: Likewise
+ * tree-cfg.c: Likewise
+ * tree-ssa-threadedge.c: Likewise
+ * tree-vect-loop-manip.c: Likewise
+
+ * tree-inline.c: Do not include diagnostic.h and expr.h.
+ Include rtl.h.
+ (copy_decl_for_dup_finish): Do not use NULL_RTX.
+
+ * tree-loop-linear.c: Do not include diagnostic.h, expr.h,
+ and optabs.h.
+ * tree-loop-distribution.c: Likewise.
+
2010-06-01 Jan Hubicka <jh@suse.cz>
* ipa-pure-const.c (local_pure_const): Do NORETURN discovery.
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index e74f52457d8379b02b80c4852b65086a2b0a0b5d..2f64beb6733e41c7c8851a965f687aee22edfe48 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -24,21 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "flags.h"
-#include "rtl.h"
-#include "tm_p.h"
-#include "ggc.h"
-#include "basic-block.h"
-#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
-#include "timevar.h"
#include "tree-dump.h"
#include "tree-flow.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
-#include "value-prof.h"
-#include "langhooks.h"
#include "target.h"
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index ae5a9fdfcf5f213dd8c6b44446a61686e05dbf4b..0823b890232ac3ca5bcd3a5fd1a88580d07e957d 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -24,20 +24,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "rtl.h"
#include "gimple.h"
#include "tree-iterator.h"
#include "tree-inline.h"
-#include "diagnostic.h"
-#include "langhooks.h"
-#include "langhooks-def.h"
#include "tree-flow.h"
-#include "timevar.h"
-#include "except.h"
-#include "hashtab.h"
#include "flags.h"
#include "function.h"
-#include "expr.h"
#include "toplev.h"
#include "tree-pass.h"
diff --git a/gcc/gimple-pretty-print.h b/gcc/gimple-pretty-print.h
index 4d2fd4bb942f19b324dcb07714555e8ae6c285d3..b7c525dbe7e1e81e85cb5df3f806726296fd66bd 100644
--- a/gcc/gimple-pretty-print.h
+++ b/gcc/gimple-pretty-print.h
@@ -22,6 +22,9 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GIMPLE_PRETTY_PRINT_H
#define GCC_GIMPLE_PRETTY_PRINT_H
+#include "pretty-print.h"
+#include "tree-pretty-print.h"
+
/* In gimple-pretty-print.c */
extern void debug_gimple_stmt (gimple);
extern void debug_gimple_seq (gimple_seq);
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 855098f5af53e763cae29b4a85a2565189480fc4..fd1f05f3d98ba3cdff5ab3b16f86fb2e968f1db5 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -26,33 +26,30 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "rtl.h"
#include "gimple.h"
#include "tree-iterator.h"
#include "tree-inline.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "langhooks.h"
-#include "langhooks-def.h"
#include "tree-flow.h"
#include "cgraph.h"
#include "timevar.h"
-#include "except.h"
#include "hashtab.h"
#include "flags.h"
#include "function.h"
#include "output.h"
-#include "expr.h"
#include "ggc.h"
#include "toplev.h"
#include "target.h"
-#include "optabs.h"
#include "pointer-set.h"
#include "splay-tree.h"
#include "vec.h"
#include "gimple.h"
#include "tree-pass.h"
+#include "langhooks-def.h" /* FIXME: for lhd_set_decl_assembler_name. */
+#include "expr.h" /* FIXME: for can_move_by_pieces
+ and STACK_CHECK_MAX_VAR_SIZE. */
enum gimplify_omp_var_data
{
@@ -1906,7 +1903,7 @@ gimplify_var_or_parm_decl (tree *expr_p)
tree copy = copy_node (decl), block;
lang_hooks.dup_lang_specific_decl (copy);
- SET_DECL_RTL (copy, NULL_RTX);
+ SET_DECL_RTL (copy, 0);
TREE_USED (copy) = 1;
block = DECL_INITIAL (current_function_decl);
TREE_CHAIN (copy) = BLOCK_VARS (block);
@@ -7601,10 +7598,6 @@ gimplify_body (tree *body_p, tree fndecl, bool do_parms)
timevar_push (TV_TREE_GIMPLIFY);
- /* Initialize for optimize_insn_for_s{ize,peed}_p possibly called during
- gimplification. */
- default_rtl_profile ();
-
gcc_assert (gimplify_ctxp == NULL);
push_gimplify_context (&gctx);
diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index 898e5c125522f9c51c4cfb225683521092ed20ba..4d63de381c4a1c47cc384409db78aa8f22f4c0ef 100644
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-dump.h"
#include "pointer-set.h"
diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
index 0180d3ae4f7cc176dd935ecb7923a42feee7eba6..a7c80c991ec587d07a3e1fae5e669892c09d83b8 100644
--- a/gcc/tree-browser.c
+++ b/gcc/tree-browser.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "tree-inline.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "hashtab.h"
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index 6517742ca7097eeabf6461b2b310da478729ff83..7f0a3e223e9bff18b677cdd9b05ab5f55f871e82 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "basic-block.h"
#include "tree.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
#include "gimple.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index a76a254cbd203e048d01d26b7cec843bc85c366e..7db5192a2ea8d0e7685ee4b3aff0cf8b617dab42 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -29,10 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "flags.h"
#include "function.h"
-#include "expr.h"
#include "ggc.h"
#include "langhooks.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 10fc7aceb644def9118458dc3542dada71064f2a..fc2141f48c179ec322bdc6589f65618584957915 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -29,10 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "flags.h"
#include "function.h"
-#include "expr.h"
#include "ggc.h"
#include "langhooks.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "timevar.h"
#include "tree-dump.h"
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index b0cc8b22b017fb6961ccfa8a6d93d5dcfeddefb7..24e1944da69f57520cbf2e1d5f488a607889c969 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "ggc.h"
#include "tree.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "cfgloop.h"
#include "tree-flow.h"
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index f1ef1770939a6f1cd0510b4888b2070024f084f7..c491ac8173c7f5d159c4551423da94edd42a0195 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
-#include "diagnostic.h"
/* For each complex ssa name, a lattice value. We're interested in finding
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 41dae8deb1ec8f0619ac23f580082cddafefb028..c41cf51f775e0b11e533db56f95638de49068a7d 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -81,10 +81,7 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "flags.h"
#include "tree.h"
-
-/* These RTL headers are needed for basic-block.h. */
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 66b9090ed6af94c372e0b0b055d7a7cb55b51e07..ad03cd235c6668f3deb0fb7b27be4af14e1f1832 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -30,12 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "output.h"
#include "timevar.h"
-#include "expr.h"
#include "ggc.h"
#include "langhooks.h"
#include "flags.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-dump.h"
#include "gimple.h"
diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c
index 99e9c79fcde778a3e1d9ee6f2bff550e7b9f6e19..539a11dfe3506662ae32c63d7dbab4ef9374871a 100644
--- a/gcc/tree-dump.c
+++ b/gcc/tree-dump.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "splay-tree.h"
-#include "diagnostic.h"
#include "toplev.h"
#include "tree-dump.h"
#include "tree-pass.h"
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 268c171baa675d1b59a45edd3d4901baff1e7231..f64623dae7d72483a982b433fb94aebff87d3a51 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -89,7 +89,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "timevar.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index fce6ae54a6ba98f425e4c9794aa6e771612819b0..696cb00fbfd3897628a077495d60cc51874f53db 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "tree.h"
#include "tree-inline.h"
-#include "expr.h"
#include "flags.h"
#include "params.h"
#include "input.h"
@@ -41,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-flow.h"
#include "function.h"
#include "tree-flow.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "except.h"
#include "debug.h"
@@ -52,6 +50,8 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "integrate.h"
+#include "rtl.h" /* FIXME: For asm_str_count. */
+
/* I'm not real happy about this, but we need to handle gimple and
non-gimple trees. */
#include "gimple.h"
@@ -4697,7 +4697,7 @@ copy_decl_for_dup_finish (copy_body_data *id, tree decl, tree copy)
/* The new variable/label has no RTL, yet. */
if (CODE_CONTAINS_STRUCT (TREE_CODE (copy), TS_DECL_WRTL)
&& !TREE_STATIC (copy) && !DECL_EXTERNAL (copy))
- SET_DECL_RTL (copy, NULL_RTX);
+ SET_DECL_RTL (copy, 0);
/* These args would always appear unused, if not for this. */
TREE_USED (copy) = 1;
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 5885addde261a193c77f25e0c7a95ea50deac163..a095ffd634dc53966f580a25f11a9eb0558cbf94 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -29,9 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 51c66778773d6ee6c4a3e88ebebd5503061d4ecd..5379709261ed78ebf3b846b570be95e1bcf2729c 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -48,13 +48,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "timevar.h"
#include "cfgloop.h"
-#include "expr.h"
-#include "optabs.h"
#include "tree-chrec.h"
#include "tree-data-ref.h"
#include "tree-scalar-evolution.h"
diff --git a/gcc/tree-loop-linear.c b/gcc/tree-loop-linear.c
index b771852c609cdd1cb8f6b49c8cab8e4fc0165367..03759dec967087264faaea060bbd5a011a2262e9 100644
--- a/gcc/tree-loop-linear.c
+++ b/gcc/tree-loop-linear.c
@@ -26,14 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "obstack.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "timevar.h"
#include "cfgloop.h"
-#include "expr.h"
-#include "optabs.h"
#include "tree-chrec.h"
#include "tree-data-ref.h"
#include "tree-scalar-evolution.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index cd1d770b335705dd1f57f57751a173c04c8b776b..cd1530740959d2864832985d2550d6f130eac296 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -31,7 +31,7 @@
#include "tree-iterator.h"
#include "tree-flow.h"
#include "cgraph.h"
-#include "expr.h"
+#include "expr.h" /* FIXME: For STACK_SAVEAREA_MODE and SAVE_NONLOCAL. */
#include "langhooks.h"
#include "pointer-set.h"
diff --git a/gcc/tree-nomudflap.c b/gcc/tree-nomudflap.c
index c035f76b5635358185ae28723a50ef5f7bed2657..4d54efdf0896a3dcbe5ba2c53b1d4321315a2cdc 100644
--- a/gcc/tree-nomudflap.c
+++ b/gcc/tree-nomudflap.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tree-inline.h"
#include "gimple.h"
-#include "diagnostic.h"
#include "hashtab.h"
#include "output.h"
#include "langhooks.h"
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 06b13511e25dfdf553479334a229ddc50e9a3d2b..31de9ba7753a80367e07e1e73be0d365c289f2df 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "function.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-flow.h"
#include "timevar.h"
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index 35b3c44707e53e6713490a46e19dce66932e11d5..5c7d6f599c8733fb546a8b806a107dbc26f654c3 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "toplev.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-optimize.c b/gcc/tree-optimize.c
index 2631e14cce4e56f519fee0269390301f8b7ad9f0..ef60cde53bff46a56fdc6ab961f6cf3f5f76977c 100644
--- a/gcc/tree-optimize.c
+++ b/gcc/tree-optimize.c
@@ -27,8 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
-#include "basic-block.h"
#include "flags.h"
#include "tree-flow.h"
#include "tree-dump.h"
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index 26395710eb86ad24021ed77e951c3e466ef3565d..188cf0c8d7a284e375fd6dc5854b897d6db373c5 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "ggc.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
@@ -35,9 +34,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dump.h"
#include "tree-pass.h"
#include "toplev.h"
-#include "expr.h"
#include "ssaexpand.h"
+/* FIXME: A lot of code here deals with expanding to RTL. All that code
+ should be in cfgexpand.c. */
+#include "expr.h"
+
DEF_VEC_I(source_location);
DEF_VEC_ALLOC_I(source_location,heap);
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index f38ae17d89a3697362881643b0fe96c8d284999c..a17655ed699ff7fe1515f46b285ddde9091a5575 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-flow.h"
#include "cfgloop.h"
#include "tree-data-ref.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-pass.h"
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index dd7b6e2cdde3d802c85dc22534932bf86983d58a..de147e7ec96269d49d4909ec96b27366afe9098b 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -198,7 +198,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-scalar-evolution.h"
#include "tree-chrec.h"
#include "params.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-pass.h"
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index ec10c144a5fa69ab5183065f9b01c1a5adbbae95..bbdb38de10db66e7fe0a670f4afe6a2abeafcd50 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "hashtab.h"
#include "tree-flow.h"
diff --git a/gcc/tree-pretty-print.h b/gcc/tree-pretty-print.h
index ef4cd27f8b56a4c6656c81e1cbab6520b583dc2c..8346dc4e48fc312a3662d5c947d04531cb7c47df 100644
--- a/gcc/tree-pretty-print.h
+++ b/gcc/tree-pretty-print.h
@@ -23,6 +23,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_PRETTY_PRINT_H
#define GCC_TREE_PRETTY_PRINT_H
+#include "pretty-print.h"
+
#define pp_tree_identifier(PP, T) \
pp_base_tree_identifier (pp_base (PP), T)
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 2d3ec122858428da327ea18fc847e2bf17e8a90c..ca15001fead20e2f650aa7221f7e389331bab016 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "regs.h"
-#include "expr.h"
#include "function.h"
#include "basic-block.h"
#include "toplev.h"
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index d50eac9833948e44181ca80c6518d6ce3f702622..bf564d8dab537f59479481df3e7c0964e2d0ede7 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -261,7 +261,6 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index ae038f9a441028231c15a1c2f63e2282496ec864..702187c355d68581fc56228c4350efd4837453cc 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -77,12 +77,10 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "tm.h"
#include "tree.h"
-#include "expr.h"
#include "gimple.h"
#include "cgraph.h"
#include "tree-flow.h"
#include "ipa-prop.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "statistics.h"
#include "tree-dump.h"
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index f22b07d2ad24679dd4b633fa8cbe287cb2e0cd70..3abfffe25ec8998ac526a13f132d86d87d5591fc 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index e510358a49bda0c0e5814d4750e35372bfa9ed03..d3890c5b57c5afeffb449c895ac56301e8d1fe65 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -27,12 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "timevar.h"
-#include "expr.h"
#include "ggc.h"
#include "langhooks.h"
#include "flags.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-dump.h"
#include "gimple.h"
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 3a2b51c72c599b167cde671b707e55c30de4ea0b..44e284f68968cae42ad9f1f04854d3728d0da996 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -194,9 +194,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "timevar.h"
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index 6c84360557337207bca61c18cb9b9877ab2f0ad0..2cdbceb2d3aea5c0bf5e6c1bd1f7c072992dfd1c 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "flags.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "bitmap.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index afa9acef335cc826bb6940753ced79be02d80c3b..7a4c0995514ed86b13fb4de2e090ebd51ed3838e 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -27,9 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "timevar.h"
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index c236de34d962db731a2e3db16e55a102b7fd088d..41d43a6179cd7effea9107c08f03a4af43472df7 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "basic-block.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "bitmap.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index 59ccc408e9cfa13fecc39e260f8c4019282a24f5..ae44ef189a63b0d06d1825e320aec46513afa391 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -49,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "basic-block.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 761593b4271ab24dbceff846b8d29fddccd758d9..25eb306369da0f9ef62493b6b6252ebf0935a87b 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -29,9 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "cfgloop.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "timevar.h"
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index 858cd5e4203c9f8c9344a0b132edfb86b574d894..be440c9b65708ce469090e5f59821bb72465d163 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "timevar.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index f7295067801992b77f96898272631ad98e751bda..eb6c831f7c8e98625275d18656da1ed00c6f7341 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "timevar.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-flow.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index 8b8e0ddc7962ebada13bac095cac2c41b2987767..a20f70404036c4931710c85ef6883b9abbdb0b53 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "basic-block.h"
#include "timevar.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-flow.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index a3112959217cae94cb6fe592f44c2608e6156484..ca1b985bb8e791b51d54a43f2381d726acfc6e09 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index 48799d7a6741ddf0f08b541fe73249b9e3043fb0..b81c19676813e188701f98d4b5c5416752c641d8 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index eb15382e2a11bd078492c490b8c63783cee19e46..ce8bc34ebbac84a68a15656a9ff31a3bca76dee0 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -26,9 +26,8 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
-#include "gimple-pretty-print.h"
#include "tree-pretty-print.h"
+#include "gimple-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "timevar.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 12383d7b42eb87e31f2aeb4420ab3824ce4ec469..0599a3683ea9fc211741c31e370ec14837a78bc3 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "tm_p.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index bda640f3e0eafb11b834b423d38cc006a80cfb9d..094e9cc8fe2cbb07fcfa73f533310f8431bcb13e 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -70,14 +70,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "timevar.h"
#include "cfgloop.h"
-#include "expr.h"
#include "tree-pass.h"
#include "ggc.h"
#include "insn-config.h"
@@ -92,6 +90,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree-affine.h"
#include "target.h"
+/* FIXME: Expressions are expanded to RTL in this pass to determine the
+ cost of different addressing modes. This should be moved to a TBD
+ interface between the GIMPLE and RTL worlds. */
+#include "expr.h"
+
/* The infinite cost. */
#define INFTY 10000000
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 060ee26160181ccfb4df295c62add6989d8c062a..219c71b9a96464ff42c21f5d9c7a0f5bd3bd05a4 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "timevar.h"
diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index d1c2e4cbb405b472932fff6bdb18e2ec73754e4a..279718ee5e4aca853abc716b7994c3b603b45c78 100644
--- a/gcc/tree-ssa-loop-niter.c
+++ b/gcc/tree-ssa-loop-niter.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "intl.h"
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index d63ede1bbe987e7a878c46e89363eca7f451a402..9ccf72e18b2ca1253880bbff8f826b1c8343ae24 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.c
@@ -25,13 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "timevar.h"
#include "cfgloop.h"
-#include "expr.h"
#include "tree-pass.h"
#include "insn-config.h"
#include "recog.h"
@@ -43,6 +41,11 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "tree-inline.h"
#include "tree-data-ref.h"
+
+
+/* FIXME: Needed for optabs, but this should all be moved to a TBD interface
+ between the GIMPLE and RTL worlds. */
+#include "expr.h"
#include "optabs.h"
/* This pass inserts prefetch instructions to optimize cache usage during
diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index d0751e81a38545b9e977a0e2ce8ca39f51a11721..6bc40af263ca14a97df058474d9598bb49185fa8 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "timevar.h"
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index 1ecad36b109b7acff575f7ff41a7fcaaab5a44c0..344cfa8acbef3ec6f9edfe1d33a6bf162dd36e83 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index f89910b82e544cc4ae75153df93495a8be07ad45..9e67ea924d3ccc34b066e9d5e67ac96c2ea33158 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -97,7 +97,6 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "basic-block.h"
#include "target.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
/* FIXME: RTL headers have to be included here for optabs. */
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index f8224968fe4c3cdbbc06c23d871dcd0a6ce01cbd..68be8fae8f484b522ab1eecf93e16658a92e3ebb 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "flags.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index d40aeb2275c13d9a3871db51f64f04bc0f2f0054..53ab31a15df3b07477fb74b9d2f36f1e58d81f5e 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "timevar.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "tree-pass.h"
#include "tree-dump.h"
diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index a7bb01195efeeaeb43e7b7e9b780eae9c4449984..dc1cb28f7c34be26fe2d5ecef0e9e11d1bd4448f 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "timevar.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index ea4be543c45d8c3bdebf551c8ff5f121ca929c88..3d186fd70fac71db813b676d2fdff284d788e1b0 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index d7243e9822676b77908e43074ea5c2a9848407ff..879e0db10eabc34057bc4e1760042ecf353a938b 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -28,9 +28,7 @@
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "timevar.h"
#include "tree-dump.h"
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index add41f882a2060038b28a398b2c93686dd2ecc11..0911c56a9bd8a1f32d2edfc1794c9018deced9f0 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 8dba41b51c99b52ebb68cc780e334b5507a67346..240885570546aaadaa9f19247f1b3d9860464370 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index 40d3a2972f47cd6e4b6ae24c6c59b2d926adf7e8..ac31781e198f76b74cfac85e987cf5cd1bd19c3e 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index d70b36c3498f9f0dbf9eddaec42969b693b0c422..0c5b0d3842d49f7c893546a410cedd1996df1d2b 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -32,7 +32,6 @@
#include "tree.h"
#include "tree-flow.h"
#include "tree-inline.h"
-#include "diagnostic.h"
#include "toplev.h"
#include "gimple.h"
#include "hashtab.h"
diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index a998db85c5f69fe65b7ad9302c560d410acae9dd..2f5b8305f744a38ba2c587d827c24ea1f00e2365 100644
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 631d97b8bfaa11cd31a2578aeb685d44f8bf6f22..0113d3ae8bd607044ae992c855acadae1b36b84a 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -28,9 +28,7 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "cfgloop.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "timevar.h"
#include "tree-dump.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 2eae88c0840472e6fd595ebc3ecb5602dd9916ae..4621eec868f47666e8d65577a1e00b44aa37beea 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -27,9 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index c98f63ff9d5c6d084d7ea2b0ab9db388f34e36de..30aa4c7755d5d85dda98665aef0e581e86ebdd02 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.c
@@ -27,9 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "timevar.h"
#include "tree-dump.h"
#include "tree-flow.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index 5487cc06b960c65f3aeb1911f6be7c4fc5529594..6d58f5b16312ed715ba25883b8644607ee43c89b 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -29,9 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
#include "pointer-set.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index d07c61d04680f60e6d2482bd4b5ccef92ff0331c..ec9c50ceb7743de91c04e408e8902007df4bb4f0 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -30,9 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "basic-block.h"
#include "output.h"
-#include "expr.h"
#include "function.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 8401747a020655c6cd7b8be0fcef88be0e39583f..3bfbfc2dc196c95a860e02da214658f6db5f1844 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "function.h"
#include "langhooks.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "target.h"
#include "tree-flow.h"
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index cf3202ca905115f5506ed1c79e7c08b26059c1c0..ed8b5ce5c0cca76202b143c4b2062cc847ac5ca8 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -93,7 +93,6 @@ eight) times the number of the actual switch branches. */
#include "output.h"
#include "input.h"
#include "tree-pass.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "tree-dump.h"
#include "timevar.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index e67f5805d271e18154e1aff35d7d9305f6fdf160..5a6bd23ea427563db6a5a75c14a1aedf456244e5 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "tree-flow.h"
#include "tree-dump.h"
-#include "diagnostic.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 76a5c21e2555cf444fa819bdc5df8e9d044c4fa7..f2a1fc4f68037c72938fc3ed19c49be0e697672a 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -28,19 +28,19 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "target.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "cfgloop.h"
-#include "expr.h"
-#include "optabs.h"
#include "tree-chrec.h"
#include "tree-scalar-evolution.h"
#include "tree-vectorizer.h"
#include "toplev.h"
+/* Need to include rtl.h, expr.h, etc. for optabs. */
+#include "expr.h"
+#include "optabs.h"
/* Return the smallest scalar part of STMT.
This is used to determine the vectype of the stmt. We generally set the
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index 25bda423f1bacb9a9076dfda9bb7d076660ba290..8b8a481992b9146687b46ac182ef6180f964658e 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.c
@@ -23,11 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "tm.h"
-#include "expr.h"
-#include "insn-codes.h"
-#include "diagnostic.h"
-#include "optabs.h"
-#include "machmode.h"
#include "langhooks.h"
#include "tree-flow.h"
#include "gimple.h"
@@ -36,6 +31,9 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "ggc.h"
+/* Need to include rtl.h, expr.h, etc. for optabs. */
+#include "expr.h"
+#include "optabs.h"
/* Build a constant of type TYPE, made of VALUE's bits replicated
every TYPE_SIZE (INNER_TYPE) bits to fit TYPE's precision. */
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 8289b363e76c1bb8ef53fbd9438cfa1764315ef2..f8922a2308a67eb6a087ea1cbdc39e848ff7174a 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -27,14 +27,12 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
#include "cfgloop.h"
#include "cfglayout.h"
-#include "expr.h"
#include "toplev.h"
#include "tree-scalar-evolution.h"
#include "tree-vectorizer.h"
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 465a95cbf121e7fe5c1c64afb673d44361ad8769..a6b331a5d07b57b5c97374f105b8d742aff704ad 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 987c267b7e33154ea9f7dd0ae473464076d9338e..eb97395620efc33addd5f35ceb384e15012e9259 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "target.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index f1b6355025f30b63f160338750ef3770a97ea19e..6870fca0c45448ab1ca5e90b6750d5d9bf21d67d 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "target.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 71f6e852ad72bb5240db65aaad65056d3e913eb3..7ad0988450be307f5558aa06764bfebfc6a73df6 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "target.h"
#include "basic-block.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "tree-flow.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index b449268682156df4f6c2256dcfa7f2955d1d62f1..d4857e06cd6bc910ec0aee54511ef68d67533fe7 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -61,7 +61,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "ggc.h"
#include "tree.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-flow.h"
#include "tree-dump.h"
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 2bb90b2717196218c5faaf1133ae74d335066bdd..f0e9ce64d64e79d54e9d1f7aa28e3cb2e343f277 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "tree-dump.h"
#include "timevar.h"
-#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "gimple-pretty-print.h"
#include "toplev.h"