function.h (ipa_opt_pass, [...]): Move forward declarations.

2015-06-25 Andrew MacLeod <amacleod@redhat.com> * function.h (ipa_opt_pass, ipa_opt_pass_d): Move forward declarations. * cgraph.h: Include ipa-ref.h and plugin-api.h. (ipa_opt_pass, ipa_opt_pass_d)): Relocate forward declarations here. (symtab_node::address_can_be_compared_p): Move function. * cgraph.c (symtab_node::address_can_be_compared_p): Relocate function definition here. * asan.c: Remove ipa-ref.h and plugin-api.h from include list. * auto-profile.c: Likewise. * bb-reorder.c: Likewise. * builtins.c: Likewise. * calls.c: Likewise. * cfgexpand.c: Likewise. * cgraphbuild.c: Likewise. * cgraphclones.c: Likewise. * cgraphunit.c: Likewise. * combine.c: Likewise. * coverage.c: Likewise. * data-streamer-in.c: Likewise. * data-streamer-out.c: Likewise. * data-streamer.c: Likewise. * dbxout.c: Likewise. * dwarf2out.c: Likewise. * except.c: Likewise. * expr.c: Likewise. * final.c: Likewise. * fold-const.c: Likewise. * ggc-page.c: Likewise. * gimple-fold.c: Likewise. * gimple-iterator.c: Likewise. * gimple-pretty-print.c: Likewise. * gimple-streamer-in.c: Likewise. * gimple-streamer-out.c: Likewise. * gimple.c: Likewise. * gimplify.c: Likewise. * ipa-chkp.c: Likewise. * ipa-comdats.c: Likewise. * ipa-cp.c: Likewise. * ipa-devirt.c: Likewise. * ipa-icf-gimple.c: Likewise. * ipa-icf.c: Likewise. * ipa-inline-analysis.c: Likewise. * ipa-inline-transform.c: Likewise. * ipa-inline.c: Likewise. * ipa-polymorphic-call.c: Likewise. * ipa-profile.c: Likewise. * ipa-prop.c: Likewise. * ipa-pure-const.c: Likewise. * ipa-ref.c: Likewise. * ipa-reference.c: Likewise. * ipa-split.c: Likewise. * ipa-utils.c: Likewise. * ipa-visibility.c: Likewise. * ipa.c: Likewise. * langhooks.c: Likewise. * lto-cgraph.c: Likewise. * lto-compress.c: Likewise. * lto-opts.c: Likewise. * lto-section-in.c: Likewise. * lto-section-out.c: Likewise. * lto-streamer-in.c: Likewise. * lto-streamer-out.c: Likewise. * lto-streamer.c: Likewise. * omp-low.c: Likewise. * opts-global.c: Likewise. * passes.c: Likewise. * predict.c: Likewise. * print-tree.c: Likewise. * profile.c: Likewise. * ree.c: Likewise. * sanopt.c: Likewise. * stor-layout.c: Likewise. * symtab.c: Likewise. * toplev.c: Likewise. * trans-mem.c: Likewise. * tree-cfg.c: Likewise. * tree-chkp.c: Likewise. * tree-eh.c: Likewise. * tree-emutls.c: Likewise. * tree-inline.c: Likewise. * tree-nested.c: Likewise. * tree-parloops.c: Likewise. * tree-pretty-print.c: Likewise. * tree-profile.c: Likewise. * tree-sra.c: Likewise. * tree-ssa-alias.c: Likewise. * tree-ssa-live.c: Likewise. * tree-ssa-loop-ivcanon.c: Likewise. * tree-ssa-loop-ivopts.c: Likewise. * tree-ssa-pre.c: Likewise. * tree-ssa-sccvn.c: Likewise. * tree-ssa-strlen.c: Likewise. * tree-ssa-structalias.c: Likewise. * tree-streamer-in.c: Likewise. * tree-streamer-out.c: Likewise. * tree-streamer.c: Likewise. * tree-switch-conversion.c: Likewise. * tree-tailcall.c: Likewise. * tree-vect-data-refs.c: Likewise. * tree-vect-stmts.c: Likewise. * tree-vectorizer.c: Likewise. * tree.c: Likewise. * tsan.c: Likewise. * ubsan.c: Likewise. * value-prof.c: Likewise. * varasm.c: Likewise. * varpool.c: Likewise. * config/arm/arm.c: Likewise. * config/bfin/bfin.c: Likewise. * config/c6x/c6x.c: Likewise. * config/cris/cris.c: Likewise. * config/darwin-c.c: Likewise. * config/darwin.c: Likewise. * config/i386/i386.c: Likewise. * config/i386/winnt.c: Likewise. * config/microblaze/microblaze.c: Likewise. * config/mips/mips.c: Likewise. * config/rs6000/rs6000.c: Likewise. * config/rx/rx.c: Likewise. * config/s390/s390.c: Likewise. * config/tilegx/mul-tables.c: Likewise. ada 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * gcc-interface/trans.c: Remove ipa-ref.h and plugin-api.h from include list. * gcc-interface/utils.c: Likewise. c 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * c-decl.c: Remove ipa-ref.h and plugin-api.h from include list. * c-parser.c: Likewise. c-family 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * c-common.c: Remove ipa-ref.h and plugin-api.h from include list. * c-gimplify.c: Likewise. * c-pragma.c: Likewise. * c-ubsan.c: Likewise. * cilk.c: Likewise. cp 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * call.c: Remove ipa-ref.h and plugin-api.h from include list. * class.c: Likewise. * cp-ubsan.c: Likewise. * decl.c: Likewise. * decl2.c: Likewise. * lambda.c: Likewise. * mangle.c: Likewise. * method.c: Likewise. * optimize.c: Likewise. * parser.c: Likewise. * semantics.c: Likewise. * tree.c: Likewise. * vtable-class-hierarchy.c: Likewise. fortran 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * f95-lang.c: Remove ipa-ref.h and plugin-api.h from include list. * trans-decl.c: Likewise. go 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * go-gcc.cc: Remove ipa-ref.h and plugin-api.h from include list. java 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * class.c: Remove ipa-ref.h and plugin-api.h from include list. * decl.c: Likewise. * jcf-parse.c: Likewise. * resource.c: Likewise. jit 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * dummy-frontend.c: Remove ipa-ref.h and plugin-api.h from include list. * jit-playback.c: Likewise. lto 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * lto-lang.c: Remove ipa-ref.h and plugin-api.h from include list. * lto-object.c: Likewise. * lto-partition.c: Likewise. * lto-symtab.c: Likewise. * lto-tree.h: Likewise. * lto.c: Likewise. objc 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * objc-act.c: Remove ipa-ref.h and plugin-api.h from include list. From-SVN: r224986
2015-06-25 18:32:38 +00:00 · 2015-06-25 18:32:38 +00:00 · f088993974
parent 67b0404e12
commit f088993974
166 changed files with 231 additions and 324 deletions
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@ -1,3 +1,126 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* function.h (ipa_opt_pass, ipa_opt_pass_d): Move forward declarations.
+	* cgraph.h: Include ipa-ref.h and plugin-api.h.
+	(ipa_opt_pass, ipa_opt_pass_d)): Relocate forward declarations here.
+	(symtab_node::address_can_be_compared_p): Move function.
+	* cgraph.c (symtab_node::address_can_be_compared_p): Relocate function
+	definition here.
+	* asan.c: Remove ipa-ref.h and plugin-api.h from include list.
+	* auto-profile.c: Likewise.
+	* bb-reorder.c: Likewise.
+	* builtins.c: Likewise.
+	* calls.c: Likewise.
+	* cfgexpand.c: Likewise.
+	* cgraphbuild.c: Likewise.
+	* cgraphclones.c: Likewise.
+	* cgraphunit.c: Likewise.
+	* combine.c: Likewise.
+	* coverage.c: Likewise.
+	* data-streamer-in.c: Likewise.
+	* data-streamer-out.c: Likewise.
+	* data-streamer.c: Likewise.
+	* dbxout.c: Likewise.
+	* dwarf2out.c: Likewise.
+	* except.c: Likewise.
+	* expr.c: Likewise.
+	* final.c: Likewise.
+	* fold-const.c: Likewise.
+	* ggc-page.c: Likewise.
+	* gimple-fold.c: Likewise.
+	* gimple-iterator.c: Likewise.
+	* gimple-pretty-print.c: Likewise.
+	* gimple-streamer-in.c: Likewise.
+	* gimple-streamer-out.c: Likewise.
+	* gimple.c: Likewise.
+	* gimplify.c: Likewise.
+	* ipa-chkp.c: Likewise.
+	* ipa-comdats.c: Likewise.
+	* ipa-cp.c: Likewise.
+	* ipa-devirt.c: Likewise.
+	* ipa-icf-gimple.c: Likewise.
+	* ipa-icf.c: Likewise.
+	* ipa-inline-analysis.c: Likewise.
+	* ipa-inline-transform.c: Likewise.
+	* ipa-inline.c: Likewise.
+	* ipa-polymorphic-call.c: Likewise.
+	* ipa-profile.c: Likewise.
+	* ipa-prop.c: Likewise.
+	* ipa-pure-const.c: Likewise.
+	* ipa-ref.c: Likewise.
+	* ipa-reference.c: Likewise.
+	* ipa-split.c: Likewise.
+	* ipa-utils.c: Likewise.
+	* ipa-visibility.c: Likewise.
+	* ipa.c: Likewise.
+	* langhooks.c: Likewise.
+	* lto-cgraph.c: Likewise.
+	* lto-compress.c: Likewise.
+	* lto-opts.c: Likewise.
+	* lto-section-in.c: Likewise.
+	* lto-section-out.c: Likewise.
+	* lto-streamer-in.c: Likewise.
+	* lto-streamer-out.c: Likewise.
+	* lto-streamer.c: Likewise.
+	* omp-low.c: Likewise.
+	* opts-global.c: Likewise.
+	* passes.c: Likewise.
+	* predict.c: Likewise.
+	* print-tree.c: Likewise.
+	* profile.c: Likewise.
+	* ree.c: Likewise.
+	* sanopt.c: Likewise.
+	* stor-layout.c: Likewise.
+	* symtab.c: Likewise.
+	* toplev.c: Likewise.
+	* trans-mem.c: Likewise.
+	* tree-cfg.c: Likewise.
+	* tree-chkp.c: Likewise.
+	* tree-eh.c: Likewise.
+	* tree-emutls.c: Likewise.
+	* tree-inline.c: Likewise.
+	* tree-nested.c: Likewise.
+	* tree-parloops.c: Likewise.
+	* tree-pretty-print.c: Likewise.
+	* tree-profile.c: Likewise.
+	* tree-sra.c: Likewise.
+	* tree-ssa-alias.c: Likewise.
+	* tree-ssa-live.c: Likewise.
+	* tree-ssa-loop-ivcanon.c: Likewise.
+	* tree-ssa-loop-ivopts.c: Likewise.
+	* tree-ssa-pre.c: Likewise.
+	* tree-ssa-sccvn.c: Likewise.
+	* tree-ssa-strlen.c: Likewise.
+	* tree-ssa-structalias.c: Likewise.
+	* tree-streamer-in.c: Likewise.
+	* tree-streamer-out.c: Likewise.
+	* tree-streamer.c: Likewise.
+	* tree-switch-conversion.c: Likewise.
+	* tree-tailcall.c: Likewise.
+	* tree-vect-data-refs.c: Likewise.
+	* tree-vect-stmts.c: Likewise.
+	* tree-vectorizer.c: Likewise.
+	* tree.c: Likewise.
+	* tsan.c: Likewise.
+	* ubsan.c: Likewise.
+	* value-prof.c: Likewise.
+	* varasm.c: Likewise.
+	* varpool.c: Likewise.
+	* config/arm/arm.c: Likewise.
+	* config/bfin/bfin.c: Likewise.
+	* config/c6x/c6x.c: Likewise.
+	* config/cris/cris.c: Likewise.
+	* config/darwin-c.c: Likewise.
+	* config/darwin.c: Likewise.
+	* config/i386/i386.c: Likewise.
+	* config/i386/winnt.c: Likewise.
+	* config/microblaze/microblaze.c: Likewise.
+	* config/mips/mips.c: Likewise.
+	* config/rs6000/rs6000.c: Likewise.
+	* config/rx/rx.c: Likewise.
+	* config/s390/s390.c: Likewise.
+	* config/tilegx/mul-tables.c: Likewise.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>

 	* config/aarch64/aarch64.c, config/alpha/alpha.c,
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@ -1,3 +1,9 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* gcc-interface/trans.c: Remove ipa-ref.h and plugin-api.h from include
+	list.
+	* gcc-interface/utils.c: Likewise.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>

 	* gcc-interface/decl.c (value_annotation_hasher): Inherit from
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@ -45,10 +45,8 @@
 #include "gimplify.h"
 #include "bitmap.h"
 #include "hash-map.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "diagnostic.h"
 #include "opts.h"
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@ -48,10 +48,8 @@
 #include "common/common-target.h"
 #include "langhooks.h"
 #include "hash-map.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "diagnostic.h"
 #include "timevar.h"
