diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00708ed6d5e977a142997d7d82b74e3a694ca525..4de57e05a54b84f3623fc08d33e8697bf739df50 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,121 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * cgraph.h: Flatten. Remove all include files.
+ (symbol_table::initialize): Move to cgraph.c.
+ * cgraph.c: Adjust include files.
+ (symbol_table::initialize): Relocate from cgraph.h.
+ * gengtype.c (open_base_files): Adjust include files.
+ * gccplugin.h: Add hash-map.h, is-a.h, plugin-api.h, and ipa-ref.h to
+ included files.
+ * ipa-inline.h: Remove all include files.
+ * ipa-prop.h: Ditto.
+ * ipa-reference.h: Ditto.
+ * ipa-utils.h: Ditto:
+ * lto-streamer.h: Remove cgraph.h from include list.
+ * asan.c: Adjust include files.
+ * auto-profile.c: Ditto.
+ * bb-reorder.c: Ditto.
+ * calls.c: Ditto.
+ * cfgexpand.c: Ditto.
+ * cgraphbuild.c: Ditto.
+ * cgraphclones.c: Ditto.
+ * cgraphunit.c: Ditto.
+ * combine.c: Ditto.
+ * coverage.c: Ditto.
+ * data-streamer.c: Ditto.
+ * data-streamer-in.c: Ditto.
+ * data-streamer-out.c: Ditto.
+ * dbxout.c: Ditto.
+ * dwarf2out.c: Ditto.
+ * except.c: Ditto.
+ * expr.c: Ditto.
+ * final.c: Ditto.
+ * fold-const.c: Ditto.
+ * ggc-page.c: Ditto.
+ * gimple-fold.c: Ditto.
+ * gimple-iterator.c: Ditto.
+ * gimple-pretty-print.c: Ditto.
+ * gimple-streamer-in.c: Ditto.
+ * gimple-streamer-out.c: Ditto.
+ * gimplify.c: Ditto.
+ * ipa.c: Ditto.
+ * ipa-comdats.c: Ditto.
+ * ipa-cp.c: Ditto.
+ * ipa-devirt.c: Ditto.
+ * ipa-icf.c: Ditto.
+ * ipa-icf-gimple.c: Ditto.
+ * ipa-inline-analysis.c: Ditto.
+ * ipa-inline.c: Ditto.
+ * ipa-inline-transform.c: Ditto.
+ * ipa-polymorphic-call.c: Ditto.
+ * ipa-profile.c: Ditto.
+ * ipa-prop.c: Ditto.
+ * ipa-pure-const.c: Ditto.
+ * ipa-ref.c: Ditto.
+ * ipa-reference.c: Ditto.
+ * ipa-split.c: Ditto.
+ * ipa-utils.c: Ditto.
+ * ipa-visibility.c: Ditto.
+ * langhooks.c: Ditto.
+ * lto-cgraph.c: Ditto.
+ * lto-compress.c: Ditto.
+ * lto-opts.c: Ditto.
+ * lto-section-in.c: Ditto.
+ * lto-section-out.c: Ditto.
+ * lto-streamer.c: Ditto.
+ * lto-streamer-in.c: Ditto.
+ * lto-streamer-out.c: Ditto.
+ * omp-low.c: Ditto.
+ * opts-global.c: Ditto.
+ * passes.c: Ditto.
+ * predict.c: Ditto.
+ * print-tree.c: Ditto.
+ * profile.c: Ditto.
+ * ree.c: Ditto.
+ * stor-layout.c: Ditto.
+ * symtab.c: Ditto.
+ * toplev.c: Ditto.
+ * trans-mem.c: Ditto.
+ * tree.c: Ditto.
+ * tree-cfg.c: Ditto.
+ * tree-eh.c: Ditto.
+ * tree-emutls.c: Ditto.
+ * tree-inline.c: Ditto.
+ * tree-nested.c: Ditto.
+ * tree-pretty-print.c: Ditto.
+ * tree-profile.c: Ditto.
+ * tree-sra.c: Ditto.
+ * tree-ssa-alias.c: Ditto.
+ * tree-ssa-loop-ivcanon.c: Ditto.
+ * tree-ssa-loop-ivopts.c: Ditto.
+ * tree-ssa-pre.c: Ditto.
+ * tree-ssa-structalias.c: Ditto.
+ * tree-streamer.c: Ditto.
+ * tree-streamer-in.c: Ditto.
+ * tree-streamer-out.c: Ditto.
+ * tree-switch-conversion.c: Ditto.
+ * tree-tailcall.c: Ditto.
+ * tree-vect-data-refs.c: Ditto.
+ * tree-vectorizer.c: Ditto.
+ * tree-vect-stmts.c: Ditto.
+ * tsan.c: Ditto.
+ * ubsan.c: Ditto.
+ * value-prof.c: Ditto.
+ * varasm.c: Ditto.
+ * varpool.c: Ditto.
+ * config/arm/arm.c: Ditto.
+ * config/bfin/bfin.c: Ditto.
+ * config/c6x/c6x.c: Ditto.
+ * config/cris/cris.c: Ditto.
+ * config/darwin.c: Ditto.
+ * config/darwin-c.c: Ditto.
+ * config/i386/i386.c: Ditto.
+ * config/i386/winnt.c: Ditto.
+ * config/microblaze/microblaze.c: Ditto.
+ * config/mips/mips.c: Ditto.
+ * config/rs6000/rs6000.c: Ditto.
+ * config/rx/rx.c: Ditto.
+
2014-10-28 Richard Biener <rguenther@suse.de>
* gimple-fold.h (follow_single_use_edges): Declare.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f4aba2339054d3d3b94622d5e712bc9fcbb8e674..aab7f4cc6188bf3897b2cf2707652886a58feaf2 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * gcc-interface/trans.c: Adjust include files.
+ * gcc-interface/utils.c: Ditto.
+
2014-10-27 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/utils.c (create_subprog_decl): Adjust condition.
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 7c3edd399aa2ade2744999864121d5ac19be217b..6f6ee816ee84e41db19f66bc90d9dc8a26642d3c 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -40,6 +40,16 @@
#include "gimple-expr.h"
#include "gimplify.h"
#include "bitmap.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "opts.h"
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index e823a35b1afba22f47b1a56fba9007ac6f6feba5..98409539d09b0828f673de536b2cadf0fa8fe729 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -42,6 +42,17 @@
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "timevar.h"
diff --git a/gcc/asan.c b/gcc/asan.c
index ad366903847d0b82efed1b570e22ef772aeb17d8..d4adeb33572531c8d2340595185e37e156f4bdc1 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -49,6 +49,9 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stor-layout.h"
#include "tree-iterator.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "stringpool.h"
#include "tree-ssanames.h"
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index acc94469e308e4c7a4ad2a115df0559a010db63a..8c7b4ca2189d8008cc14e66124d14d5520cd8987 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -59,10 +59,15 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "value-prof.h"
#include "coverage.h"
#include "params.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "tree-inline.h"
#include "stringpool.h"
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index d29a95160d2ffebf207445ab7aad2f0d2860ca05..b6985d401e255bfd70b77309116bca0bd89db5c2 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -113,6 +113,10 @@
#include "basic-block.h"
#include "df.h"
#include "bb-reorder.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "except.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index d76a7cb7ea030b104774020178cfd832ca122667..17cc8c0f1419f5f313c8512c4d8180239dd7e10c 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-family/c-common.c: Adjust include files.
+ * c-family/c-gimplify.c: Ditto.
+ * c-family/cilk.c: Ditto.
+ * c-family/c-pragma.c: Ditto.
+ * c-family/c-ubsan.c: Ditto.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* c-gimplify.c: Adjust include files.
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index cd73e27272825a944d08f2f51d0e9b486a3bb432..d42a8789ce679fda4a45b7935e9653d6f2a40ce0 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -46,6 +46,16 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "hashtab.h"
#include "opts.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "target-def.h"
#include "gimplify.h"
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index 065553607cf1a78cca8e3b2ee916c4ec1a57c9fd..05fadb783a17cdfea1155fef8b2bac364c253d65 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -51,6 +51,9 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "dumpfile.h"
#include "c-pretty-print.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cilk.h"
#include "c-ubsan.h"
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index debd5f6fca3695918d9a1da833b3154a5cdc26d0..3183410e72a7e93c23f1dfaa9d8bc3fa6978e347 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "opts.h"
#include "plugin.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#define GCC_BAD(gmsgid) \
diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index 7f4dc258e01c51a626b9e34ddc283a2e43585ecb..ab16799b0c9303043ef876840421266b7c7c300f 100644
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -23,6 +23,18 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "alloc-pool.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "output.h"
#include "toplev.h"
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 20b343214d4fff334e61866360aa1b25946da322..f28a9d828048a6ceb75cf9baa3801c78a681ecd5 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -33,6 +33,18 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "c-family/c-common.h"
#include "toplev.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "cilk.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index dcc5548a905d8ec0ce57c391f302869fcc9520c6..69333124215972b53ec29b4a623d674b18ad93ef 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-decl.c: Adjust include files.
+ * c-parser.c: Ditto.
+
2014-10-27 Phil Muldoon <pmuldoon@redhat.com>
Tom Tromey <tromey@redhat.com>
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index d0105ff122b94836f700033d1b152a88104b5060..8196a7def0ce4ca843b5238829dfb1fd048eba9b 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -61,6 +61,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "hash-table.h"
#include "langhooks-def.h"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index fa146de35d08f7576f0307ac9fe81221920b4512..d316216cbe1dd29ab430d554db98e43542c771de 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -58,6 +58,15 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-objc.h"
#include "vec.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "plugin.h"
#include "omp-low.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index 0aebff5e304cd2248c57bfdcc959ffd296966964..1ddc6ed32038b8895ffe4ed3f4b8d7fa30c44478 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -53,6 +53,9 @@ along with GCC; see the file COPYING3. If not see
#include "sbitmap.h"
#include "langhooks.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "except.h"
#include "dbgcnt.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index e889409c25b33cfdd2b9795559e9732102ae6ce3..d78e50a8d722f8c27230d4710a5d7a5008491c82 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -56,6 +56,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 9a47ba24e53ada81319ce29d5aee85f5a97436bc..d430bc5524d1677e273cad836aa99f62a56b9953 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -43,6 +43,15 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "intl.h"
#include "tree-ssa-alias.h"
@@ -54,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#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"
@@ -63,6 +71,8 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "ipa-utils.h"
#include "lto-streamer.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "cfgloop.h"
#include "gimple-pretty-print.h"
@@ -243,6 +253,15 @@ cgraph_node::record_function_versions (tree decl1, tree decl2)
after->prev = before;
}
+/* Initialize callgraph dump file. */
+
+void
+symbol_table::initialize (void)
+{
+ if (!dump_file)
+ dump_file = dump_begin (TDI_cgraph, NULL);
+}
+
/* Allocate new callgraph node and insert it into basic data structures. */
cgraph_node *
diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index 377adce517ee9b1636da0fb7431cdc79c1ac9b5b..ae73f075cce0fe68bb27c35bbd36a66637ecdfe5 100644
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -21,19 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CGRAPH_H
#define GCC_CGRAPH_H
-#include "hash-map.h"
-#include "is-a.h"
-#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "machmode.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "input.h"
-#include "function.h"
-#include "ipa-ref.h"
-#include "dumpfile.h"
/* Symbol table consists of functions and variables.
TODO: add labels and CONST_DECLs. */
@@ -1785,12 +1772,7 @@ public:
friend class cgraph_edge;
/* Initialize callgraph dump file. */
- inline void
- initialize (void)
- {
- if (!dump_file)
- dump_file = dump_begin (TDI_cgraph, NULL);
- }
+ void initialize (void);
/* Register a top-level asm statement ASM_STR. */
inline asm_node *finalize_toplevel_asm (tree asm_str);
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index 2dc10a60eff3186134b6e3c8887614b1ef48a85e..51ec01bf0329e5c3c53b1c90899db45b81fed67b 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -45,8 +45,14 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "intl.h"
#include "tree-pass.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "except.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
/* Context of record_reference. */
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index a1ae50f44cbafe905a0c57299b7301a6c7daebc9..c8892daf52d41896b6fd762dcfc2f667f51045c1 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -98,6 +98,11 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "params.h"
#include "intl.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "tree-iterator.h"
#include "tree-dump.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 3e76bf0a68d02e72ce3df86d993dccaedc35132e..a86bd1bcd03553babcdaa6ce77a6dbe1709de95c 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -199,6 +199,11 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "fibheap.h"
#include "intl.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "tree-iterator.h"
#include "tree-pass.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index a0e10d3c341ec91ae733071aa6019666bcfd8194..0787d5031a93fe93b53d219376e47c90f5c01ed9 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -112,6 +112,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "df.h"
#include "valtrack.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "obstack.h"
#include "statistics.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index d25a52d35da62f1aff212c9d797e7514870598e4..b424d929014dfaf9273a6c04510de4c3de9156ce 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -59,6 +59,10 @@
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "ggc.h"
#include "except.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 74313af11eb6565523406053a3e077656acd86a2..2906644dae622fe6d047e8742147a9370e041283 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -58,6 +58,10 @@
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "bfin-protos.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index ca563f89a371d11e50ad4b1c86dfe3d0c41d7adc..1b44baa728e2aa76640b6d8abb8d7bb84fdb5a6e 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -61,6 +61,10 @@
#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "target.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 19e281ef1500b7fe7e6af9be9c5f7d3d5ff40464..d3673fdf0b28776102767c22689af5b1a444c6e3 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -64,6 +64,10 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "df.h"
#include "opts.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 3460c54d9afdc4e52f2652f93a89780ad49eec50..ffefa37bcbe7aa362222387e06cc58ad77ece62b 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -45,6 +45,17 @@ along with GCC; see the file COPYING3. If not see
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "../../libcpp/internal.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index c9dfd87d99b8b380a6ec11ee0852b3b90c0f0118..ef898f35a0a04ffa8e231c258f1b0a4783202b1a 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -70,6 +70,10 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimplify.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 71a4f6a3996a7c140dbc60bcbab972162ff83c4c..2442f3464dca722effb8361acf4c1b4b4dbedc28 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -64,6 +64,10 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "langhooks.h"
#include "reload.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
@@ -71,7 +75,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
-#include "is-a.h"
#include "gimple.h"
#include "gimplify.h"
#include "cfgloop.h"
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 288cbde0ed0f9e96843ef8706a6cb7431dafd42f..3e7902f6e7ad81a5ab84b19aed1fb2dde21f79b0 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -60,6 +60,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
#include "builtins.h"
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 4549ee9da653d481163bd703bbe2a749a988db91..f9fc6d21da06c449ea5c9fa9a061aba973bd1b5f 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -63,6 +63,10 @@
#include "df.h"
#include "optabs.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
#include "rtl-iter.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 2f9d2da70f3901c03d1bbc6d8ffc880f2680c5a1..3c5ba86cfb26c42ecd646c94088c545c9d8a96de 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -82,6 +82,9 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "tree-pass.h"
#include "context.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
#include "rtl-iter.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 281e7c95d6c7005d182651fe980160de9c42c76b..cd13e77c854f6c1b10576486e79385222f632d28 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -86,6 +86,9 @@
#include "opts.h"
#include "tree-vectorizer.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "target-globals.h"
#include "builtins.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index 56a4b1407b1fbefcf597994f952f12c23221189c..3b2822833ee1916037e9c58157b599fac941cda9 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -68,6 +68,10 @@
#include "target-def.h"
#include "langhooks.h"
#include "opts.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 6b6bebc493e02a163e6dc42122064c70173a17b3..0f4fec1c9ca4c62114353f5f245d306675d2607d 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -57,6 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "context.h"
#include "pass_manager.h"
#include "tree-pass.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "dumpfile.h"
#include "diagnostic-core.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 90e69a36bc47d536b00c8c468ec2a946c3b4fc20..1a2e884a84bc3cef121ee9394c2d9bc1f6fba47f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,18 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * call.c: Adjust include files.
+ * class.c: Ditto.
+ * decl2.c: Ditto.
+ * decl.c: Ditto.
+ * lambda.c: Ditto.
+ * mangle.c: Ditto.
+ * method.c: Ditto.
+ * optimize.c: Ditto.
+ * parser.c: Ditto.
+ * semantics.c: Ditto.
+ * tree.c: Ditto.
+ * vtable-class-hierarchy.c: Ditto.
+
2014-10-24 Jason Merrill <jason@redhat.com>
Implement N3653 (Member initializers and aggregates) and fix
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 8a89aadeaf9c1ab70756feefe2f725d9695d5d46..31864e902d8729794ac111389a9a8174a8486005 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -40,6 +40,17 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "c-family/c-objc.h"
#include "timevar.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "wide-int.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 5f50aff2417fc2556e481327cf565a4f13e1b7b9..ce1d07c90efeb80617989b7e3920d08dccf98f61 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -35,6 +35,17 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "target.h"
#include "convert.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "dumpfile.h"
#include "splay-tree.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 1b214ab40907db0b18885b913498cc02e7b69337..320c39f636a2263384487a124edf4a967a7ef45e 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -58,6 +58,16 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "splay-tree.h"
#include "plugin.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cilk.h"
#include "wide-int.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 60c8a63e1b97ae696694121904df69821c0a1e48..ff407101f081e10e451a2a3e6878fe4758aab01f 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -45,6 +45,17 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-inline.h"
#include "c-family/c-pragma.h"
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index d4030e332e7e0c179046d934b65b7afd0998c2e7..01a508aad565e75ea06d0a489f2d898c9e3bee59 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -26,11 +26,22 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "stringpool.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "cp-tree.h"
#include "toplev.h"
-#include "vec.h"
/* Constructor for a lambda expression. */
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 55f508a272a0c09d4ef2adffd1594d8a440d671e..048c957519bb707ba7afb8cf6ec4a314caacbbd9 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -57,6 +57,17 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "flags.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "wide-int.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 418ed8874d09d0f76f3659b828f5b2dd86630a16..10751ed6ba6564c6f357550eb3e7de2fd07d8af0 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -35,6 +35,17 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "diagnostic.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* Various flags to control the mangling process. */
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index f37515ec257f91e39e52b86085285a66362b1bf0..62e32d21bfff5c75533a00d1f484030ccbdbc6ce 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -36,6 +36,15 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "tree-iterator.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* Prototypes. */
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 62a815eb42cf3d272a1b7ee4b325337b09a964dd..e142f42a4db2001cf2abbf2fc43c250446a7ba51 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -36,6 +36,17 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "diagnostic-core.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 26e66f512cf4bb6e01e606f5bb8660326ebbb081..0d757cadf9cdc0ab78c071a22226e658d45e3216 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -41,6 +41,17 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "timevar.h"
#include "diagnostic.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "target.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index ef7f6756ef6bf44836878242922ecc6b4cb64e15..32e7bd5499d93d89ac2d260304f9bff5581e32f5 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -32,6 +32,17 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "debug.h"
#include "convert.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "splay-tree.h"
#include "hash-table.h"
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index 54c5dd383a215216c2b0bb0bb81e1c898ca03647..4d6de986fc54b67b922269bd289cc816183562a3 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -115,6 +115,18 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "cp-tree.h"
#include "output.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "vtable-verify.h"
diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index 0aa604fa61a088dca40504b030e7647b26d72adc..1ee3e9c5e38d4a3bcdcb3d734a072c1daa964a3f 100644
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
/* Read a string from the string table in DATA_IN using input block
diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index 324003ead816fd8aef0a696f0e1fa76aa72a7953..ca8b3ab7f42ebc0eda0fd4142aa6a5c2ec1e2760 100644
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -39,6 +39,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
diff --git a/gcc/data-streamer.c b/gcc/data-streamer.c
index 3d15be11a7302796029ee08362d08092deb6544e..e11746a8ee16ea8e5e2796174d11bced53724a3e 100644
--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.c
@@ -38,6 +38,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
/* Pack WORK into BP in a variant of uleb format. */
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 3452d470b667b8bea170008587eb30cab70a3a90..9a84f5d2f08ecf522f29b87b7a94392088654924 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -98,6 +98,10 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "obstack.h"
#include "expr.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#ifdef XCOFF_DEBUGGING_INFO
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 3bce20f345a7114685ba8c7de004f294a5785055..77337bf40ebcb2e4d522f05155bad9959b176430 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -94,6 +94,10 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "ira.h"
#include "lra.h"
diff --git a/gcc/except.c b/gcc/except.c
index fae9f50fb8f38e35fc7c94429680196bc419a720..5f156b7a68f43aba2a2a86dd0c6f2fbcc3289f18 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -145,6 +145,10 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfgrtl.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "tree-pretty-print.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index 78bdfa24869a84c91227d73f254112ce902e3f92..c39a4b78ad6df56ea3c07547c985c49ac55478f4 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -61,6 +61,9 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-ssanames.h"
#include "target.h"
diff --git a/gcc/final.c b/gcc/final.c
index a3d004ca11fc5d099461701aac69e12d53736b36..d5fa89d95dd24a81eda4b129cc989468383df4bf 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -80,6 +80,10 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "expr.h"
#include "tree-pass.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-ssa.h"
#include "coverage.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 218afa01ab4b9a834d074faa389b9b63963c84fc..b5a023ae11ed318348531eb6ae2192ab385d7aaf 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -77,6 +77,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "hash-table.h" /* Required for ENABLE_FOLD_CHECKING. */
#include "builtins.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "generic-match.h"
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6c84d6192edbcdf2b1bf04c37e1ad4404e44be04..743b1d4f4c9ffc6fd2da65d1f1cc625e5f3a1b75 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * f95-lang.c: Adjust include files.
+ * trans-decl.c: Ditto.
+
2014-10-24 Tobias Burnus <burnus@net-b.de>
* check.c (check_co_collective): Reject coindexed A args.
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 403ab200830cf3be0edd1cde01bd3983fab4dd93..9c3ff228b77126f12b99b177087b42b698bfd4f7 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -47,6 +47,10 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "diagnostic.h" /* For errorcount/warningcount */
#include "dumpfile.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cpp.h"
#include "trans.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 3fbc789b3469e29ccc229067eb24ed23ba5061cf..07fefd90b2ab431121cb609457ae46d54f7e7e82 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "function.h"
#include "flags.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "debug.h"
#include "constructor.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index b632fb3a8abaaa89a4ac91f51fe247710e606a42..f1c13a50d04fd0b27b3530d5f67ab06d410ccf57 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
/* Event names. */
enum plugin_event
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index e48b448b3fcc5e588f683173e438a96e47ee052b..f96c5931ce0ba30096e2d6a03dbf4c87c7e548c4 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -1830,9 +1830,9 @@ open_base_files (void)
"hashtab.h", "splay-tree.h", "obstack.h", "bitmap.h", "input.h",
"tree.h", "rtl.h", "wide-int.h", "hashtab.h", "hash-set.h", "vec.h",
"machmode.h", "tm.h", "hard-reg-set.h", "input.h", "predict.h",
- "function.h", "insn-config.h", "expr.h",
+ "function.h", "insn-config.h", "expr.h", "alloc-pool.h",
"hard-reg-set.h", "basic-block.h", "cselib.h", "insn-addr.h",
- "optabs.h", "libfuncs.h", "debug.h", "ggc.h", "cgraph.h",
+ "optabs.h", "libfuncs.h", "debug.h", "ggc.h",
"hash-table.h", "vec.h", "ggc.h", "dominance.h", "cfg.h", "basic-block.h",
"tree-ssa-alias.h", "internal-fn.h", "gimple-fold.h", "tree-eh.h",
"gimple-expr.h", "is-a.h",
@@ -1841,8 +1841,8 @@ open_base_files (void)
"tree-ssa-loop.h", "tree-ssa-loop-ivopts.h", "tree-ssa-loop-manip.h",
"tree-ssa-loop-niter.h", "tree-into-ssa.h", "tree-dfa.h",
"tree-ssa.h", "reload.h", "cpp-id-data.h", "tree-chrec.h",
- "except.h", "output.h", "cfgloop.h",
- "target.h", "ipa-prop.h", "lto-streamer.h", "target-globals.h",
+ "except.h", "output.h", "cfgloop.h", "target.h", "lto-streamer.h",
+ "target-globals.h", "ipa-ref.h", "cgraph.h", "ipa-prop.h",
"ipa-inline.h", "dwarf2out.h", NULL
};
const char *const *ifp;
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index af0c1ef1e63cabf3a78f545eb959e87243e315fa..f55c4e9c6fb2796ce6f2c8619af099fc8b8be248 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -30,6 +30,17 @@ along with GCC; see the file COPYING3. If not see
#include "ggc-internal.h"
#include "timevar.h"
#include "params.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cfgloop.h"
#include "plugin.h"
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index d0554f4e54f7ec5a07f62612f16e2738bcec753f..088a0dd0f33ba1a20002da4cba894264f465f4fc 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -55,6 +55,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "tree-ssa-propagate.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "gimple-pretty-print.h"
#include "tree-ssa-address.h"
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index f7253dcf90c96e4fba2577aa8616dcfc10087103..d64a46f8c7e22a54ff4aab7603782a7acf0cf1ec 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -42,6 +42,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index e53f92aeb2794e35d5193ecdba16ababd55e2966..6ae781745d4bf18279a7a551aa117cef39db8993 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -45,6 +45,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-ssanames.h"
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index efcbb347be3d4c8b5cd4f8bd91ae62ef723ff7cb..d1930dc281de3ea0d3d24e5599151c35727f9403 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -47,6 +47,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-phinodes.h"
#include "stringpool.h"
#include "tree-ssanames.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.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 d2aa68953f3a1990085b66cd624a188f8e283886..34a19134f0b0150574041c03cb4744cee19a28d2 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@@ -41,6 +41,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "gimple-streamer.h"
#include "lto-streamer.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 30260595903f0ab6306d6b6d17e669cea50207ea..38be0ce9f540398dba07b159e990b9848d501ad5 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -57,6 +57,9 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "bitmap.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-ssanames.h"
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 9d33a6a05bf5fe6d5e75e9b09bf7a8805044301e..97aae4bbf2f2e64d55cb6176cf89ee5969001272 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * go-gcc.cc: Adjust include files.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* go-gcc.cc: Adjust include files.
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 91b07c6e9365474594c3cb5dd4f5aea9f8bcec18..9aad6b07b5c79356da9cfc5f92266f32db5f9d70 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -29,8 +29,9 @@
#include "stor-layout.h"
#include "varasm.h"
#include "tree-iterator.h"
-#include "cgraph.h"
-#include "convert.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
@@ -39,6 +40,9 @@
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "convert.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "langhooks.h"
diff --git a/gcc/ipa-comdats.c b/gcc/ipa-comdats.c
index b270d9717b27caac6c04292da58456880ac6eaf9..af2aef8efad20cd19a6071267b5b43e4cb7b67ae 100644
--- a/gcc/ipa-comdats.c
+++ b/gcc/ipa-comdats.c
@@ -53,9 +53,19 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
-#include "hash-map.h"
/* Main dataflow loop propagating comdat groups across
the symbol table. All references to SYMBOL are examined
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 13da4af13a390d06cbcd25735eda9095128d085f..3331dca7f8b0d77e9600519c5ea024221e5b70e2 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -109,6 +109,20 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "predict.h"
#include "basic-block.h"
+#include "vec.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "bitmap.h"
#include "tree-pass.h"
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index e9bc85327047a1761f883a31925c5a9c4407f363..32c654906b157d0d886163b9e5a31c5f9d921d97 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -114,10 +114,20 @@ along with GCC; see the file COPYING3. If not see
#include "calls.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "expr.h"
#include "tree-pass.h"
-#include "hash-set.h"
#include "target.h"
#include "hash-table.h"
#include "inchash.h"
@@ -128,6 +138,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-fold.h"
#include "gimple-expr.h"
#include "gimple.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "diagnostic.h"
#include "tree-dfa.h"
@@ -136,7 +148,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "stor-layout.h"
#include "intl.h"
-#include "hash-map.h"
/* Hash based set of pairs of types. */
typedef struct
diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c
index 827f53fbd76c7a20328a4e757daec71ee8cdbbe7..d3f379557f16528d59a1f33b3314c79bd1797375 100644
--- a/gcc/ipa-icf-gimple.c
+++ b/gcc/ipa-icf-gimple.c
@@ -48,6 +48,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "cfgloop.h"
#include "except.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "ipa-utils.h"
#include <list>
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 23816f866a7aa613ef632061eecd039e7093f879..975894beee0d71e559982b0eccae6a47450d2cb9 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -82,6 +82,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "tree-pass.h"
#include "gimple-pretty-print.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "cfgloop.h"
#include "except.h"
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 7da02cda91c435d041e9062cd59f9325db0c9b9d..68b9de07eb97faf6c3e197254931faaac991b878 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -105,12 +105,16 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "tree-streamer.h"
#include "ipa-inline.h"
-#include "alloc-pool.h"
#include "cfgloop.h"
#include "tree-scalar-evolution.h"
#include "ipa-utils.h"
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 1cb4c0520e83d7fe121b6debcd0e8c6a57bafe0a..dbc56c599b0a4551832938253c12e4903c4f03f0 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -38,6 +38,19 @@ along with GCC; see the file COPYING3. If not see
#include "coverage.h"
#include "ggc.h"
#include "tree-cfg.h"
+#include "vec.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.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 bb8c99d228718132f8c12ba4c0ef4ebab27eea88..d599900fba79d90f7c0251bdcc52c311ee4d48a3 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -124,6 +124,11 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "except.h"
#include "target.h"
diff --git a/gcc/ipa-inline.h b/gcc/ipa-inline.h
index 8edf49621adaeddcbe8574a0f068bb564bd5da8b..2ac6e4e93cb2acee18e0c9732223d59c36597760 100644
--- a/gcc/ipa-inline.h
+++ b/gcc/ipa-inline.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_IPA_INLINE_H
#define GCC_IPA_INLINE_H
-#include "ipa-prop.h"
/* Representation of inline parameters that do depend on context function is
inlined into (i.e. known constant values of function parameters.
diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index 3f2d303b28941e8c829fa2246214a99082ee3bc5..33dd1a8c384c45436f29cdf0fabc476c614e1c86 100644
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@@ -34,12 +34,25 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "gimple-expr.h"
#include "gimple.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "diagnostic.h"
#include "tree-dfa.h"
diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c
index 482d007d6c0388348a5a6f8176bb7fc93e67f55d..b83d1cf7cbcda3f3dd8244a3daef03df3c2920c4 100644
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@@ -53,6 +53,17 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
#include "tree-ssa-alias.h"
@@ -71,6 +82,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "lto-streamer.h"
#include "data-streamer.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
/* Entry in the histogram. */
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index b574889a98d7e1e073aac95b42d8b3a10b1ad164..db85c7d1e7f92218a37a6e1f4df43d944538b8f6 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -49,6 +49,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-walk.h"
#include "langhooks.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "bitmap.h"
#include "gimple-ssa.h"
diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h
index d2f0c675846ef5e2b7d294764ff27394573864b2..165fc1a7f459d255399f4b4b2b646fe4b6689a40 100644
--- a/gcc/ipa-prop.h
+++ b/gcc/ipa-prop.h
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef IPA_PROP_H
#define IPA_PROP_H
-#include "vec.h"
-#include "cgraph.h"
-#include "alloc-pool.h"
/* The following definitions and interfaces are used by
interprocedural analyses or parameters. */
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 7613e1cf000fcd5c750b5d23f2671fdc7f2ab46e..74aefafce8106779241d09fa686d690f394d1be2 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -63,6 +63,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-pass.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-ref.c b/gcc/ipa-ref.c
index 4b23f5fe574449f985bc311e3fc23b5ebee74ff1..42b703aa170310c19ac8bd0190689248f5a3cd31 100644
--- a/gcc/ipa-ref.c
+++ b/gcc/ipa-ref.c
@@ -24,6 +24,18 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "ggc.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "ipa-utils.h"
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 6993f93c45b638315776167befed749a9d4218c5..b421f63fcb72bb56dcb3759e4ec29af1c15493bd 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -59,7 +59,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-pass.h"
#include "splay-tree.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
+#include "bitmap.h"
#include "ipa-reference.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-reference.h b/gcc/ipa-reference.h
index 3e7dc73198090dfad9a9fb2f792efc90809e7f76..bca6fb2e680937118e207317ccd462a8a46366b2 100644
--- a/gcc/ipa-reference.h
+++ b/gcc/ipa-reference.h
@@ -20,8 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_IPA_REFERENCE_H
#define GCC_IPA_REFERENCE_H
-#include "bitmap.h"
-#include "cgraph.h"
/* In ipa-reference.c */
bitmap ipa_reference_get_not_read_global (struct cgraph_node *fn);
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 6a5f5c012e81ecb19fec26baab412f975dc4bdc0..ac68c87f2823adf963b22db4a6afb69c84fd39ae 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -104,6 +104,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "gimple-ssa.h"
#include "tree-cfg.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index e4ea84c27b5ba0e5a72abbb15c3903a2e09e533d..22900ccaac6856f7bedabef9ae1ee57dd68b7fd0 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -43,12 +43,19 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "langhooks.h"
#include "splay-tree.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
+#include "bitmap.h"
#include "ipa-reference.h"
#include "flags.h"
#include "diagnostic.h"
#include "langhooks.h"
#include "lto-streamer.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
/* Debugging function for postorder and inorder code. NOTE is a string
diff --git a/gcc/ipa-utils.h b/gcc/ipa-utils.h
index e1b2d548121fa8d082a394a6b554f0247ccee213..b3701af7c24b470e66f2d08277edda5e28cf2203 100644
--- a/gcc/ipa-utils.h
+++ b/gcc/ipa-utils.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_IPA_UTILS_H
#define GCC_IPA_UTILS_H
-#include "cgraph.h"
struct ipa_dfs_info {
int dfn_number;
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index 42d528c6634c9ddf7a3270ed50fc429ce584c167..b0823fff8c9efe99a227020fa4a134a5cd097b0c 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -77,6 +77,17 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
#include "calls.h"
diff --git a/gcc/ipa.c b/gcc/ipa.c
index b28e7cced524555c075fb9996c7aa06b9f38781a..8562102ea80acdf9cd68e6c4067b949793a227ef 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@@ -26,16 +26,27 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "predict.h"
#include "basic-block.h"
-#include "cgraph.h"
-#include "tree-pass.h"
#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "tree-pass.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "flags.h"
#include "target.h"
#include "tree-iterator.h"
#include "ipa-utils.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "tree-inline.h"
#include "profile.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 6d3813e7935df03f5e7d46e056c2f36f143dfa44..731d2d43f94b7a592238b79d169a86221b53e6d9 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * class.c: Adjust include files.
+ * decl.c: Ditto.
+ * jcf-parse.c: Ditto.
+ * resource.c: Ditto.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* java-gimplify.c: Adjust include files.
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 2c29a44837c6c66d35b0eafd16edf2a4ca396020..7597af75d63cf3f13dc7d7eb0a949ddb21b8cb56 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -47,6 +47,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "input.h"
#include "function.h"
#include "ggc.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "target.h"
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 7271ea70aba334b385d9656ab22e3e79044a9cea..fbd09a3d08946cf7cf2bd16d211e9c8a0ca9ef33 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -38,13 +38,24 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "java-except.h"
#include "ggc.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-inline.h"
#include "target.h"
#include "version.h"
#include "tree-iterator.h"
#include "langhooks.h"
-#include "cgraph.h"
#if defined (DEBUG_JAVA_BINDING_LEVELS)
extern void indent (void);
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 9c4a9cf8be6e75ca2f2f6cee99de9862af4b0ebb..a94b15110a746726a06539d366f2621d1943cc35 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -38,6 +38,17 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "parse.h"
#include "ggc.h"
#include "debug.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "bitmap.h"
#include "target.h"
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index bc9e029a679686fc3b35495fbc7dbb69fa73ee6d..c0a9249bf9ca1ff5fe8e597c3add3ce417ca17f9 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -42,6 +42,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "function.h"
#include "ggc.h"
#include "tree-iterator.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* A list of all the resources files. */
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 4bdeaa066f848e8c99dfc065959bfc09afdbe950..2461fc5f66831b80031ff3766a822e9343f8f41a 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -37,6 +37,17 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks-def.h"
#include "diagnostic.h"
#include "tree-diagnostic.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "timevar.h"
#include "output.h"
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 3071f0c0c86bd1c692f47e1abc282e3b90eccef7..28ec341f5654aa84f87f0a77773e43dd3c574dc2 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -48,6 +48,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "except.h"
#include "timevar.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "tree-streamer.h"
diff --git a/gcc/lto-compress.c b/gcc/lto-compress.c
index fa4b8f49e4d1a2063dc839b2561c6cbaad28f41a..fec42f9a6e323a20c28682b5494abc135782d959 100644
--- a/gcc/lto-compress.c
+++ b/gcc/lto-compress.c
@@ -45,6 +45,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c
index ea2a2456e481824f3dbd697094df46e7e7426793..d1d153d04087f6f2db221b7608c61bc243642a32 100644
--- a/gcc/lto-opts.c
+++ b/gcc/lto-opts.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "options.h"
#include "common/common-target.h"
#include "diagnostic.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "toplev.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index 2485da99c247f83a38b2e4f5ebfc58c6ad7f2835..042dd99fc43e75d5e69e08524d8ad94aabe021c0 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "except.h"
#include "timevar.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index bb0b394e6438351a792558a8569776ae60ba2ace..8089d5df79f3c05edcf9280547c1b5a7f1455d16 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -42,6 +42,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "except.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 52186b5426e03a2646468e20d0c356e651ace587..d271af7fa9df184fd2ef0c9a69ccb04e8dfcc7c4 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -57,6 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "except.h"
#include "debug.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "data-streamer.h"
#include "gimple-streamer.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 39931e39e158b7ce011a0a5456fc652faa2574f3..dc406da67e392250de955854c28258efecf1f49c 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -54,6 +54,10 @@ along with GCC; see the file COPYING3. If not see
#include "inchash.h"
#include "except.h"
#include "lto-symtab.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "gimple-streamer.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index cb647bd3d2b6f5f07a47914790e18c5762bcafcb..b6cac0b5e9976acb74489d54190912566538f6b6 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -43,6 +43,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "bitmap.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index 63e4b32d8e53a34d6f69a2a2a54cb8f9873b1fb2..4b875a2b8ba0faf385d84b4ffe9ce1ac628cd96b 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "hash-map.h"
#include "target.h"
-#include "cgraph.h"
#include "vec.h"
#include "alloc-pool.h"
#include "gcov-io.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 39a05e8cc4a9f4eff11eb5be4609de188308e83c..426aedfe76038b3187d1b890355cec20c464522a 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * lto.c: Adjust include files.
+ * lto-lang.c: Ditto.
+ * lto-object.c: Ditto.
+ * lto-partition.c: Ditto.
+ * lto-symtab.c: Ditto.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* lto-lang.c: Adjust include files.
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 8ecce5da8db37dcac485bbd4e0f3fa46e321947c..bcef4de909640b83ac8251d876a669a9a860b81e 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -49,6 +49,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "toplev.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "cilk.h"
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index 28b459cfa54b2d0adb931df2da535c6c01eb82ca..1178326b99199f4588ed2e1e3de82b4c5e75d8bb 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.c
@@ -39,6 +39,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "lto.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
#include "simple-object.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index b6472753da7059a4441802279a94b566a5297c8e..c38931b3f9541e556627a66c19dc00d0699d4f8d 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -37,10 +37,15 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "lto-streamer.h"
#include "timevar.h"
#include "params.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "ipa-utils.h"
#include "lto-partition.h"
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index 9ee3cd28d339247d8195cca41fa4e6a6d145e6d3..4c4e48af3341e711dc8a2a9b6f8701f30722f2a8 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -39,8 +39,13 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "plugin-api.h"
+#include "hash-map.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "ipa-utils.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "builtins.h"
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 1234cee4135758e4c14973eb4d1002ffe6a81e7a..d8519d9426b1a4418eeeadae83e960c043332fdb 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -29,20 +29,30 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-ssa-operands.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "bitmap.h"
-#include "hash-map.h"
#include "inchash.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "common.h"
#include "debug.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
-#include "is-a.h"
#include "gimple.h"
#include "lto.h"
#include "lto-tree.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index dcd74889e8853de37308b217e71a8f6398643ad7..0f0f5b2f4d5f910c389739a478c19389675845cd 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * objc-act.c: Adjust include files.
+
2014-10-22 Alan Modra <amodra@gmail.com>
* objc-encoding.c (encode_array): Cast result of obstack_base.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 13decfa7e7146311d0b3aedba72faa4a2a369e3f..12614feb0474c5c866db4e5227e120f76f0dc130 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -54,6 +54,10 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-target.h"
#include "diagnostic-core.h"
#include "intl.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "hash-table.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index fe9bf80c06476c7a5a446d322a328ec3a44b3bd3..9098f0abb916a2da7ee6abaeae9b92d8e7949f7e 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -56,6 +56,9 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "diagnostic-core.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
@@ -77,6 +80,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-low.h"
#include "tree-cfgcleanup.h"
#include "pretty-print.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "tree-nested.h"
#include "tree-eh.h"
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 149abc41a16929ac80aeb8f25e7a545361c0cb75..6825943a8a5edd64c10bbac6bf465c26eb2e7643 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "dbgcnt.h"
#include "debug.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "output.h"
#include "plugin.h"
diff --git a/gcc/passes.c b/gcc/passes.c
index 8432de8cd60003e6fa4ec01c7ca2c3e3374efdb2..f9d15b89205d914b8bd22b9f446a061267195494 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -80,6 +80,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "tree-dump.h"
#include "df.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "plugin.h"
#include "ipa-utils.h"
@@ -88,7 +92,6 @@ along with GCC; see the file COPYING3. If not see
#include "pass_manager.h"
#include "tree-ssa-live.h" /* For remove_unused_locals. */
#include "tree-cfgcleanup.h"
-#include "hash-map.h"
using namespace gcc;
diff --git a/gcc/predict.c b/gcc/predict.c
index 7ecaab38db13df84f5c158a357a55076f668c791..714a88d72715bfd50b75539a0cf6df23294cc1be 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -68,6 +68,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 9563e4dfaec7c759405d54b82122b26891a32336..18783511d1953a218bbbecd8e829d2569d6f4fa6 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -31,6 +31,17 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h" /* FIXME */
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-dump.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index d0063d178ec090eaa91b955680f2581c0f61c17c..a84d5fd10be0f8ce803a340f61f87fb6a817a017 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -80,6 +80,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-cfg.h"
#include "cfgloop.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "profile.h"
diff --git a/gcc/ree.c b/gcc/ree.c
index c992e8a3cd629ded7b36350eb205edd5affd99a8..792f04991dd805d5bf9ba2cb947baa4aa36fbc55 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -248,6 +248,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "tree-pass.h"
#include "df.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* This structure represents a candidate for elimination. */
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index fcfabf3bc1ab7ec0146fae6f50843ffdb0742138..b97b7d7b2598785c44e7a4cfc2a035c0210fee5a 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -43,6 +43,10 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "regs.h"
#include "params.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-inline.h"
#include "tree-dump.h"
diff --git a/gcc/symtab.c b/gcc/symtab.c
index 0b1a12146ccab8fc546a7c6fd90102e99346940b..44bb3a6a929c885fb99d7489996be8f3b0d56cdb 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -43,6 +43,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "tree-inline.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "timevar.h"
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 7d8cefadc2132955f26ea9efd1a825cea41cd8ba..2c570d4afd6019c72042dc4392d5516673e40e1c 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -69,6 +69,10 @@ along with GCC; see the file COPYING3. If not see
#include "hosthooks.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "opts.h"
#include "opts-diagnostic.h"
@@ -87,6 +91,7 @@ along with GCC; see the file COPYING3. If not see
#include "pass_manager.h"
#include "auto-profile.h"
#include "dwarf2out.h"
+#include "bitmap.h"
#include "ipa-reference.h"
#include "ipa-prop.h"
#include "gcse.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 4b0b6422498cd2328db23c2fa95e7d20a82fd6c7..4f451c51478142d82d202f063022882003c05671 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -48,6 +48,9 @@
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "stringpool.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index a1793e81955731f12d27a19133798ef4c460816e..ee10bc614b1c265b370efaa86b3b83f8900a952d 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -54,6 +54,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 7a6e04aeb57130d1e00fbde418e2b921beddd2eb..ebd9a3aec155546da79f573a19ff2d005ca4d323 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -48,6 +48,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index eaf977784726714e8d29e032682e8b4dacfe1436..c4f9fb6d3d1a2c56d7deba3d05291b4b2ed18ee5 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -44,6 +44,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-walk.h"
#include "tree-pass.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-phinodes.h"
#include "ssa-iterators.h"
@@ -53,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "targhooks.h"
#include "tree-iterator.h"
-#include "hash-map.h"
/* Whenever a target does not support thread-local storage (TLS) natively,
we can emulate it with some run-time support in libgcc. This will in
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index ea62c86476807c887f2f7896b72bd2a9ddf3ff5b..7ccd66d064ad2b0453562fc4ee2b625e399883dd 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -69,6 +69,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "except.h"
#include "debug.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "value-prof.h"
#include "tree-pass.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index d0041c92c93f81b50755f7c7b75362a467ca569a..68043f9fa4068d1d26ed64b05f89659125411d1a 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -46,6 +46,9 @@
#include "gimple-walk.h"
#include "tree-iterator.h"
#include "bitmap.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "expr.h" /* FIXME: For STACK_SAVEAREA_MODE and SAVE_NONLOCAL. */
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index a74d85adc8111847eb652d88d4a4c876caa9d39a..bafdc5c70d6b07b4cff21c4d05fc23b4059be2ca 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -30,6 +30,15 @@ along with GCC; see the file COPYING3. If not see
#include "hash-set.h"
#include "gimple-expr.h"
#include "predict.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "tree-iterator.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 70a51f6cd90bb5acdc49af955ce814d7461ec4de..1db1de0c8e52825fe798f92bfaf67bcf9e79973c 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -54,6 +54,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "stringpool.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index f2013f8d61ab22307c0d330482ec9cdec2b410b2..b723ca52b668bf90d352f0d322771e1e5ab55ed9 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -112,6 +112,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-prop.h"
#include "statistics.h"
#include "params.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 29543d6973039dafd4d361fed0ae4555bfd2c7bb..2ad57cd00e2ab0732ea31832d2d945ecda396764 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -55,6 +55,11 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "alloc-pool.h"
#include "tree-ssa-alias.h"
+#include "bitmap.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-reference.h"
/* Broad overview of how alias analysis on gimple works:
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 4be72ccf7849952149fde5958f0e758abdb383e9..73ad46aedacb1a576e46c9f3c6fc16d21023f892 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -63,6 +63,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 38b9d321affb8ffeccc141efa13505404967cd19..cfa5babd36aeaba2074dedeb8751f0e04b69a064 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -92,6 +92,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 7774755f789872cc2603d5f61844f9f9ce203e56..736fbf87c3a78ca2d4208942af71ca9e63319287 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -73,6 +73,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "dbgcnt.h"
#include "domwalk.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-prop.h"
#include "tree-ssa-propagate.h"
#include "ipa-utils.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 129798ae21ab7426117d36c6e6888221ce45470e..36213772f4cb19f5d90a6bb5755f45e76a13b78b 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -48,6 +48,9 @@
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "stringpool.h"
#include "tree-ssanames.h"
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index d6db46fc762989efa7f097de45598c81130d13b6..dfe7775691401864f001f0da7150170a232031d7 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 94eab797738659f6000ddad4e29c919da30bd298..7419f5ae34f8b8671dd03af26a8c0e910a62d645 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c
index 709e392045f7a5cd83973fd04e387c7b598ad3de..102cb2256eaa638d925595e37c091fb03191e3b2 100644
--- a/gcc/tree-streamer.c
+++ b/gcc/tree-streamer.c
@@ -41,6 +41,9 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "streamer-hooks.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
/* Check that all the TS_* structures handled by the streamer_write_* and
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 687b0b7848b6e73b746b5a0856f750984c978716..913bad4cbbe1f87a9c3b8767f9f4f3d8929f7510 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -53,6 +53,9 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index e5da0909a63cfedd5d3a6da091e54027c192f8ce..551ddcbc4a8ab88ee613894f699d4b5b7c6fa3a9 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -59,6 +59,10 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "cfgloop.h"
#include "common/common-target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
/* The file implements the tail recursion elimination. It is also used to
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 1d30bdf78cbd66874906c5f7444ce30c4c391feb..4387de0f921ffac9b876636f8d4636965c83c0ff 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -63,6 +63,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-scalar-evolution.h"
#include "tree-vectorizer.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* Need to include rtl.h, expr.h, etc. for optabs. */
#include "expr.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 681479ed911e9ff0fadc8d52576086ed3bbaca5a..0650c6cafc1b98e23a7feab6da40e50647c2104c 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -64,6 +64,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "tree-vectorizer.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 1a15c81955299c1342c2c737866ed74abb7b7ff2..dc37d1fc029fa15b63333aa2040ff53ddf153487 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -81,6 +81,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-phinodes.h"
#include "ssa-iterators.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index 02a73042626002bb7976e8d43f477df60302c04f..19fa89e01869bd62806e97d913cb1a4374685f89 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -68,6 +68,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-phinodes.h"
#include "stringpool.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index 05771049b2173d662fb4db3367217b3f6f1c017b..3685b8a43d78578a51a222958e9a204b9c97aaae 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -45,6 +45,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "stringpool.h"
diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 7e056356c953bcf5277e128be6beee751cb1cf28..568f3c95ea087a15795fdea086b891f2492f000a 100644
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -29,6 +29,18 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfganal.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
#include "tree-ssa-alias.h"
@@ -39,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "gimple-walk.h"
-#include "hashtab.h"
#include "output.h"
#include "tm_p.h"
#include "toplev.h"
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 889720ed0526bdea0f2631484a0de6ab18b7ec09..a65ccb8e8c92ef037889c96365a21390abf9a6ac 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -65,6 +65,10 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "dumpfile.h"
#include "profile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "builtins.h"
#include "tree-nested.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index a1e5d5d4ef60b71bebe17901a16b826abb81d74b..61cda94e55466a087faa586f3b2f49a6a9832e37 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -57,6 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "asan.h"
#include "rtl-iter.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 50b5665a291883cbb3b975ddfa5ea83057710848..3d1ab690dcb9382ba4909c6c8ce148e1ced942b6 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -26,10 +26,20 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "diagnostic-core.h"
-#include "hashtab.h"
#include "timevar.h"
#include "debug.h"
#include "target.h"
@@ -39,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-alias.h"
#include "gimple.h"
#include "lto-streamer.h"
-#include "hash-set.h"
const char * const tls_model_names[]={"none", "tls-emulated", "tls-real",
"tls-global-dynamic", "tls-local-dynamic",