Patchwork Flatten tree-ssa-loops.h

login
register
mail settings
Submitter Andrew MacLeod
Date Oct. 23, 2013, 2:27 p.m.
Message ID <5267DCBC.2030908@redhat.com>
Download mbox | patch
Permalink /patch/285676/
State New
Headers show

Comments

Andrew MacLeod - Oct. 23, 2013, 2:27 p.m.
Similar to tree-ssa.h,  tree-ssa-loops.h became an aggregator for 3 of 
the tree-ssa-loop* header files.  This remedies that situation.

The average .c file required only 1 of the 3 includes from tree-ssa-loop.h.

Bootstraps on x86_64-unknown-linux-gnu (with graphite enabled :-). 
Regressions are running, but I expect no issues due to this just being 
just an include shuffle.

OK assuming no errors?

Andrew
Diego Novillo - Oct. 23, 2013, 2:35 p.m.
On Wed, Oct 23, 2013 at 10:27 AM, Andrew MacLeod <amacleod@redhat.com> wrote:
> Similar to tree-ssa.h,  tree-ssa-loops.h became an aggregator for 3 of the
> tree-ssa-loop* header files.  This remedies that situation.
>
> The average .c file required only 1 of the 3 includes from tree-ssa-loop.h.
>
> Bootstraps on x86_64-unknown-linux-gnu (with graphite enabled :-).
> Regressions are running, but I expect no issues due to this just being just
> an include shuffle.

Looks OK.

What do you think about Jan-Benedict's idea of installing a commit
hook that would check that no #includes of certain headers get into
other headers?  We could just leave this to code reviews, but perhaps
installing a hook makes it easier.


Diego.

Patch



	* tree-ssa-loop.h: Remove include files.
	* gengtype.c (open_base_files): Adjust include list for gtype-desc.c.
	* cfgloopmanip.c: Move required includes from tree-ssa-loop.h.
	* graphite-clast-to-gimple.c: Likewise.
	* graphite-scop-detection.c: Likewise.
	* graphite-sese-to-poly.c: Likewise.
	* ipa-inline-analysis.c: Likewise.
	* ipa-pure-const.c: Likewise.
	* loop-init.c: Likewise.
	* passes.c: Likewise.
	* predict.c: Likewise.
	* tree-cfg.c: Likewise.
	* tree-cfgcleanup.c: Likewise.
	* tree-chrec.c: Likewise.
	* tree-data-ref.c: Likewise.
	* tree-loop-distribution.c: Likewise.
	* tree-parloops.c: Likewise.
	* tree-predcom.c: Likewise.
	* tree-scalar-evolution.c: Likewise.
	* tree-ssa-address.c: Likewise.
	* tree-ssa.c: Likewise.
	* tree-ssa-dce.c: Likewise.
	* tree-ssa-loop.c: Likewise.
	* tree-ssa-loop-im.c: Likewise.
	* tree-ssa-loop-ivcanon.c: Likewise.
	* tree-ssa-loop-ivopts.c: Likewise.
	* tree-ssa-loop-manip.c: Likewise.
	* tree-ssa-loop-niter.c: Likewise.
	* tree-ssa-loop-prefetch.c: Likewise.
	* tree-ssa-loop-unswitch.c: Likewise.
	* tree-ssa-reassoc.c: Likewise.
	* tree-vect-data-refs.c: Likewise.
	* tree-vect-loop.c: Likewise.
	* tree-vect-loop-manip.c: Likewise.
	* tree-vectorizer.c: Likewise.
	* tree-vect-stmts.c: Likewise.
	* tree-vrp.c: Likewise.

Index: tree-ssa-loop.h
===================================================================
*** tree-ssa-loop.h	(revision 203976)
--- tree-ssa-loop.h	(working copy)
*************** along with GCC; see the file COPYING3.
*** 20,29 ****
  #ifndef GCC_TREE_SSA_LOOP_H
  #define GCC_TREE_SSA_LOOP_H
  
- #include "tree-ssa-loop-ivopts.h"
- #include "tree-ssa-loop-manip.h"
- #include "tree-ssa-loop-niter.h"
- 
  /* Affine iv.  */
  
  typedef struct affine_iv_d
