
	* config/darwin.c: Add all include files removed from gimple.h.
	* config/aarch64/aarch64-builtins.c: Likewise.
	* config/aarch64/aarch64.c: Likewise.
	* config/alpha/alpha.c: Likewise.
	* config/i386/i386.c: Likewise.
	* config/i386/winnt.c: Likewise.
	* config/ia64/ia64.c: Likewise.
	* config/m32c/m32c.c: Likewise.
	* config/mep/mep.c: Likewise.
	* config/mips/mips.c: Likewise.
	* config/rs6000/rs6000.c: Likewise.
	* config/s390/s390.c: Likewise.
	* config/sh/sh.c: Likewise.
	* config/sparc/sparc.c: Likewise.
	* config/spu/spu.c: Likewise.
	* config/stormy16/stormy16.c: Likewise.
	* config/tilegx/tilegx.c: Likewise.
	* config/tilepro/tilepro.c: Likewise.
	* config/xtensa/xtensa.c: Likewise.

	* testsuite/gcc.dg/plugin/finish_unit_plugin.c: Add all include
	files removed from gimple.h.
	* testsuite/gcc.dg/plugin/ggcplug.c: Likewise.
	* testsuite/gcc.dg/plugin/one_time_plugin.c: Likewise.
	* testsuite/gcc.dg/plugin/selfassign.c: Likewise.
	* testsuite/gcc.dg/plugin/start_unit_plugin.c: Likewise.
	* testsuite/g++.dg/plugin/selfassign.c: Likewise.

Index: config/darwin.c
===================================================================
*** config/darwin.c	(revision 205213)
--- config/darwin.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 48,53 ****
--- 48,63 ----
  #include "df.h"
  #include "debug.h"
  #include "obstack.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "lto-streamer.h"
Index: config/aarch64/aarch64-builtins.c
===================================================================
*** config/aarch64/aarch64-builtins.c	(revision 205213)
--- config/aarch64/aarch64-builtins.c	(working copy)
***************
*** 33,38 ****
--- 33,49 ----
  #include "langhooks.h"
  #include "diagnostic-core.h"
  #include "optabs.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimple-iterator.h"
  
Index: config/aarch64/aarch64.c
===================================================================
*** config/aarch64/aarch64.c	(revision 205213)
--- config/aarch64/aarch64.c	(working copy)
***************
*** 46,51 ****
--- 46,61 ----
  #include "recog.h"
  #include "langhooks.h"
  #include "diagnostic-core.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "optabs.h"
Index: config/alpha/alpha.c
===================================================================
*** config/alpha/alpha.c	(revision 205213)
--- config/alpha/alpha.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 51,56 ****
--- 51,66 ----
  #include "debug.h"
  #include "langhooks.h"
  #include "splay-tree.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "gimple-ssa.h"
Index: config/i386/i386.c
===================================================================
*** config/i386/i386.c	(revision 205213)
--- config/i386/i386.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 52,57 ****
--- 52,67 ----
  #include "langhooks.h"
  #include "reload.h"
  #include "cgraph.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "dwarf2.h"
Index: config/i386/winnt.c
===================================================================
*** config/i386/winnt.c	(revision 205213)
--- config/i386/winnt.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 37,42 ****
--- 37,52 ----
  #include "ggc.h"
  #include "target.h"
  #include "except.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "lto-streamer.h"
  
Index: config/ia64/ia64.c
===================================================================
*** config/ia64/ia64.c	(revision 205213)
--- config/ia64/ia64.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 53,58 ****
--- 53,67 ----
  #include "tm_p.h"
  #include "hash-table.h"
  #include "langhooks.h"
+ #include "pointer-set.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "intl.h"
Index: config/m32c/m32c.c
===================================================================
*** config/m32c/m32c.c	(revision 205213)
--- config/m32c/m32c.c	(working copy)
***************
*** 48,53 ****
--- 48,63 ----
  #include "target-def.h"
  #include "tm_p.h"
  #include "langhooks.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "df.h"
  #include "tm-constrs.h"
Index: config/mep/mep.c
===================================================================
*** config/mep/mep.c	(revision 205213)
--- config/mep/mep.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 51,56 ****
--- 51,66 ----
  #include "target-def.h"
  #include "langhooks.h"
  #include "df.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "opts.h"
Index: config/mips/mips.c
===================================================================
*** config/mips/mips.c	(revision 205213)
--- config/mips/mips.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 54,59 ****
--- 54,68 ----
  #include "common/common-target.h"
  #include "langhooks.h"
  #include "sched-int.h"
+ #include "pointer-set.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "bitmap.h"
Index: config/rs6000/rs6000.c
===================================================================
*** config/rs6000/rs6000.c	(revision 205213)
--- config/rs6000/rs6000.c	(working copy)
***************
*** 56,61 ****
--- 56,71 ----
  #include "reload.h"
  #include "cfgloop.h"
  #include "sched-int.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "gimple-iterator.h"
Index: config/s390/s390.c
===================================================================
*** config/s390/s390.c	(revision 205213)
--- config/s390/s390.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 52,57 ****
--- 52,67 ----
  #include "debug.h"
  #include "langhooks.h"
  #include "optabs.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "df.h"
Index: config/sh/sh.c
===================================================================
*** config/sh/sh.c	(revision 205213)
--- config/sh/sh.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 52,57 ****
--- 52,65 ----
  #include "sched-int.h"
  #include "params.h"
  #include "ggc.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #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"