--- a/gcc/asan.c
+++ b/gcc/asan.c
@ -45,8 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "varasm.h"
 #include "stor-layout.h"
 #include "tree-iterator.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "stringpool.h"
 #include "tree-ssanames.h"
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@ -57,8 +57,6 @@ 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 "value-prof.h"
 #include "coverage.h"
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@ -118,8 +118,6 @@
 #include "basic-block.h"
 #include "df.h"
 #include "bb-reorder.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "except.h"
 #include "fibonacci_heap.h"
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@ -67,7 +67,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "builtins.h"
 #include "asan.h"
 #include "cilk.h"
-#include "ipa-ref.h"
 #include "lto-streamer.h"
 #include "cgraph.h"
 #include "tree-chkp.h"
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@ -1,3 +1,11 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* c-common.c: Remove ipa-ref.h and plugin-api.h from include list.
+	* c-gimplify.c: Likewise.
+	* c-pragma.c: Likewise.
+	* c-ubsan.c: Likewise.
+	* cilk.c: Likewise.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>

 	* c-common.c (c_type_hasher): Inherit from ggc_ptr_hash rather than
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@ -47,10 +47,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "tree-iterator.h"
 #include "opts.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "gimplify.h"
 #include "wide-int-print.h"
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@ -48,8 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "dumpfile.h"
 #include "c-pretty-print.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "cilk.h"
 #include "c-ubsan.h"
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@ -42,8 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "opts.h"
 #include "plugin.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"

 #define GCC_BAD(gmsgid) \
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@ -26,11 +26,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "options.h"
 #include "tree.h"
 #include "alloc-pool.h"
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "output.h"
 #include "toplev.h"
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@ -36,12 +36,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "c-family/c-common.h"
 #include "toplev.h" 
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
 #include "calls.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "diagnostic.h"
 #include "cilk.h"
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@ -1,3 +1,8 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* c-decl.c: Remove ipa-ref.h and plugin-api.h from include list.
+	* c-parser.c: Likewise.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>

 	* c-decl.c (detect_field_duplicates_hash): Use nofree_ptr_hash
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@ -59,8 +59,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-iterator.h"
 #include "diagnostic-core.h"
 #include "dumpfile.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "langhooks-def.h"
 #include "plugin.h"
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@ -59,10 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "target.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "plugin.h"
 #include "omp-low.h"