--- 20,25 ----
Index: gengtype.c
===================================================================
*** gengtype.c	(revision 203976)
--- gengtype.c	(working copy)
*************** open_base_files (void)
*** 1738,1744 ****
        "optabs.h", "libfuncs.h", "debug.h", "ggc.h", "cgraph.h",
        "gimple.h", "gimple-ssa.h", "tree-cfg.h", "tree-phinodes.h",
        "ssa-iterators.h", "tree-ssanames.h", "tree-ssa-loop.h",
!       "tree-into-ssa.h", "tree-dfa.h", 
        "tree-ssa.h", "reload.h", "cpp-id-data.h", "tree-chrec.h",
        "except.h", "output.h",  "cfgloop.h",
        "target.h", "ipa-prop.h", "lto-streamer.h", "target-globals.h",
--- 1738,1745 ----
        "optabs.h", "libfuncs.h", "debug.h", "ggc.h", "cgraph.h",
        "gimple.h", "gimple-ssa.h", "tree-cfg.h", "tree-phinodes.h",
        "ssa-iterators.h", "tree-ssanames.h", "tree-ssa-loop.h",
!       "tree-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",
Index: cfgloopmanip.c
===================================================================
*** cfgloopmanip.c	(revision 203976)
--- cfgloopmanip.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 26,32 ****
  #include "cfgloop.h"
  #include "tree.h"
  #include "gimple.h"