Index: config/sparc/sparc.c
===================================================================
*** config/sparc/sparc.c	(revision 205213)
--- config/sparc/sparc.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 50,55 ****
--- 50,65 ----
  #include "target.h"
  #include "target-def.h"
  #include "common/common-target.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "langhooks.h"
Index: config/spu/spu.c
===================================================================
*** config/spu/spu.c	(revision 205213)
--- config/spu/spu.c	(working copy)
***************
*** 49,54 ****
--- 49,62 ----
  #include "sched-int.h"
  #include "params.h"
  #include "machmode.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "tm-constrs.h"
Index: config/stormy16/stormy16.c
===================================================================
*** config/stormy16/stormy16.c	(revision 205213)
--- config/stormy16/stormy16.c	(working copy)
***************
*** 47,57 ****
  #include "target-def.h"
  #include "tm_p.h"
  #include "langhooks.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "df.h"
  #include "reload.h"
- #include "ggc.h"
  
  static rtx emit_addhi3_postreload (rtx, rtx, rtx);
  static void xstormy16_asm_out_constructor (rtx, int);
--- 47,67 ----
  #include "target-def.h"
  #include "tm_p.h"
  #include "langhooks.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "df.h"
  #include "reload.h"
  
  static rtx emit_addhi3_postreload (rtx, rtx, rtx);
  static void xstormy16_asm_out_constructor (rtx, int);
Index: config/tilegx/tilegx.c
===================================================================
*** config/tilegx/tilegx.c	(revision 205213)
--- config/tilegx/tilegx.c	(working copy)
***************
*** 40,45 ****
--- 40,56 ----
  #include "dwarf2.h"
  #include "timevar.h"
  #include "tree.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "stringpool.h"
  #include "stor-layout.h"
Index: config/tilepro/tilepro.c
===================================================================
*** config/tilepro/tilepro.c	(revision 205213)
--- config/tilepro/tilepro.c	(working copy)
***************
*** 41,46 ****
--- 41,57 ----
  #include "dwarf2.h"
  #include "timevar.h"
  #include "tree.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "stringpool.h"
  #include "stor-layout.h"
Index: config/xtensa/xtensa.c
===================================================================
*** config/xtensa/xtensa.c	(revision 205213)
--- config/xtensa/xtensa.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 50,55 ****
--- 50,63 ----
  #include "target.h"
  #include "target-def.h"
  #include "langhooks.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "df.h"
Index: testsuite/gcc.dg/plugin/finish_unit_plugin.c
===================================================================
*** testsuite/gcc.dg/plugin/finish_unit_plugin.c	(revision 205213)
--- testsuite/gcc.dg/plugin/finish_unit_plugin.c	(working copy)
***************
*** 9,14 ****
--- 9,25 ----
  #include "tree.h"
  #include "toplev.h"
  #include "basic-block.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "tree.h"
  #include "tree-pass.h"
Index: testsuite/gcc.dg/plugin/ggcplug.c
===================================================================
*** testsuite/gcc.dg/plugin/ggcplug.c	(revision 205213)
--- testsuite/gcc.dg/plugin/ggcplug.c	(working copy)
***************
*** 8,13 ****
--- 8,24 ----
  #include "tree.h"
  #include "toplev.h"
  #include "basic-block.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "tree.h"
  #include "tree-pass.h"
Index: testsuite/gcc.dg/plugin/one_time_plugin.c
===================================================================
*** testsuite/gcc.dg/plugin/one_time_plugin.c	(revision 205213)
--- testsuite/gcc.dg/plugin/one_time_plugin.c	(working copy)
***************
*** 6,11 ****
--- 6,22 ----
  #include "tree.h"
  #include "tm.h"
  #include "toplev.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "tree-pass.h"
  #include "intl.h"
Index: testsuite/gcc.dg/plugin/selfassign.c
===================================================================
*** testsuite/gcc.dg/plugin/selfassign.c	(revision 205213)
--- testsuite/gcc.dg/plugin/selfassign.c	(working copy)
***************
*** 11,16 ****
--- 11,27 ----
  #include "stringpool.h"
  #include "toplev.h"
  #include "basic-block.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimple-iterator.h"
  #include "tree.h"
Index: testsuite/gcc.dg/plugin/start_unit_plugin.c
===================================================================
*** testsuite/gcc.dg/plugin/start_unit_plugin.c	(revision 205213)
--- testsuite/gcc.dg/plugin/start_unit_plugin.c	(working copy)
***************
*** 14,19 ****
--- 14,30 ----
  #include "stringpool.h"
  #include "toplev.h"
  #include "basic-block.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "tree.h"
  #include "tree-pass.h"
Index: testsuite/g++.dg/plugin/selfassign.c
===================================================================
*** testsuite/g++.dg/plugin/selfassign.c	(revision 205213)
--- testsuite/g++.dg/plugin/selfassign.c	(working copy)
***************
*** 11,16 ****
--- 11,27 ----
  #include "stringpool.h"
  #include "toplev.h"
  #include "basic-block.h"
+ #include "pointer-set.h"
+ #include "hash-table.h"
+ #include "vec.h"
+ #include "ggc.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-fold.h"
+ #include "tree-eh.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimple-iterator.h"
  #include "tree.h"