--- a/gcc/calls.c
+++ b/gcc/calls.c
@ -59,8 +59,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "langhooks.h"
 #include "target.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "except.h"
 #include "dbgcnt.h"
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@ -62,8 +62,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-iterator.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"
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@ -44,10 +44,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "dominance.h"
 #include "cfg.h"
 #include "basic-block.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "intl.h"
 #include "tree-ssa-alias.h"
@ -159,6 +157,29 @@ function_version_hasher::equal (cgraph_function_version_info *n1,
 static GTY(()) struct cgraph_function_version_info *
  version_info_node = NULL;

+/* Return true if NODE's address can be compared.  */
+
+bool
+symtab_node::address_can_be_compared_p ()
+{
+  /* Address of virtual tables and functions is never compared.  */
+  if (DECL_VIRTUAL_P (decl))
+    return false;
+  /* Address of C++ cdtors is never compared.  */
+  if (is_a <cgraph_node *> (this)
+      && (DECL_CXX_CONSTRUCTOR_P (decl)
+	  || DECL_CXX_DESTRUCTOR_P (decl)))
+    return false;
+  /* Constant pool symbols addresses are never compared.
+     flag_merge_constants permits us to assume the same on readonly vars.  */
+  if (is_a <varpool_node *> (this)
+      && (DECL_IN_CONSTANT_POOL (decl)
+	  || (flag_merge_constants >= 2
+	      && TREE_READONLY (decl) && !TREE_THIS_VOLATILE (decl))))
+    return false;
+  return true;
+}
+
 /* Get the cgraph_function_version_info node corresponding to node.  */
 cgraph_function_version_info *
 cgraph_node::function_version (void)
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@ -21,6 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_CGRAPH_H
 #define GCC_CGRAPH_H

+#include "ipa-ref.h"
+#include "plugin-api.h"
+
+class ipa_opt_pass_d;
+typedef ipa_opt_pass_d *ipa_opt_pass;

 /* Symbol table consists of functions and variables.
   TODO: add labels and CONST_DECLs.  */
@ -3005,29 +3010,6 @@ varpool_node::call_for_symbol_and_aliases (bool (*callback) (varpool_node *,
  return false;
 }

-/* Return true if NODE's address can be compared.  */
-
-inline bool
-symtab_node::address_can_be_compared_p ()
-{
-  /* Address of virtual tables and functions is never compared.  */
-  if (DECL_VIRTUAL_P (decl))
-    return false;
-  /* Address of C++ cdtors is never compared.  */
-  if (is_a <cgraph_node *> (this)
-      && (DECL_CXX_CONSTRUCTOR_P (decl)
-	  || DECL_CXX_DESTRUCTOR_P (decl)))
-    return false;
-  /* Constant pool symbols addresses are never compared.
-     flag_merge_constants permits us to assume the same on readonly vars.  */
-  if (is_a <varpool_node *> (this)
-      && (DECL_IN_CONSTANT_POOL (decl)
-	  || (flag_merge_constants >= 2
-	      && TREE_READONLY (decl) && !TREE_THIS_VOLATILE (decl))))
-    return false;
-  return true;
-}
-
 /* Return true if refernece may be used in address compare.  */

 inline bool
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@ -42,8 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "intl.h"
 #include "tree-pass.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ipa-utils.h"
 #include "except.h"
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@ -95,8 +95,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "params.h"
 #include "intl.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@ -198,8 +198,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "params.h"
 #include "intl.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/combine.c
+++ b/gcc/combine.c
@ -116,8 +116,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "df.h"
 #include "valtrack.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "obstack.h"
 #include "rtl-iter.h"
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@ -62,8 +62,6 @@
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
 #include "basic-block.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "except.h"
 #include "tm_p.h"
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@ -59,8 +59,6 @@
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
 #include "basic-block.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "langhooks.h"
 #include "bfin-protos.h"
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@ -65,8 +65,6 @@
 #include "tm-constrs.h"
 #include "df.h"
 #include "diagnostic-core.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "langhooks.h"
 #include "target.h"
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@ -65,8 +65,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "df.h"
 #include "opts.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "builtins.h"

--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@ -47,10 +47,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
 #include "basic-block.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "../../libcpp/internal.h"

--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@ -71,8 +71,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-expr.h"
 #include "gimple.h"
 #include "gimplify.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "lto-streamer.h"
 #include "lto-section-names.h"
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@ -65,8 +65,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "common/common-target.h"
 #include "langhooks.h"
 #include "reload.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@ -55,8 +55,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-eh.h"
 #include "gimple-expr.h"
 #include "gimple.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "lto-streamer.h"
 #include "lto-section-names.h"
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@ -63,8 +63,6 @@
 #include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "builtins.h"
 #include "rtl-iter.h"
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@ -82,8 +82,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "opts.h"
 #include "tree-pass.h"
 #include "context.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "builtins.h"
 #include "rtl-iter.h"
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@ -86,8 +86,6 @@
 #include "opts.h"
 #include "tree-vectorizer.h"
 #include "dumpfile.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "target-globals.h"
 #include "builtins.h"
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@ -69,8 +69,6 @@
 #include "target.h"
 #include "langhooks.h"
 #include "opts.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "builtins.h"

--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@ -83,8 +83,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "builtins.h"
 #include "rtl-iter.h"
 #include "intl.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"

 /* This file should be included last.  */
--- a/gcc/config/tilegx/mul-tables.c
+++ b/gcc/config/tilegx/mul-tables.c
@ -25,12 +25,23 @@
 #include "system.h"
 #include "coretypes.h"
 #include "symtab.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
 #include "tm.h"
 #include "hard-reg-set.h"
+#include "input.h"
 #include "function.h"
 #include "rtl.h"
 #include "flags.h"
+#include "statistics.h"
+#include "double-int.h"
+#include "real.h"
+#include "fixed-value.h"
 #include "alias.h"
+#include "wide-int.h"
+#include "inchash.h"
 #include "tree.h"
 #include "insn-config.h"
 #include "expmed.h"
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@ -61,8 +61,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "context.h"
 #include "pass_manager.h"
 #include "tree-pass.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "dumpfile.h"
 #include "diagnostic-core.h"
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@ -1,3 +1,19 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* call.c: Remove ipa-ref.h and plugin-api.h from include list.
+	* class.c: Likewise.
+	* cp-ubsan.c: Likewise.
+	* decl.c: Likewise.
+	* decl2.c: Likewise.
+	* lambda.c: Likewise.
+	* mangle.c: Likewise.
+	* method.c: Likewise.
+	* optimize.c: Likewise.
+	* parser.c: Likewise.
+	* semantics.c: Likewise.
+	* tree.c: Likewise.
+	* vtable-class-hierarchy.c: Likewise.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>

 	* constexpr.c (constexpr_fundef_hasher): Inherit from ggc_ptr_hash
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@ -42,10 +42,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "c-family/c-objc.h"
 #include "timevar.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "internal-fn.h"

--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@ -37,10 +37,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "target.h"
 #include "convert.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "dumpfile.h"
 #include "splay-tree.h"
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@ -43,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "gimple-expr.h"
 #include "gimple.h"
-#include "ipa-ref.h"
 #include "lto-streamer.h"
 #include "cgraph.h"

--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@ -59,10 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "timevar.h"
 #include "splay-tree.h"
 #include "plugin.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "cilk.h"
 #include "builtins.h"
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@ -47,10 +47,8 @@ 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 "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-inline.h"
 #include "c-family/c-pragma.h"
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@ -29,11 +29,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "options.h"
 #include "tree.h"
 #include "stringpool.h"
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-iterator.h"
 #include "cp-tree.h"
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@ -59,10 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "obstack.h"
 #include "flags.h"
 #include "target.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "attribs.h"

--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@ -37,10 +37,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "common/common-target.h"
 #include "diagnostic.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"

 /* Various flags to control the mangling process.  */
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@ -36,10 +36,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic-core.h"
 #include "dumpfile.h"
 #include "tree-iterator.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"

 /* Prototypes.  */
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@ -38,10 +38,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "diagnostic-core.h"
 #include "target.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "c-family/c-common.h"
 #include "c-family/c-objc.h"
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@ -43,10 +43,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "timevar.h"
 #include "diagnostic.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-iterator.h"
 #include "target.h"
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@ -35,10 +35,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "debug.h"
 #include "convert.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "splay-tree.h"
 #include "gimple-expr.h"
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@ -115,11 +115,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "cp-tree.h"
 #include "output.h"
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-iterator.h"
 #include "vtable-verify.h"
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@ -38,8 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-expr.h"
 #include "gimple.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "data-streamer.h"

--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@ -37,8 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-expr.h"
 #include "gimple.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "data-streamer.h"

--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.c
@ -36,8 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-expr.h"
 #include "gimple.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "data-streamer.h"

--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@ -100,8 +100,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "emit-rtl.h"
 #include "stmt.h"
 #include "expr.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "stringpool.h"

--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@ -96,8 +96,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "common/common-target.h"
 #include "langhooks.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ira.h"
 #include "lra.h"
--- a/gcc/except.c
+++ b/gcc/except.c
@ -151,8 +151,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfg.h"
 #include "cfgrtl.h"
 #include "basic-block.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "diagnostic.h"
 #include "tree-pretty-print.h"
--- a/gcc/expr.c
+++ b/gcc/expr.c
@ -65,8 +65,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-expr.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-ssanames.h"
 #include "target.h"
--- a/gcc/final.c
+++ b/gcc/final.c
@ -82,8 +82,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "stmt.h"
 #include "expr.h"
 #include "tree-pass.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-ssa.h"
 #include "coverage.h"
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@ -80,8 +80,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimplify.h"
 #include "tree-dfa.h"
 #include "builtins.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "generic-match.h"
 #include "optabs.h"
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@ -1,3 +1,8 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* f95-lang.c: Remove ipa-ref.h and plugin-api.h from include list.
+	* trans-decl.c: Likewise.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>

 	* trans-decl.c (module_hasher): Likewise.
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@ -44,8 +44,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "debug.h"
 #include "diagnostic.h" /* For errorcount/warningcount */
 #include "dumpfile.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "cpp.h"
 #include "trans.h"
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@ -41,8 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "function.h"
 #include "flags.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "debug.h"
 #include "constructor.h"
--- a/gcc/function.h
+++ b/gcc/function.h
@ -156,10 +156,6 @@ struct gimple_df;
 struct call_site_record_d;
 struct dw_fde_node;

-class ipa_opt_pass_d;
-typedef ipa_opt_pass_d *ipa_opt_pass;
-
-
 struct GTY(()) varasm_status {
  /* If we're using a per-function constant pool, this is it.  */
  struct rtx_constant_pool *pool;
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@ -31,10 +31,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "ggc-internal.h"
 #include "timevar.h"
 #include "params.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "cfgloop.h"
 #include "plugin.h"
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@ -60,8 +60,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-ssa.h"
 #include "tree-ssa-propagate.h"
 #include "target.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ipa-utils.h"
 #include "gimple-pretty-print.h"
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@ -39,8 +39,6 @@ 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"
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@ -42,8 +42,6 @@ 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-ssanames.h"
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@ -45,8 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-phinodes.h"
 #include "stringpool.h"
 #include "tree-ssanames.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "data-streamer.h"
 #include "tree-streamer.h"
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@ -39,8 +39,6 @@ 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 "data-streamer.h"
 #include "gimple-streamer.h"
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@ -55,7 +55,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "stringpool.h"
 #include "tree-ssanames.h"
-#include "ipa-ref.h"
 #include "lto-streamer.h"
 #include "cgraph.h"
 #include "gimple-ssa.h"
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@ -61,8 +61,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "bitmap.h"
 #include "gimple-ssa.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-cfg.h"
 #include "tree-ssanames.h"
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@ -1,3 +1,7 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* go-gcc.cc: Remove ipa-ref.h and plugin-api.h from include list.
+
 2015-06-17  Andrew MacLeod  <amacleod@redhat.com>

 	* go-backend.c: Do not include input.h, line-map.h or is-a.h.
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@ -36,11 +36,9 @@
 #include "varasm.h"
 #include "tree-iterator.h"
 #include "hash-map.h"
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "convert.h"
 #include "gimple-expr.h"
--- a/gcc/ipa-chkp.c
+++ b/gcc/ipa-chkp.c
@ -39,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "basic-block.h"
 #include "gimple.h"
-#include "ipa-ref.h"
 #include "lto-streamer.h"
 #include "cgraph.h"
 #include "tree-chkp.h"
--- a/gcc/ipa-comdats.c
+++ b/gcc/ipa-comdats.c
@ -55,10 +55,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-pass.h"

--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@ -113,11 +113,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@ -117,10 +117,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "calls.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "rtl.h"
 #include "flags.h"
--- a/gcc/ipa-icf-gimple.c
+++ b/gcc/ipa-icf-gimple.c
@ -56,8 +56,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-pretty-print.h"
 #include "cfgloop.h"
 #include "except.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "data-streamer.h"
 #include "ipa-utils.h"
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@ -91,8 +91,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-dfa.h"
 #include "tree-pass.h"
 #include "gimple-pretty-print.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@ -102,8 +102,6 @@ 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 "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@ -39,10 +39,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "coverage.h"
 #include "tree-cfg.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@ -120,8 +120,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-expr.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@ -45,8 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pretty-print.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ipa-utils.h"
 #include "tree-ssa-alias.h"
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@ -56,10 +56,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "dominance.h"
 #include "cfg.h"
 #include "basic-block.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-pass.h"
 #include "tree-ssa-alias.h"
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@ -57,8 +57,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-walk.h"
 #include "langhooks.h"
 #include "target.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@ -60,8 +60,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "tree-pass.h"
 #include "langhooks.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ipa-utils.h"
 #include "flags.h"
--- a/gcc/ipa-ref.c
+++ b/gcc/ipa-ref.c
@ -27,11 +27,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree.h"
 #include "fold-const.h"
 #include "target.h"
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ipa-utils.h"

--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@ -57,8 +57,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "tree-pass.h"
 #include "splay-tree.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ipa-utils.h"
 #include "bitmap.h"
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@ -111,8 +111,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimplify-me.h"
 #include "gimple-walk.h"
 #include "target.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "alloc-pool.h"
 #include "symbol-summary.h"
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@ -41,8 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "dumpfile.h"
 #include "langhooks.h"
 #include "splay-tree.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "ipa-utils.h"
 #include "bitmap.h"
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@ -79,10 +79,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-pass.h"
 #include "calls.h"
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@ -30,10 +30,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "stringpool.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-pass.h"
 #include "gimple-expr.h"
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@ -1,3 +1,10 @@
+2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
+
+	* class.c: Remove ipa-ref.h and plugin-api.h from include list.
+	* decl.c: Likewise.
+	* jcf-parse.c: Likewise.
+	* resource.c: Likewise.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>

 	* jcf-io.c (memoized_class_lookups): Use nofree_string_hash.
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@ -45,8 +45,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "plugin-api.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-iterator.h"
 #include "target.h"
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@ -40,11 +40,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "java-tree.h"
 #include "jcf.h"
 #include "java-except.h"
-#include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "ipa-ref.h"
 #include "cgraph.h"
 #include "tree-inline.h"
 #include "target.h"
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@ -39,11 +39,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "diagnostic-core.h"
 #include "parse.h"
 #include "debug.h"
-#include "plugin-api.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"
--- a/Show More
+++ b/Show More