! #include "tree-ssa-loop.h"
  #include "dumpfile.h"
  
  static void copy_loops_to (struct loop **, int,
--- 26,32 ----
  #include "cfgloop.h"
  #include "tree.h"
  #include "gimple.h"
! #include "tree-ssa-loop-manip.h"
  #include "dumpfile.h"
  
  static void copy_loops_to (struct loop **, int,
Index: graphite-clast-to-gimple.c
===================================================================
*** graphite-clast-to-gimple.c	(revision 203976)
--- graphite-clast-to-gimple.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 38,43 ****
--- 38,44 ----
  #include "tree.h"
  #include "gimple.h"
  #include "gimple-ssa.h"
+ #include "tree-ssa-loop-manip.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-pass.h"
Index: graphite-scop-detection.c
===================================================================
*** graphite-scop-detection.c	(revision 203976)
--- graphite-scop-detection.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 36,41 ****
--- 36,43 ----
  #include "gimple-ssa.h"
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"
Index: graphite-sese-to-poly.c
===================================================================
*** graphite-sese-to-poly.c	(revision 203976)
--- graphite-sese-to-poly.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 40,45 ****
--- 40,47 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-pass.h"
Index: ipa-inline-analysis.c
===================================================================
*** ipa-inline-analysis.c	(revision 203976)
--- ipa-inline-analysis.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 84,89 ****
--- 84,90 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "ipa-prop.h"
  #include "lto-streamer.h"
Index: ipa-pure-const.c
===================================================================
*** ipa-pure-const.c	(revision 203976)
--- ipa-pure-const.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 38,44 ****
  #include "tree.h"
  #include "gimple.h"
  #include "tree-cfg.h"
! #include "tree-ssa-loop.h"
  #include "tree-inline.h"
  #include "tree-pass.h"
  #include "langhooks.h"
--- 38,44 ----
  #include "tree.h"
  #include "gimple.h"
  #include "tree-cfg.h"
! #include "tree-ssa-loop-niter.h"
  #include "tree-inline.h"
  #include "tree-pass.h"
  #include "langhooks.h"
Index: loop-init.c
===================================================================
*** loop-init.c	(revision 203976)
--- loop-init.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 32,38 ****
  #include "df.h"
  #include "ggc.h"
  #include "gimple.h"
! #include "tree-ssa-loop.h"
  
  
  /* Apply FLAGS to the loop state.  */
--- 32,38 ----
  #include "df.h"
  #include "ggc.h"
  #include "gimple.h"
! #include "tree-ssa-loop-niter.h"
  
  
  /* Apply FLAGS to the loop state.  */
Index: passes.c
===================================================================
*** passes.c	(revision 203976)
--- passes.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 64,70 ****
  #include "gimple-ssa.h"
  #include "tree-cfg.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
--- 64,70 ----
  #include "gimple-ssa.h"
  #include "tree-cfg.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-manip.h"
  #include "tree-into-ssa.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
Index: predict.c
===================================================================
*** predict.c	(revision 203976)
--- predict.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 56,61 ****
--- 56,62 ----
  #include "tree-cfg.h"
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "ggc.h"
  #include "tree-pass.h"
Index: tree-cfg.c
===================================================================
*** tree-cfg.c	(revision 203976)
--- tree-cfg.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 37,43 ****
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
--- 37,44 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-manip.h"
! #include "tree-ssa-loop-niter.h"
  #include "tree-into-ssa.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
Index: tree-cfgcleanup.c
===================================================================
*** tree-cfgcleanup.c	(revision 203976)
--- tree-cfgcleanup.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 35,41 ****
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
  #include "tree-pass.h"
--- 35,41 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-manip.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
  #include "tree-pass.h"
Index: tree-chrec.c
===================================================================
*** tree-chrec.c	(revision 203976)
--- tree-chrec.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 30,36 ****
  #include "tree-pretty-print.h"
  #include "cfgloop.h"
  #include "gimple.h"
! #include "tree-ssa-loop.h"
  #include "tree-chrec.h"
  #include "dumpfile.h"
  #include "params.h"
--- 30,37 ----
  #include "tree-pretty-print.h"
  #include "cfgloop.h"
  #include "gimple.h"
! #include "tree-ssa-loop-ivopts.h"
! #include "tree-ssa-loop-niter.h"
  #include "tree-chrec.h"
  #include "dumpfile.h"
  #include "params.h"
Index: tree-data-ref.c
===================================================================
*** tree-data-ref.c	(revision 203976)
--- tree-data-ref.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 79,84 ****
--- 79,85 ----
  #include "tree.h"
  #include "gimple-pretty-print.h"
  #include "gimple.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-ssa.h"
  #include "cfgloop.h"
Index: tree-loop-distribution.c
===================================================================
*** tree-loop-distribution.c	(revision 203976)
--- tree-loop-distribution.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 51,56 ****
--- 51,57 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-manip.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"
Index: tree-parloops.c
===================================================================
*** tree-parloops.c	(revision 203976)
--- tree-parloops.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 29,34 ****
--- 29,37 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "cfgloop.h"
Index: tree-predcom.c
===================================================================
*** tree-predcom.c	(revision 203976)
--- tree-predcom.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 196,201 ****
--- 196,204 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-dfa.h"
Index: tree-scalar-evolution.c
===================================================================
*** tree-scalar-evolution.c	(revision 203976)
--- tree-scalar-evolution.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 264,269 ****
--- 264,272 ----
  #include "tree-cfg.h"
  #include "tree-phinodes.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-ssa.h"
  #include "cfgloop.h"
Index: tree-ssa-address.c
===================================================================
*** tree-ssa-address.c	(revision 203976)
--- tree-ssa-address.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 30,36 ****
  #include "tree-pretty-print.h"
  #include "gimple.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-dfa.h"
  #include "dumpfile.h"
  #include "flags.h"
--- 30,36 ----
  #include "tree-pretty-print.h"
  #include "gimple.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-ivopts.h"
  #include "tree-dfa.h"
  #include "dumpfile.h"
  #include "flags.h"
Index: tree-ssa.c
===================================================================
*** tree-ssa.c	(revision 203976)
--- tree-ssa.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 36,42 ****
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"
  #include "tree-inline.h"
--- 36,42 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-manip.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"
  #include "tree-inline.h"
Index: tree-ssa-dce.c
===================================================================
*** tree-ssa-dce.c	(revision 203976)
--- tree-ssa-dce.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 56,62 ****
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-dfa.h"
  #include "tree-pass.h"
--- 56,62 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-niter.h"
  #include "tree-into-ssa.h"
  #include "tree-dfa.h"
  #include "tree-pass.h"
Index: tree-ssa-loop.c
===================================================================
*** tree-ssa-loop.c	(revision 203976)
--- tree-ssa-loop.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 25,30 ****
--- 25,33 ----
  #include "tm_p.h"
  #include "basic-block.h"
  #include "gimple.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-pass.h"
  #include "cfgloop.h"
Index: tree-ssa-loop-im.c
===================================================================
*** tree-ssa-loop-im.c	(revision 203976)
--- tree-ssa-loop-im.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 31,36 ****
--- 31,37 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-manip.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "cfgloop.h"
Index: tree-ssa-loop-ivcanon.c
===================================================================
*** tree-ssa-loop-ivcanon.c	(revision 203976)
--- tree-ssa-loop-ivcanon.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 47,52 ****
--- 47,54 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "cfgloop.h"
Index: tree-ssa-loop-ivopts.c
===================================================================
*** tree-ssa-loop-ivopts.c	(revision 203976)
--- tree-ssa-loop-ivopts.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 76,81 ****
--- 76,84 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
Index: tree-ssa-loop-manip.c
===================================================================
*** tree-ssa-loop-manip.c	(revision 203976)
--- tree-ssa-loop-manip.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 30,35 ****
--- 30,38 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"
Index: tree-ssa-loop-niter.c
===================================================================
*** tree-ssa-loop-niter.c	(revision 203976)
--- tree-ssa-loop-niter.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 31,36 ****
--- 31,38 ----
  #include "tree-cfg.h"
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "dumpfile.h"
  #include "cfgloop.h"
Index: tree-ssa-loop-prefetch.c
===================================================================
*** tree-ssa-loop-prefetch.c	(revision 203976)
--- tree-ssa-loop-prefetch.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 27,32 ****
--- 27,35 ----
  #include "tree-pretty-print.h"
  #include "gimple.h"
  #include "gimple-ssa.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "cfgloop.h"
Index: tree-ssa-loop-unswitch.c
===================================================================
*** tree-ssa-loop-unswitch.c	(revision 203976)
--- tree-ssa-loop-unswitch.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 29,34 ****
--- 29,35 ----
  #include "tree-cfg.h"
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "cfgloop.h"
Index: tree-ssa-reassoc.c
===================================================================
*** tree-ssa-reassoc.c	(revision 203976)
--- tree-ssa-reassoc.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 35,40 ****
--- 35,41 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-dfa.h"
  #include "tree-ssa.h"
Index: tree-vect-data-refs.c
===================================================================
*** tree-vect-data-refs.c	(revision 203976)
--- tree-vect-data-refs.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 35,40 ****
--- 35,42 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-ivopts.h"
+ #include "tree-ssa-loop-manip.h"
  #include "tree-ssa-loop.h"
  #include "dumpfile.h"
  #include "cfgloop.h"
Index: tree-vect-loop.c
===================================================================
*** tree-vect-loop.c	(revision 203976)
--- tree-vect-loop.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 33,39 ****
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-pass.h"
  #include "cfgloop.h"
  #include "expr.h"
--- 33,41 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-ivopts.h"
! #include "tree-ssa-loop-manip.h"
! #include "tree-ssa-loop-niter.h"
  #include "tree-pass.h"
  #include "cfgloop.h"
  #include "expr.h"
Index: tree-vect-loop-manip.c
===================================================================
*** tree-vect-loop-manip.c	(revision 203976)
--- tree-vect-loop-manip.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 34,40 ****
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"
  #include "tree-pass.h"
--- 34,40 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-manip.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"
  #include "tree-pass.h"
Index: tree-vectorizer.c
===================================================================
*** tree-vectorizer.c	(revision 203976)
--- tree-vectorizer.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 67,73 ****
  #include "cgraph.h"
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
! #include "tree-ssa-loop.h"
  #include "cfgloop.h"
  #include "tree-vectorizer.h"
  #include "tree-pass.h"
--- 67,73 ----
  #include "cgraph.h"
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
! #include "tree-ssa-loop-manip.h"
  #include "cfgloop.h"
  #include "tree-vectorizer.h"
  #include "tree-pass.h"
Index: tree-vect-stmts.c
===================================================================
*** tree-vect-stmts.c	(revision 203976)
--- tree-vect-stmts.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 35,41 ****
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop.h"
  #include "cfgloop.h"
  #include "expr.h"
  #include "recog.h"		/* FIXME: for insn_data */
--- 35,41 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
! #include "tree-ssa-loop-manip.h"
  #include "cfgloop.h"
  #include "expr.h"
  #include "recog.h"		/* FIXME: for insn_data */
Index: tree-vrp.c
===================================================================
*** tree-vrp.c	(revision 203976)
--- tree-vrp.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 32,37 ****
--- 32,39 ----
  #include "tree-phinodes.h"
  #include "ssa-iterators.h"
  #include "tree-ssanames.h"
+ #include "tree-ssa-loop-manip.h"
+ #include "tree-ssa-loop-niter.h"
  #include "tree-ssa-loop.h"
  #include "tree-into-ssa.h"
  #include "tree-ssa.h"