Patchwork Do not include unnecessary .h files.

login
register
mail settings
Submitter Sebastian Pop
Date Dec. 28, 2010, 4:47 a.m.
Message ID <1293511665-30621-1-git-send-email-sebpop@gmail.com>
Download mbox | patch
Permalink /patch/76814/
State New
Headers show

Comments

Sebastian Pop - Dec. 28, 2010, 4:47 a.m.
Hi,

Joseph pointed out that the Graphite-OpenCL files are including .h
files that are not needed.  This patch removes the unnecessary
includes from some middle-end passes.  I will commit a separate patch
to fix the Graphite-OpenCL files in the graphite branch.  This patch
passed regstrap on amd64-linux on trunk.  Ok for trunk?

Thanks,
Sebastian

2010-12-27  Sebastian Pop  <sebastian.pop@amd.com>

	* Makefile.in (TREE_VECTORIZER_H): Removed duplicate definition.
	(tree-browser.o): Update dependences.
	(omega.o): Same.
	(tree-chrec.o): Same.
	(tree-scalar-evolution.o): Same.
	(tree-data-ref.o): Same.
	(sese.o): Same.
	(graphite.o): Same.
	(graphite-blocking.o): Same.
	(graphite-clast-to-gimple.o): Same.
	(graphite-cloog-util.o): Same.
	(graphite-dependences.o): Same.
	(graphite-flattening.o): Same.
	(graphite-interchange.o): Same.
	(graphite-poly.o): Same.
	(graphite-ppl.o): Same.
	(graphite-scop-detection.o): Same.
	(graphite-sese-to-poly.o): Same.
	(tree-loop-linear.o): Same.
	(tree-loop-distribution.o): Same.
	(tree-parloops.o): Same.
	(lambda-mat.o): Same.
	(lambda-trans.o): Same.
	(lambda-code.o): Same.
	* tree-browser.o: Do not include unnecessary .h files.
	* omega.o: Same.
	* tree-chrec.o: Same.
	* tree-scalar-evolution.o: Same.
	* tree-data-ref.o: Same.
	* sese.o: Same.
	* graphite.o: Same.
	* graphite-blocking.o: Same.
	* graphite-clast-to-gimple.o: Same.
	* graphite-cloog-util.o: Same.
	* graphite-dependences.o: Same.
	* graphite-flattening.o: Same.
	* graphite-interchange.o: Same.
	* graphite-poly.o: Same.
	* graphite-ppl.o: Same.
	* graphite-scop-detection.o: Same.
	* graphite-sese-to-poly.o: Same.
	* tree-loop-linear.o: Same.
	* tree-loop-distribution.o: Same.
	* tree-parloops.o: Same.
	* lambda-mat.o: Same.
	* lambda-trans.o: Same.
	* lambda-code.o: Same.
---
 gcc/ChangeLog                  |   50 ++++++++++++
 gcc/Makefile.in                |  170 +++++++++++++++-------------------------
 gcc/graphite-blocking.c        |   18 +----
 gcc/graphite-clast-to-gimple.c |   14 ----
 gcc/graphite-cloog-util.c      |    2 -
 gcc/graphite-dependences.c     |   14 +---
 gcc/graphite-flattening.c      |   17 +----
 gcc/graphite-interchange.c     |   17 +----
 gcc/graphite-poly.c            |   19 +----
 gcc/graphite-ppl.c             |    2 -
 gcc/graphite-scop-detection.c  |   13 ---
 gcc/graphite-sese-to-poly.c    |   13 ---
 gcc/graphite.c                 |   15 ----
 gcc/graphite.h                 |   24 ------
 gcc/lambda-code.c              |   17 +----
 gcc/lambda-mat.c               |    3 -
 gcc/lambda-trans.c             |    4 -
 gcc/omega.c                    |    2 -
 gcc/sese.c                     |   11 ---
 gcc/tree-browser.c             |    5 -
 gcc/tree-chrec.c               |    6 --
 gcc/tree-data-ref.c            |    8 --
 gcc/tree-loop-distribution.c   |    8 --
 gcc/tree-loop-linear.c         |    7 --
 gcc/tree-parloops.c            |    6 +-
 gcc/tree-scalar-evolution.c    |    8 --
 26 files changed, 120 insertions(+), 353 deletions(-)
 delete mode 100644 gcc/graphite.h
Richard Guenther - Dec. 28, 2010, 2:37 p.m.
On Tue, Dec 28, 2010 at 5:47 AM, Sebastian Pop <sebpop@gmail.com> wrote:
> Hi,
>
> Joseph pointed out that the Graphite-OpenCL files are including .h
> files that are not needed.  This patch removes the unnecessary
> includes from some middle-end passes.  I will commit a separate patch
> to fix the Graphite-OpenCL files in the graphite branch.  This patch
> passed regstrap on amd64-linux on trunk.  Ok for trunk?

Ok.

Thanks,
Richard.

> Thanks,
> Sebastian
>
> 2010-12-27  Sebastian Pop  <sebastian.pop@amd.com>
>
>        * Makefile.in (TREE_VECTORIZER_H): Removed duplicate definition.
>        (tree-browser.o): Update dependences.
>        (omega.o): Same.
>        (tree-chrec.o): Same.
>        (tree-scalar-evolution.o): Same.
>        (tree-data-ref.o): Same.
>        (sese.o): Same.
>        (graphite.o): Same.
>        (graphite-blocking.o): Same.
>        (graphite-clast-to-gimple.o): Same.
>        (graphite-cloog-util.o): Same.
>        (graphite-dependences.o): Same.
>        (graphite-flattening.o): Same.
>        (graphite-interchange.o): Same.
>        (graphite-poly.o): Same.
>        (graphite-ppl.o): Same.
>        (graphite-scop-detection.o): Same.
>        (graphite-sese-to-poly.o): Same.
>        (tree-loop-linear.o): Same.
>        (tree-loop-distribution.o): Same.
>        (tree-parloops.o): Same.
>        (lambda-mat.o): Same.
>        (lambda-trans.o): Same.
>        (lambda-code.o): Same.
>        * tree-browser.o: Do not include unnecessary .h files.
>        * omega.o: Same.
>        * tree-chrec.o: Same.
>        * tree-scalar-evolution.o: Same.
>        * tree-data-ref.o: Same.
>        * sese.o: Same.
>        * graphite.o: Same.
>        * graphite-blocking.o: Same.
>        * graphite-clast-to-gimple.o: Same.
>        * graphite-cloog-util.o: Same.
>        * graphite-dependences.o: Same.
>        * graphite-flattening.o: Same.
>        * graphite-interchange.o: Same.
>        * graphite-poly.o: Same.
>        * graphite-ppl.o: Same.
>        * graphite-scop-detection.o: Same.
>        * graphite-sese-to-poly.o: Same.
>        * tree-loop-linear.o: Same.
>        * tree-loop-distribution.o: Same.
>        * tree-parloops.o: Same.
>        * lambda-mat.o: Same.
>        * lambda-trans.o: Same.
>        * lambda-code.o: Same.
> ---
>  gcc/ChangeLog                  |   50 ++++++++++++
>  gcc/Makefile.in                |  170 +++++++++++++++-------------------------
>  gcc/graphite-blocking.c        |   18 +----
>  gcc/graphite-clast-to-gimple.c |   14 ----
>  gcc/graphite-cloog-util.c      |    2 -
>  gcc/graphite-dependences.c     |   14 +---
>  gcc/graphite-flattening.c      |   17 +----
>  gcc/graphite-interchange.c     |   17 +----
>  gcc/graphite-poly.c            |   19 +----
>  gcc/graphite-ppl.c             |    2 -
>  gcc/graphite-scop-detection.c  |   13 ---
>  gcc/graphite-sese-to-poly.c    |   13 ---
>  gcc/graphite.c                 |   15 ----
>  gcc/graphite.h                 |   24 ------
>  gcc/lambda-code.c              |   17 +----
>  gcc/lambda-mat.c               |    3 -
>  gcc/lambda-trans.c             |    4 -
>  gcc/omega.c                    |    2 -
>  gcc/sese.c                     |   11 ---
>  gcc/tree-browser.c             |    5 -
>  gcc/tree-chrec.c               |    6 --
>  gcc/tree-data-ref.c            |    8 --
>  gcc/tree-loop-distribution.c   |    8 --
>  gcc/tree-loop-linear.c         |    7 --
>  gcc/tree-parloops.c            |    6 +-
>  gcc/tree-scalar-evolution.c    |    8 --
>  26 files changed, 120 insertions(+), 353 deletions(-)
>  delete mode 100644 gcc/graphite.h
>
> diff --git a/gcc/ChangeLog b/gcc/ChangeLog
> index 83ad1a9..20c0da3 100644
> --- a/gcc/ChangeLog
> +++ b/gcc/ChangeLog
> @@ -1,3 +1,53 @@
> +2010-12-27  Sebastian Pop  <sebastian.pop@amd.com>
> +
> +       * Makefile.in (TREE_VECTORIZER_H): Removed duplicate definition.
> +       (tree-browser.o): Update dependences.
> +       (omega.o): Same.
> +       (tree-chrec.o): Same.
> +       (tree-scalar-evolution.o): Same.
> +       (tree-data-ref.o): Same.
> +       (sese.o): Same.
> +       (graphite.o): Same.
> +       (graphite-blocking.o): Same.
> +       (graphite-clast-to-gimple.o): Same.
> +       (graphite-cloog-util.o): Same.
> +       (graphite-dependences.o): Same.
> +       (graphite-flattening.o): Same.
> +       (graphite-interchange.o): Same.
> +       (graphite-poly.o): Same.
> +       (graphite-ppl.o): Same.
> +       (graphite-scop-detection.o): Same.
> +       (graphite-sese-to-poly.o): Same.
> +       (tree-loop-linear.o): Same.
> +       (tree-loop-distribution.o): Same.
> +       (tree-parloops.o): Same.
> +       (lambda-mat.o): Same.
> +       (lambda-trans.o): Same.
> +       (lambda-code.o): Same.
> +       * tree-browser.o: Do not include unnecessary .h files.
> +       * omega.o: Same.
> +       * tree-chrec.o: Same.
> +       * tree-scalar-evolution.o: Same.
> +       * tree-data-ref.o: Same.
> +       * sese.o: Same.
> +       * graphite.o: Same.
> +       * graphite-blocking.o: Same.
> +       * graphite-clast-to-gimple.o: Same.
> +       * graphite-cloog-util.o: Same.
> +       * graphite-dependences.o: Same.
> +       * graphite-flattening.o: Same.
> +       * graphite-interchange.o: Same.
> +       * graphite-poly.o: Same.
> +       * graphite-ppl.o: Same.
> +       * graphite-scop-detection.o: Same.
> +       * graphite-sese-to-poly.o: Same.
> +       * tree-loop-linear.o: Same.
> +       * tree-loop-distribution.o: Same.
> +       * tree-parloops.o: Same.
> +       * lambda-mat.o: Same.
> +       * lambda-trans.o: Same.
> +       * lambda-code.o: Same.
> +
>  2010-12-23  Sebastian Pop  <sebastian.pop@amd.com>
>            Richard Guenther  <rguenther@suse.de>
>
> diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> index f031630..b5f9bd2 100644
> --- a/gcc/Makefile.in
> +++ b/gcc/Makefile.in
> @@ -959,7 +959,6 @@ TREE_FLOW_H = tree-flow.h tree-flow-inline.h tree-ssa-operands.h \
>                $(HASHTAB_H) $(CGRAPH_H) $(IPA_REFERENCE_H) \
>                tree-ssa-alias.h
>  TREE_SSA_LIVE_H = tree-ssa-live.h $(PARTITION_H) vecprim.h
> -TREE_VECTORIZER_H = tree-vectorizer.h $(TREE_DATA_REF_H)
>  SSAEXPAND_H = ssaexpand.h $(TREE_SSA_LIVE_H)
>  PRETTY_PRINT_H = pretty-print.h $(INPUT_H) $(OBSTACK_H)
>  DIAGNOSTIC_CORE_H = diagnostic-core.h $(INPUT_H) bversion.h diagnostic.def
> @@ -2656,91 +2655,56 @@ omp-low.o : omp-low.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
>    $(TREE_PASS_H) $(GGC_H) $(EXCEPT_H) $(SPLAY_TREE_H) $(OPTABS_H) \
>    $(CFGLOOP_H) tree-iterator.h gt-omp-low.h
>  tree-browser.o : tree-browser.c tree-browser.def $(CONFIG_H) $(SYSTEM_H) \
> -   $(TREE_H) $(TREE_INLINE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) \
> -   $(TM_H) coretypes.h tree-pretty-print.h
> -omega.o : omega.c omega.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) $(TREE_H) $(DIAGNOSTIC_CORE_H) $(TREE_PASS_H) $(PARAMS_H)
> -tree-chrec.o: tree-chrec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) $(TREE_H) $(SCEV_H) $(TREE_PASS_H) $(PARAMS_H) \
> -   $(DIAGNOSTIC_H) $(CFGLOOP_H) $(TREE_FLOW_H) $(FLAGS_H) tree-pretty-print.h
> -tree-scalar-evolution.o: tree-scalar-evolution.c $(CONFIG_H) $(SYSTEM_H) \
> -   coretypes.h $(TM_H) $(GGC_H) $(TREE_H) \
> -   $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
> -   $(TIMEVAR_H) $(CFGLOOP_H) $(SCEV_H) $(TREE_PASS_H) $(FLAGS_H) \
> -   gt-tree-scalar-evolution.h tree-pretty-print.h gimple-pretty-print.h
> -tree-data-ref.o: tree-data-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) $(FLAGS_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
> -   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
> -   $(TREE_DATA_REF_H) $(TREE_PASS_H) langhooks.h tree-pretty-print.h \
> -   gimple-pretty-print.h
> -sese.o: sese.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
> -   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) tree-chrec.h \
> -   $(TREE_DATA_REF_H) tree-scalar-evolution.h tree-pass.h domwalk.h value-prof.h \
> -   pointer-set.h $(GIMPLE_H) sese.h tree-pretty-print.h
> -graphite.o: graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
> -   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) $(DBGCNT_H) \
> -   $(PREDICT_H) $(TREE_DATA_REF_H) tree-pass.h graphite.h \
> -   pointer-set.h value-prof.h graphite-ppl.h sese.h \
> -   graphite-scop-detection.h graphite-clast-to-gimple.h \
> -   graphite-poly.h graphite-sese-to-poly.h
> -graphite-blocking.o: graphite-blocking.c $(CONFIG_H) $(SYSTEM_H) \
> -   coretypes.h \
> -   $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) output.h $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
> -   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
> -   $(GIMPLE_H) $(TREE_DATA_REF_H) tree-pass.h domwalk.h value-prof.h \
> -   graphite.h graphite-poly.h graphite-ppl.h
> -graphite-clast-to-gimple.o: graphite-clast-to-gimple.c $(CONFIG_H) \
> -   $(SYSTEM_H) coretypes.h $(TM_H) langhooks.h \
> -   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
> -   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
> -   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h \
> -   pointer-set.h value-prof.h graphite-cloog-util.h graphite-ppl.h sese.h \
> -   graphite-scop-detection.h graphite-clast-to-gimple.h graphite-poly.h \
> -   graphite-dependences.h
> -graphite-cloog-util.o: graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \
> -   coretypes.h $(TMP_H) $(GGC_H)
> -graphite-dependences.o: graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
> -   coretypes.h \
> -   $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
> -   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
> -   $(GIMPLE_H) $(TREE_DATA_REF_H) tree-pass.h domwalk.h \
> -   graphite.h graphite-poly.h graphite-ppl.h graphite-dependences.h
> -graphite-flattening.o: graphite-flattening.c $(CONFIG_H) $(SYSTEM_H)   \
> -   coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) output.h            \
> -   $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H)             \
> -   $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H)                        \
> -   $(TREE_DATA_REF_H) tree-pass.h domwalk.h value-prof.h graphite.h    \
> -   graphite-poly.h graphite-ppl.h
> -graphite-interchange.o: graphite-interchange.c $(CONFIG_H) $(SYSTEM_H) \
> -   coretypes.h \
> -   $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) output.h $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
> -   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
> -   $(GIMPLE_H) $(TREE_DATA_REF_H) tree-pass.h domwalk.h value-prof.h \
> -   graphite.h graphite-poly.h graphite-ppl.h
> -graphite-poly.o: graphite-poly.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
> -   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
> -   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h graphite-dependences.h \
> -   pointer-set.h value-prof.h graphite-ppl.h sese.h output.h graphite-poly.h \
> -   tree-pretty-print.h gimple-pretty-print.h
> -graphite-ppl.o: graphite-ppl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) graphite-ppl.h graphite-cloog-util.h
> -graphite-scop-detection.o: graphite-scop-detection.c $(CONFIG_H) $(SYSTEM_H) \
> -   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
> -   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
> -   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h $(TM_H) \
> -   value-prof.h graphite-ppl.h sese.h pointer-set.h coretypes.h \
> -   graphite-scop-detection.h graphite-poly.h
> -graphite-sese-to-poly.o: graphite-sese-to-poly.c $(CONFIG_H) \
> -   $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
> -   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
> -   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h \
> -   pointer-set.h value-prof.h graphite-ppl.h sese.h \
> -   graphite-scop-detection.h graphite-sese-to-poly.h $(PARAMS_H) \
> -   graphite-clast-to-gimple.h graphite-poly.h
> +   coretypes.h $(TREE_H) tree-pretty-print.h
> +omega.o : omega.c omega.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
> +   $(DIAGNOSTIC_CORE_H) $(TREE_PASS_H)
> +tree-chrec.o : tree-chrec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> +   tree-pretty-print.h $(CFGLOOP_H) $(TREE_FLOW_H) $(SCEV_H) $(TREE_PASS_H) \
> +   $(PARAMS_H)
> +tree-scalar-evolution.o : tree-scalar-evolution.c $(CONFIG_H) $(SYSTEM_H) \
> +   coretypes.h gimple-pretty-print.h $(TREE_FLOW_H) $(CFGLOOP_H) $(SCEV_H) \
> +   $(TREE_PASS_H) $(PARAMS_H) gt-tree-scalar-evolution.h
> +tree-data-ref.o : tree-data-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> +   gimple-pretty-print.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
> +   $(TREE_PASS_H) langhooks.h
> +sese.o : sese.c sese.h $(CONFIG_H) $(SYSTEM_H) coretypes.h tree-pretty-print.h \
> +   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) tree-pass.h value-prof.h
> +graphite.o : graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) \
> +   $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h $(DBGCNT_H) \
> +   graphite-ppl.h graphite-poly.h graphite-scop-detection.h \
> +   graphite-clast-to-gimple.h graphite-sese-to-poly.h
> +graphite-blocking.o : graphite-blocking.c $(CONFIG_H) $(SYSTEM_H) \
> +   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
> +   sese.h graphite-ppl.h graphite-poly.h
> +graphite-clast-to-gimple.o : graphite-clast-to-gimple.c $(CONFIG_H) \
> +   $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
> +   $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-cloog-util.h \
> +   graphite-ppl.h graphite-poly.h graphite-clast-to-gimple.h \
> +   graphite-dependences.h graphite-cloog-compat.h
> +graphite-cloog-util.o : graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \
> +   coretypes.h graphite-cloog-util.h graphite-cloog-compat.h
> +graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
> +   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
> +   sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h
> +graphite-flattening.o : graphite-flattening.c $(CONFIG_H) $(SYSTEM_H)  \
> +   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
> +   sese.h graphite-ppl.h graphite-poly.h
> +graphite-interchange.o : graphite-interchange.c $(CONFIG_H) $(SYSTEM_H) \
> +   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
> +   sese.h graphite-ppl.h graphite-poly.h
> +graphite-poly.o : graphite-poly.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> +   $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) gimple-pretty-print.h \
> +   $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-ppl.h graphite-poly.h \
> +   graphite-dependences.h graphite-cloog-util.h
> +graphite-ppl.o : graphite-ppl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> +   graphite-cloog-util.h graphite-ppl.h
> +graphite-scop-detection.o : graphite-scop-detection.c $(CONFIG_H) $(SYSTEM_H) \
> +   coretypes.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H) \
> +   sese.h graphite-ppl.h graphite-poly.h graphite-scop-detection.h
> +graphite-sese-to-poly.o : graphite-sese-to-poly.c $(CONFIG_H) \
> +   $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) \
> +   $(TREE_DATA_REF_H) domwalk.h sese.h graphite-ppl.h graphite-poly.h \
> +   graphite-sese-to-poly.h
>  tree-vect-loop.o: tree-vect-loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
>    $(TM_H) $(GGC_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) \
>    $(TREE_DUMP_H) $(CFGLOOP_H) $(CFGLAYOUT_H) $(EXPR_H) $(RECOG_H) $(OPTABS_H) \
> @@ -2777,19 +2741,12 @@ tree-vectorizer.o: tree-vectorizer.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
>    $(CFGLOOP_H) $(TREE_PASS_H) $(TREE_VECTORIZER_H) $(TIMEVAR_H) \
>    tree-pretty-print.h
>  tree-loop-linear.o: tree-loop-linear.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> -   $(TM_H) $(OPTABS_H) $(TREE_H) $(BASIC_BLOCK_H) \
> -   $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
> -   $(TREE_PASS_H) $(TREE_DATA_REF_H) $(EXPR_H) $(LAMBDA_H) \
> -   $(TARGET_H) $(OBSTACK_H)
> -tree-loop-distribution.o: tree-loop-distribution.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> -   $(TM_H) $(OPTABS_H) $(TREE_H) $(BASIC_BLOCK_H) \
> -   $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
> -   $(TREE_PASS_H) $(TREE_DATA_REF_H) $(EXPR_H) \
> -   langhooks.h $(TREE_VECTORIZER_H)
> -tree-parloops.o: tree-parloops.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
> -   $(TREE_FLOW_H) $(TREE_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
> -   $(DIAGNOSTIC_H) $(TREE_PASS_H) langhooks.h gt-tree-parloops.h \
> -   $(TREE_VECTORIZER_H) tree-pretty-print.h gimple-pretty-print.h
> +   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H) $(LAMBDA_H)
> +tree-loop-distribution.o: tree-loop-distribution.c $(CONFIG_H) $(SYSTEM_H) \
> +   coretypes.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H)
> +tree-parloops.o: tree-parloops.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> +   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) gimple-pretty-print.h \
> +   $(TREE_PASS_H) langhooks.h gt-tree-parloops.h $(TREE_VECTORIZER_H)
>  tree-stdarg.o: tree-stdarg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
>    $(TREE_H) $(FUNCTION_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_PASS_H) \
>    tree-stdarg.h $(TARGET_H) langhooks.h gimple-pretty-print.h
> @@ -3499,15 +3456,12 @@ ifcvt.o : ifcvt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
>    $(TARGET_H) $(BASIC_BLOCK_H) $(EXPR_H) output.h $(EXCEPT_H) $(TM_P_H) \
>    $(OPTABS_H) $(CFGLOOP_H) hard-reg-set.h $(TIMEVAR_H) \
>    $(TREE_PASS_H) $(DF_H) $(DBGCNT_H)
> -lambda-mat.o : lambda-mat.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
> -   $(TM_H) coretypes.h $(TREE_H) $(TREE_FLOW_H)
> -lambda-trans.o: lambda-trans.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
> -   $(TM_H) coretypes.h $(TARGET_H) $(TREE_H) $(TREE_FLOW_H)
> -lambda-code.o: lambda-code.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
> -   $(TM_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
> -   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) \
> -   $(CFGLOOP_H) $(TREE_DATA_REF_H) $(EXPR_H) coretypes.h $(TARGET_H) \
> -   $(TREE_PASS_H) $(VEC_H) vecprim.h $(OBSTACK_H) pointer-set.h
> +lambda-mat.o : lambda-mat.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) \
> +   $(LAMBDA_H)
> +lambda-trans.o : lambda-trans.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> +   $(TREE_FLOW_H) $(LAMBDA_H)
> +lambda-code.o : lambda-code.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
> +   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(LAMBDA_H) $(TREE_PASS_H)
>  params.o : params.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(PARAMS_H) \
>    $(DIAGNOSTIC_CORE_H)
>  pointer-set.o: pointer-set.c pointer-set.h $(CONFIG_H) $(SYSTEM_H)
> diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
> index f263cde..bcd077a 100644
> --- a/gcc/graphite-blocking.c
> +++ b/gcc/graphite-blocking.c
> @@ -23,32 +23,16 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "output.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
> -#include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
> -#include "domwalk.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
> -#include "params.h"
> +#include "sese.h"
>
>  #ifdef HAVE_cloog
>  #include "ppl_c.h"
> -#include "sese.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
>
>
> diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
> index 0937fc8..90bf90a 100644
> --- a/gcc/graphite-clast-to-gimple.c
> +++ b/gcc/graphite-clast-to-gimple.c
> @@ -21,25 +21,13 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "basic-block.h"
>  #include "diagnostic.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
> -#include "domwalk.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
> -#include "langhooks.h"
>  #include "sese.h"
>
>  #ifdef HAVE_cloog
> @@ -47,9 +35,7 @@ along with GCC; see the file COPYING3.  If not see
>  #include "ppl_c.h"
>  #include "graphite-cloog-util.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
> -#include "graphite-scop-detection.h"
>  #include "graphite-clast-to-gimple.h"
>  #include "graphite-dependences.h"
>  #include "graphite-cloog-compat.h"
> diff --git a/gcc/graphite-cloog-util.c b/gcc/graphite-cloog-util.c
> index df90b83..c3d0cc1 100644
> --- a/gcc/graphite-cloog-util.c
> +++ b/gcc/graphite-cloog-util.c
> @@ -22,8 +22,6 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
>
>  #ifdef HAVE_cloog
>
> diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
> index 445195c..a6a5254 100644
> --- a/gcc/graphite-dependences.c
> +++ b/gcc/graphite-dependences.c
> @@ -22,29 +22,17 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
> -#include "domwalk.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
> +#include "sese.h"
>
>  #ifdef HAVE_cloog
>  #include "ppl_c.h"
> -#include "sese.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
>  #include "graphite-dependences.h"
>
> diff --git a/gcc/graphite-flattening.c b/gcc/graphite-flattening.c
> index 6e341f4..ccd0f5f 100644
> --- a/gcc/graphite-flattening.c
> +++ b/gcc/graphite-flattening.c
> @@ -21,32 +21,17 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "output.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
> -#include "domwalk.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
> -#include "params.h"
> +#include "sese.h"
>
>  #ifdef HAVE_cloog
>  #include "ppl_c.h"
> -#include "sese.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
>
>  /* The loop flattening pass transforms loop nests into a single loop,
> diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
> index aafb94a..b90c4e7 100644
> --- a/gcc/graphite-interchange.c
> +++ b/gcc/graphite-interchange.c
> @@ -23,32 +23,17 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "output.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
> -#include "domwalk.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
> -#include "params.h"
> +#include "sese.h"
>
>  #ifdef HAVE_cloog
>  #include "ppl_c.h"
> -#include "sese.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
>
>  /* Builds a linear expression, of dimension DIM, representing PDR's
> diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
> index 9416cd7..cabab44 100644
> --- a/gcc/graphite-poly.c
> +++ b/gcc/graphite-poly.c
> @@ -21,34 +21,19 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "output.h"
> -#include "basic-block.h"
>  #include "diagnostic.h"
> -#include "tree-pretty-print.h"
> -#include "gimple-pretty-print.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
> +#include "gimple-pretty-print.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
> -#include "domwalk.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
> -#include "params.h"
> +#include "sese.h"
>
>  #ifdef HAVE_cloog
>  #include "ppl_c.h"
> -#include "sese.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
>  #include "graphite-dependences.h"
>  #include "graphite-cloog-util.h"
> diff --git a/gcc/graphite-ppl.c b/gcc/graphite-ppl.c
> index f87f345..fffa3ee 100644
> --- a/gcc/graphite-ppl.c
> +++ b/gcc/graphite-ppl.c
> @@ -22,8 +22,6 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
>
>  #ifdef HAVE_cloog
>
> diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
> index 6beddc3..aff0b03 100644
> --- a/gcc/graphite-scop-detection.c
> +++ b/gcc/graphite-scop-detection.c
> @@ -22,30 +22,17 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-flow.h"
> -#include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
>  #include "tree-pass.h"
> -#include "domwalk.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
>  #include "sese.h"
>
>  #ifdef HAVE_cloog
>  #include "ppl_c.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
>  #include "graphite-scop-detection.h"
>
> diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
> index a1373c7..0cd601a 100644
> --- a/gcc/graphite-sese-to-poly.c
> +++ b/gcc/graphite-sese-to-poly.c
> @@ -21,32 +21,19 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
>  #include "domwalk.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
>  #include "sese.h"
>
>  #ifdef HAVE_cloog
>  #include "ppl_c.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
> -#include "graphite-scop-detection.h"
>  #include "graphite-sese-to-poly.h"
>
>  /* Returns the index of the PHI argument defined in the outermost
> diff --git a/gcc/graphite.c b/gcc/graphite.c
> index 4ce484a..84a8898 100644
> --- a/gcc/graphite.c
> +++ b/gcc/graphite.c
> @@ -35,34 +35,19 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-flow.h"
>  #include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> -#include "tree-pass.h"
> -#include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
>  #include "sese.h"
> -#include "predict.h"
>  #include "dbgcnt.h"
>
>  #ifdef HAVE_cloog
>
> -#include "cloog/cloog.h"
>  #include "ppl_c.h"
> -#include "graphite-cloog-compat.h"
>  #include "graphite-ppl.h"
> -#include "graphite.h"
>  #include "graphite-poly.h"
>  #include "graphite-scop-detection.h"
>  #include "graphite-clast-to-gimple.h"
> diff --git a/gcc/graphite.h b/gcc/graphite.h
> deleted file mode 100644
> index 1007e9a..0000000
> --- a/gcc/graphite.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -/* Gimple Represented as Polyhedra.
> -   Copyright (C) 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
> -   Contributed by Sebastian Pop <sebastian.pop@inria.fr>.
> -
> -This file is part of GCC.
> -
> -GCC is free software; you can redistribute it and/or modify
> -it under the terms of the GNU General Public License as published by
> -the Free Software Foundation; either version 3, or (at your option)
> -any later version.
> -
> -GCC is distributed in the hope that it will be useful,
> -but WITHOUT ANY WARRANTY; without even the implied warranty of
> -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> -GNU General Public License for more details.
> -
> -You should have received a copy of the GNU General Public License
> -along with GCC; see the file COPYING3.  If not see
> -<http://www.gnu.org/licenses/>.  */
> -
> -#ifndef GCC_GRAPHITE_H
> -#define GCC_GRAPHITE_H
> -
> -#endif  /* GCC_GRAPHITE_H  */
> diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c
> index 6236235..f462071 100644
> --- a/gcc/lambda-code.c
> +++ b/gcc/lambda-code.c
> @@ -22,28 +22,13 @@
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "target.h"
> -#include "rtl.h"
> -#include "basic-block.h"
> -#include "diagnostic-core.h"
> -#include "obstack.h"
>  #include "tree-flow.h"
> -#include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
> -#include "expr.h"
> -#include "optabs.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
> -#include "tree-pass.h"
>  #include "tree-scalar-evolution.h"
> -#include "vec.h"
>  #include "lambda.h"
> -#include "vecprim.h"
> -#include "pointer-set.h"
> +#include "tree-pass.h"
>
>  /* This loop nest code generation is based on non-singular matrix
>    math.
> diff --git a/gcc/lambda-mat.c b/gcc/lambda-mat.c
> index 50fdb69..33b33ef 100644
> --- a/gcc/lambda-mat.c
> +++ b/gcc/lambda-mat.c
> @@ -21,9 +21,6 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
>  #include "tree-flow.h"
>  #include "lambda.h"
>
> diff --git a/gcc/lambda-trans.c b/gcc/lambda-trans.c
> index 0cf1db9..22f30b0 100644
> --- a/gcc/lambda-trans.c
> +++ b/gcc/lambda-trans.c
> @@ -21,10 +21,6 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "target.h"
>  #include "tree-flow.h"
>  #include "lambda.h"
>
> diff --git a/gcc/omega.c b/gcc/omega.c
> index fff3a29..aee99e7 100644
> --- a/gcc/omega.c
> +++ b/gcc/omega.c
> @@ -34,8 +34,6 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
>  #include "tree.h"
>  #include "diagnostic-core.h"
>  #include "tree-pass.h"
> diff --git a/gcc/sese.c b/gcc/sese.c
> index 076f07a..bfb0276 100644
> --- a/gcc/sese.c
> +++ b/gcc/sese.c
> @@ -23,25 +23,14 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "rtl.h"
> -#include "basic-block.h"
> -#include "diagnostic.h"
>  #include "tree-pretty-print.h"
>  #include "tree-flow.h"
> -#include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
>  #include "tree-pass.h"
> -#include "domwalk.h"
>  #include "value-prof.h"
> -#include "pointer-set.h"
> -#include "gimple.h"
>  #include "sese.h"
>
>  /* Print to stderr the element ELT.  */
> diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
> index 3803a50..dab7286 100644
> --- a/gcc/tree-browser.c
> +++ b/gcc/tree-browser.c
> @@ -22,19 +22,14 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
>  #include "tree.h"
> -#include "tree-inline.h"
>  #include "tree-pretty-print.h"
> -#include "hashtab.h"
> -
>
>  #define TB_OUT_FILE stdout
>  #define TB_IN_FILE stdin
>  #define TB_NIY fprintf (TB_OUT_FILE, "Sorry this command is not yet implemented.\n")
>  #define TB_WF fprintf (TB_OUT_FILE, "Warning, this command failed.\n")
>
> -
>  /* Structures for handling Tree Browser's commands.  */
>  #define DEFTBCODE(COMMAND, STRING, HELP)   COMMAND,
>  enum TB_Comm_code {
> diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
> index 0c13c21..c721d43 100644
> --- a/gcc/tree-chrec.c
> +++ b/gcc/tree-chrec.c
> @@ -27,20 +27,14 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
>  #include "tree-pretty-print.h"
>  #include "cfgloop.h"
>  #include "tree-flow.h"
>  #include "tree-chrec.h"
>  #include "tree-pass.h"
>  #include "params.h"
> -#include "flags.h"
>  #include "tree-scalar-evolution.h"
>
> -
> -
>  /* Extended folder for chrecs.  */
>
>  /* Determines whether CST is not a constant evolution.  */
> diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
> index a9782f4..3de3234 100644
> --- a/gcc/tree-data-ref.c
> +++ b/gcc/tree-data-ref.c
> @@ -77,16 +77,8 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "flags.h"
> -#include "tree.h"
> -#include "basic-block.h"
> -#include "tree-pretty-print.h"
>  #include "gimple-pretty-print.h"
>  #include "tree-flow.h"
> -#include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
> diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
> index d1a499b..783c47c 100644
> --- a/gcc/tree-loop-distribution.c
> +++ b/gcc/tree-loop-distribution.c
> @@ -45,20 +45,12 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "tree.h"
> -#include "basic-block.h"
>  #include "tree-flow.h"
> -#include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
>  #include "tree-scalar-evolution.h"
>  #include "tree-pass.h"
> -#include "lambda.h"
> -#include "langhooks.h"
> -#include "tree-vectorizer.h"
>
>  /* If bit I is not set, it means that this node represents an
>    operation that has already been performed, and that should not be
> diff --git a/gcc/tree-loop-linear.c b/gcc/tree-loop-linear.c
> index fa31b9d..5b19c17 100644
> --- a/gcc/tree-loop-linear.c
> +++ b/gcc/tree-loop-linear.c
> @@ -19,17 +19,10 @@ You should have received a copy of the GNU General Public License
>  along with GCC; see the file COPYING3.  If not see
>  <http://www.gnu.org/licenses/>.  */
>
> -
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "tree.h"
> -#include "basic-block.h"
> -#include "obstack.h"
>  #include "tree-flow.h"
> -#include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-data-ref.h"
> diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
> index aba70c8..9ece887 100644
> --- a/gcc/tree-parloops.c
> +++ b/gcc/tree-parloops.c
> @@ -23,16 +23,12 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "tree.h"
>  #include "tree-flow.h"
>  #include "cfgloop.h"
>  #include "tree-data-ref.h"
> -#include "tree-pretty-print.h"
> +#include "tree-scalar-evolution.h"
>  #include "gimple-pretty-print.h"
>  #include "tree-pass.h"
> -#include "tree-scalar-evolution.h"
> -#include "hashtab.h"
>  #include "langhooks.h"
>  #include "tree-vectorizer.h"
>
> diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
> index 24be2e8..d60e569 100644
> --- a/gcc/tree-scalar-evolution.c
> +++ b/gcc/tree-scalar-evolution.c
> @@ -257,20 +257,12 @@ along with GCC; see the file COPYING3.  If not see
>  #include "config.h"
>  #include "system.h"
>  #include "coretypes.h"
> -#include "tm.h"
> -#include "ggc.h"
> -#include "tree.h"
> -#include "basic-block.h"
> -#include "tree-pretty-print.h"
>  #include "gimple-pretty-print.h"
>  #include "tree-flow.h"
> -#include "tree-dump.h"
> -#include "timevar.h"
>  #include "cfgloop.h"
>  #include "tree-chrec.h"
>  #include "tree-scalar-evolution.h"
>  #include "tree-pass.h"
> -#include "flags.h"
>  #include "params.h"
>
>  static tree analyze_scalar_evolution_1 (struct loop *, tree, tree);
> --
> 1.7.1
>
>
Andrew Pinski - Dec. 28, 2010, 6:18 p.m.
On Tue, Dec 28, 2010 at 6:37 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
> On Tue, Dec 28, 2010 at 5:47 AM, Sebastian Pop <sebpop@gmail.com> wrote:
>> Hi,
>>
>> Joseph pointed out that the Graphite-OpenCL files are including .h
>> files that are not needed.  This patch removes the unnecessary
>> includes from some middle-end passes.  I will commit a separate patch
>> to fix the Graphite-OpenCL files in the graphite branch.  This patch
>> passed regstrap on amd64-linux on trunk.  Ok for trunk?
>
> Ok.

This causes a bootstrap failure when graphite is not enabled:
/home/regress/tbox/svn-gcc/gcc/graphite.c: In function
'graphite_transform_loops':
/home/regress/tbox/svn-gcc/gcc/graphite.c:285:3: error: implicit
declaration of function 'sorry'
[-Werror=implicit-function-declaration]
cc1: all warnings being treated as errors

make[3]: *** [graphite.o] Error 1

Thanks,
Andrew Pinski

Patch

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83ad1a9..20c0da3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,53 @@ 
+2010-12-27  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* Makefile.in (TREE_VECTORIZER_H): Removed duplicate definition.
+	(tree-browser.o): Update dependences.
+	(omega.o): Same.
+	(tree-chrec.o): Same.
+	(tree-scalar-evolution.o): Same.
+	(tree-data-ref.o): Same.
+	(sese.o): Same.
+	(graphite.o): Same.
+	(graphite-blocking.o): Same.
+	(graphite-clast-to-gimple.o): Same.
+	(graphite-cloog-util.o): Same.
+	(graphite-dependences.o): Same.
+	(graphite-flattening.o): Same.
+	(graphite-interchange.o): Same.
+	(graphite-poly.o): Same.
+	(graphite-ppl.o): Same.
+	(graphite-scop-detection.o): Same.
+	(graphite-sese-to-poly.o): Same.
+	(tree-loop-linear.o): Same.
+	(tree-loop-distribution.o): Same.
+	(tree-parloops.o): Same.
+	(lambda-mat.o): Same.
+	(lambda-trans.o): Same.
+	(lambda-code.o): Same.
+	* tree-browser.o: Do not include unnecessary .h files.
+	* omega.o: Same.
+	* tree-chrec.o: Same.
+	* tree-scalar-evolution.o: Same.
+	* tree-data-ref.o: Same.
+	* sese.o: Same.
+	* graphite.o: Same.
+	* graphite-blocking.o: Same.
+	* graphite-clast-to-gimple.o: Same.
+	* graphite-cloog-util.o: Same.
+	* graphite-dependences.o: Same.
+	* graphite-flattening.o: Same.
+	* graphite-interchange.o: Same.
+	* graphite-poly.o: Same.
+	* graphite-ppl.o: Same.
+	* graphite-scop-detection.o: Same.
+	* graphite-sese-to-poly.o: Same.
+	* tree-loop-linear.o: Same.
+	* tree-loop-distribution.o: Same.
+	* tree-parloops.o: Same.
+	* lambda-mat.o: Same.
+	* lambda-trans.o: Same.
+	* lambda-code.o: Same.
+
 2010-12-23  Sebastian Pop  <sebastian.pop@amd.com>
 	    Richard Guenther  <rguenther@suse.de>
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f031630..b5f9bd2 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -959,7 +959,6 @@  TREE_FLOW_H = tree-flow.h tree-flow-inline.h tree-ssa-operands.h \
 		$(HASHTAB_H) $(CGRAPH_H) $(IPA_REFERENCE_H) \
 		tree-ssa-alias.h
 TREE_SSA_LIVE_H = tree-ssa-live.h $(PARTITION_H) vecprim.h
-TREE_VECTORIZER_H = tree-vectorizer.h $(TREE_DATA_REF_H)
 SSAEXPAND_H = ssaexpand.h $(TREE_SSA_LIVE_H)
 PRETTY_PRINT_H = pretty-print.h $(INPUT_H) $(OBSTACK_H)
 DIAGNOSTIC_CORE_H = diagnostic-core.h $(INPUT_H) bversion.h diagnostic.def
@@ -2656,91 +2655,56 @@  omp-low.o : omp-low.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
    $(TREE_PASS_H) $(GGC_H) $(EXCEPT_H) $(SPLAY_TREE_H) $(OPTABS_H) \
    $(CFGLOOP_H) tree-iterator.h gt-omp-low.h
 tree-browser.o : tree-browser.c tree-browser.def $(CONFIG_H) $(SYSTEM_H) \
-   $(TREE_H) $(TREE_INLINE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) \
-   $(TM_H) coretypes.h tree-pretty-print.h
-omega.o : omega.c omega.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) $(TREE_H) $(DIAGNOSTIC_CORE_H) $(TREE_PASS_H) $(PARAMS_H)
-tree-chrec.o: tree-chrec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) $(TREE_H) $(SCEV_H) $(TREE_PASS_H) $(PARAMS_H) \
-   $(DIAGNOSTIC_H) $(CFGLOOP_H) $(TREE_FLOW_H) $(FLAGS_H) tree-pretty-print.h
-tree-scalar-evolution.o: tree-scalar-evolution.c $(CONFIG_H) $(SYSTEM_H) \
-   coretypes.h $(TM_H) $(GGC_H) $(TREE_H) \
-   $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
-   $(TIMEVAR_H) $(CFGLOOP_H) $(SCEV_H) $(TREE_PASS_H) $(FLAGS_H) \
-   gt-tree-scalar-evolution.h tree-pretty-print.h gimple-pretty-print.h
-tree-data-ref.o: tree-data-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) $(FLAGS_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
-   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
-   $(TREE_DATA_REF_H) $(TREE_PASS_H) langhooks.h tree-pretty-print.h \
-   gimple-pretty-print.h
-sese.o: sese.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
-   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) tree-chrec.h \
-   $(TREE_DATA_REF_H) tree-scalar-evolution.h tree-pass.h domwalk.h value-prof.h \
-   pointer-set.h $(GIMPLE_H) sese.h tree-pretty-print.h
-graphite.o: graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
-   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) $(DBGCNT_H) \
-   $(PREDICT_H) $(TREE_DATA_REF_H) tree-pass.h graphite.h \
-   pointer-set.h value-prof.h graphite-ppl.h sese.h \
-   graphite-scop-detection.h graphite-clast-to-gimple.h \
-   graphite-poly.h graphite-sese-to-poly.h
-graphite-blocking.o: graphite-blocking.c $(CONFIG_H) $(SYSTEM_H) \
-   coretypes.h \
-   $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) output.h $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
-   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
-   $(GIMPLE_H) $(TREE_DATA_REF_H) tree-pass.h domwalk.h value-prof.h \
-   graphite.h graphite-poly.h graphite-ppl.h
-graphite-clast-to-gimple.o: graphite-clast-to-gimple.c $(CONFIG_H) \
-   $(SYSTEM_H) coretypes.h $(TM_H) langhooks.h \
-   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
-   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
-   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h \
-   pointer-set.h value-prof.h graphite-cloog-util.h graphite-ppl.h sese.h \
-   graphite-scop-detection.h graphite-clast-to-gimple.h graphite-poly.h \
-   graphite-dependences.h
-graphite-cloog-util.o: graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \
-   coretypes.h $(TMP_H) $(GGC_H)
-graphite-dependences.o: graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
-   coretypes.h \
-   $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
-   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
-   $(GIMPLE_H) $(TREE_DATA_REF_H) tree-pass.h domwalk.h \
-   graphite.h graphite-poly.h graphite-ppl.h graphite-dependences.h
-graphite-flattening.o: graphite-flattening.c $(CONFIG_H) $(SYSTEM_H)	\
-   coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) output.h		\
-   $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H)		\
-   $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H)			\
-   $(TREE_DATA_REF_H) tree-pass.h domwalk.h value-prof.h graphite.h	\
-   graphite-poly.h graphite-ppl.h
-graphite-interchange.o: graphite-interchange.c $(CONFIG_H) $(SYSTEM_H) \
-   coretypes.h \
-   $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) output.h $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
-   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
-   $(GIMPLE_H) $(TREE_DATA_REF_H) tree-pass.h domwalk.h value-prof.h \
-   graphite.h graphite-poly.h graphite-ppl.h
-graphite-poly.o: graphite-poly.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
-   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
-   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h graphite-dependences.h \
-   pointer-set.h value-prof.h graphite-ppl.h sese.h output.h graphite-poly.h \
-   tree-pretty-print.h gimple-pretty-print.h
-graphite-ppl.o: graphite-ppl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) graphite-ppl.h graphite-cloog-util.h
-graphite-scop-detection.o: graphite-scop-detection.c $(CONFIG_H) $(SYSTEM_H) \
-   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
-   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
-   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h $(TM_H) \
-   value-prof.h graphite-ppl.h sese.h pointer-set.h coretypes.h \
-   graphite-scop-detection.h graphite-poly.h
-graphite-sese-to-poly.o: graphite-sese-to-poly.c $(CONFIG_H) \
-   $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(DIAGNOSTIC_CORE_H) \
-   $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
-   $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h \
-   pointer-set.h value-prof.h graphite-ppl.h sese.h \
-   graphite-scop-detection.h graphite-sese-to-poly.h $(PARAMS_H) \
-   graphite-clast-to-gimple.h graphite-poly.h
+   coretypes.h $(TREE_H) tree-pretty-print.h
+omega.o : omega.c omega.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
+   $(DIAGNOSTIC_CORE_H) $(TREE_PASS_H)
+tree-chrec.o : tree-chrec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   tree-pretty-print.h $(CFGLOOP_H) $(TREE_FLOW_H) $(SCEV_H) $(TREE_PASS_H) \
+   $(PARAMS_H)
+tree-scalar-evolution.o : tree-scalar-evolution.c $(CONFIG_H) $(SYSTEM_H) \
+   coretypes.h gimple-pretty-print.h $(TREE_FLOW_H) $(CFGLOOP_H) $(SCEV_H) \
+   $(TREE_PASS_H) $(PARAMS_H) gt-tree-scalar-evolution.h
+tree-data-ref.o : tree-data-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   gimple-pretty-print.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
+   $(TREE_PASS_H) langhooks.h
+sese.o : sese.c sese.h $(CONFIG_H) $(SYSTEM_H) coretypes.h tree-pretty-print.h \
+   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) tree-pass.h value-prof.h
+graphite.o : graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) \
+   $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h $(DBGCNT_H) \
+   graphite-ppl.h graphite-poly.h graphite-scop-detection.h \
+   graphite-clast-to-gimple.h graphite-sese-to-poly.h
+graphite-blocking.o : graphite-blocking.c $(CONFIG_H) $(SYSTEM_H) \
+   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
+   sese.h graphite-ppl.h graphite-poly.h
+graphite-clast-to-gimple.o : graphite-clast-to-gimple.c $(CONFIG_H) \
+   $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
+   $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-cloog-util.h \
+   graphite-ppl.h graphite-poly.h graphite-clast-to-gimple.h \
+   graphite-dependences.h graphite-cloog-compat.h
+graphite-cloog-util.o : graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \
+   coretypes.h graphite-cloog-util.h graphite-cloog-compat.h
+graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
+   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
+   sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h
+graphite-flattening.o : graphite-flattening.c $(CONFIG_H) $(SYSTEM_H)	\
+   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
+   sese.h graphite-ppl.h graphite-poly.h
+graphite-interchange.o : graphite-interchange.c $(CONFIG_H) $(SYSTEM_H) \
+   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
+   sese.h graphite-ppl.h graphite-poly.h
+graphite-poly.o : graphite-poly.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) gimple-pretty-print.h \
+   $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-ppl.h graphite-poly.h \
+   graphite-dependences.h graphite-cloog-util.h
+graphite-ppl.o : graphite-ppl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   graphite-cloog-util.h graphite-ppl.h
+graphite-scop-detection.o : graphite-scop-detection.c $(CONFIG_H) $(SYSTEM_H) \
+   coretypes.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H) \
+   sese.h graphite-ppl.h graphite-poly.h graphite-scop-detection.h
+graphite-sese-to-poly.o : graphite-sese-to-poly.c $(CONFIG_H) \
+   $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) \
+   $(TREE_DATA_REF_H) domwalk.h sese.h graphite-ppl.h graphite-poly.h \
+   graphite-sese-to-poly.h
 tree-vect-loop.o: tree-vect-loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) $(GGC_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) \
    $(TREE_DUMP_H) $(CFGLOOP_H) $(CFGLAYOUT_H) $(EXPR_H) $(RECOG_H) $(OPTABS_H) \
@@ -2777,19 +2741,12 @@  tree-vectorizer.o: tree-vectorizer.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(CFGLOOP_H) $(TREE_PASS_H) $(TREE_VECTORIZER_H) $(TIMEVAR_H) \
    tree-pretty-print.h
 tree-loop-linear.o: tree-loop-linear.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(OPTABS_H) $(TREE_H) $(BASIC_BLOCK_H) \
-   $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
-   $(TREE_PASS_H) $(TREE_DATA_REF_H) $(EXPR_H) $(LAMBDA_H) \
-   $(TARGET_H) $(OBSTACK_H)
-tree-loop-distribution.o: tree-loop-distribution.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(OPTABS_H) $(TREE_H) $(BASIC_BLOCK_H) \
-   $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
-   $(TREE_PASS_H) $(TREE_DATA_REF_H) $(EXPR_H) \
-   langhooks.h $(TREE_VECTORIZER_H)
-tree-parloops.o: tree-parloops.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(TREE_FLOW_H) $(TREE_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
-   $(DIAGNOSTIC_H) $(TREE_PASS_H) langhooks.h gt-tree-parloops.h \
-   $(TREE_VECTORIZER_H) tree-pretty-print.h gimple-pretty-print.h
+   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H) $(LAMBDA_H)
+tree-loop-distribution.o: tree-loop-distribution.c $(CONFIG_H) $(SYSTEM_H) \
+   coretypes.h $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H)
+tree-parloops.o: tree-parloops.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) gimple-pretty-print.h \
+   $(TREE_PASS_H) langhooks.h gt-tree-parloops.h $(TREE_VECTORIZER_H)
 tree-stdarg.o: tree-stdarg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    $(TREE_H) $(FUNCTION_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_PASS_H) \
    tree-stdarg.h $(TARGET_H) langhooks.h gimple-pretty-print.h
@@ -3499,15 +3456,12 @@  ifcvt.o : ifcvt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(TARGET_H) $(BASIC_BLOCK_H) $(EXPR_H) output.h $(EXCEPT_H) $(TM_P_H) \
    $(OPTABS_H) $(CFGLOOP_H) hard-reg-set.h $(TIMEVAR_H) \
    $(TREE_PASS_H) $(DF_H) $(DBGCNT_H)
-lambda-mat.o : lambda-mat.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
-   $(TM_H) coretypes.h $(TREE_H) $(TREE_FLOW_H)
-lambda-trans.o: lambda-trans.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
-   $(TM_H) coretypes.h $(TARGET_H) $(TREE_H) $(TREE_FLOW_H)
-lambda-code.o: lambda-code.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
-   $(TM_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
-   $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) \
-   $(CFGLOOP_H) $(TREE_DATA_REF_H) $(EXPR_H) coretypes.h $(TARGET_H) \
-   $(TREE_PASS_H) $(VEC_H) vecprim.h $(OBSTACK_H) pointer-set.h
+lambda-mat.o : lambda-mat.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_FLOW_H) \
+   $(LAMBDA_H)
+lambda-trans.o : lambda-trans.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   $(TREE_FLOW_H) $(LAMBDA_H)
+lambda-code.o : lambda-code.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   $(TREE_FLOW_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) $(LAMBDA_H) $(TREE_PASS_H)
 params.o : params.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(PARAMS_H) \
    $(DIAGNOSTIC_CORE_H)
 pointer-set.o: pointer-set.c pointer-set.h $(CONFIG_H) $(SYSTEM_H)
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index f263cde..bcd077a 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -23,32 +23,16 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "output.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
-#include "tree-scalar-evolution.h"
-#include "tree-pass.h"
-#include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
-#include "params.h"
+#include "sese.h"
 
 #ifdef HAVE_cloog
 #include "ppl_c.h"
-#include "sese.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
 
 
diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
index 0937fc8..90bf90a 100644
--- a/gcc/graphite-clast-to-gimple.c
+++ b/gcc/graphite-clast-to-gimple.c
@@ -21,25 +21,13 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "basic-block.h"
 #include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "tree-pass.h"
-#include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
-#include "langhooks.h"
 #include "sese.h"
 
 #ifdef HAVE_cloog
@@ -47,9 +35,7 @@  along with GCC; see the file COPYING3.  If not see
 #include "ppl_c.h"
 #include "graphite-cloog-util.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
-#include "graphite-scop-detection.h"
 #include "graphite-clast-to-gimple.h"
 #include "graphite-dependences.h"
 #include "graphite-cloog-compat.h"
diff --git a/gcc/graphite-cloog-util.c b/gcc/graphite-cloog-util.c
index df90b83..c3d0cc1 100644
--- a/gcc/graphite-cloog-util.c
+++ b/gcc/graphite-cloog-util.c
@@ -22,8 +22,6 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
 
 #ifdef HAVE_cloog
 
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index 445195c..a6a5254 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -22,29 +22,17 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "tree-pass.h"
-#include "domwalk.h"
-#include "pointer-set.h"
-#include "gimple.h"
+#include "sese.h"
 
 #ifdef HAVE_cloog
 #include "ppl_c.h"
-#include "sese.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
 #include "graphite-dependences.h"
 
diff --git a/gcc/graphite-flattening.c b/gcc/graphite-flattening.c
index 6e341f4..ccd0f5f 100644
--- a/gcc/graphite-flattening.c
+++ b/gcc/graphite-flattening.c
@@ -21,32 +21,17 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "output.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "tree-pass.h"
-#include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
-#include "params.h"
+#include "sese.h"
 
 #ifdef HAVE_cloog
 #include "ppl_c.h"
-#include "sese.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
 
 /* The loop flattening pass transforms loop nests into a single loop,
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index aafb94a..b90c4e7 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -23,32 +23,17 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "output.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "tree-pass.h"
-#include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
-#include "params.h"
+#include "sese.h"
 
 #ifdef HAVE_cloog
 #include "ppl_c.h"
-#include "sese.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
 
 /* Builds a linear expression, of dimension DIM, representing PDR's
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index 9416cd7..cabab44 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -21,34 +21,19 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "output.h"
-#include "basic-block.h"
 #include "diagnostic.h"
-#include "tree-pretty-print.h"
-#include "gimple-pretty-print.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
+#include "gimple-pretty-print.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "tree-pass.h"
-#include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
-#include "params.h"
+#include "sese.h"
 
 #ifdef HAVE_cloog
 #include "ppl_c.h"
-#include "sese.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
 #include "graphite-dependences.h"
 #include "graphite-cloog-util.h"
diff --git a/gcc/graphite-ppl.c b/gcc/graphite-ppl.c
index f87f345..fffa3ee 100644
--- a/gcc/graphite-ppl.c
+++ b/gcc/graphite-ppl.c
@@ -22,8 +22,6 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
 
 #ifdef HAVE_cloog
 
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 6beddc3..aff0b03 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -22,30 +22,17 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
 #include "tree-pass.h"
-#include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
 #include "sese.h"
 
 #ifdef HAVE_cloog
 #include "ppl_c.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
 #include "graphite-scop-detection.h"
 
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index a1373c7..0cd601a 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -21,32 +21,19 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "tree-pass.h"
 #include "domwalk.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
 #include "sese.h"
 
 #ifdef HAVE_cloog
 #include "ppl_c.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
-#include "graphite-scop-detection.h"
 #include "graphite-sese-to-poly.h"
 
 /* Returns the index of the PHI argument defined in the outermost
diff --git a/gcc/graphite.c b/gcc/graphite.c
index 4ce484a..84a8898 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -35,34 +35,19 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
-#include "tree-pass.h"
-#include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
 #include "sese.h"
-#include "predict.h"
 #include "dbgcnt.h"
 
 #ifdef HAVE_cloog
 
-#include "cloog/cloog.h"
 #include "ppl_c.h"
-#include "graphite-cloog-compat.h"
 #include "graphite-ppl.h"
-#include "graphite.h"
 #include "graphite-poly.h"
 #include "graphite-scop-detection.h"
 #include "graphite-clast-to-gimple.h"
diff --git a/gcc/graphite.h b/gcc/graphite.h
deleted file mode 100644
index 1007e9a..0000000
--- a/gcc/graphite.h
+++ /dev/null
@@ -1,24 +0,0 @@ 
-/* Gimple Represented as Polyhedra.
-   Copyright (C) 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-   Contributed by Sebastian Pop <sebastian.pop@inria.fr>.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef GCC_GRAPHITE_H
-#define GCC_GRAPHITE_H
-
-#endif  /* GCC_GRAPHITE_H  */
diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c
index 6236235..f462071 100644
--- a/gcc/lambda-code.c
+++ b/gcc/lambda-code.c
@@ -22,28 +22,13 @@ 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "target.h"
-#include "rtl.h"
-#include "basic-block.h"
-#include "diagnostic-core.h"
-#include "obstack.h"
 #include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
-#include "expr.h"
-#include "optabs.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
-#include "tree-pass.h"
 #include "tree-scalar-evolution.h"
-#include "vec.h"
 #include "lambda.h"
-#include "vecprim.h"
-#include "pointer-set.h"
+#include "tree-pass.h"
 
 /* This loop nest code generation is based on non-singular matrix
    math.
diff --git a/gcc/lambda-mat.c b/gcc/lambda-mat.c
index 50fdb69..33b33ef 100644
--- a/gcc/lambda-mat.c
+++ b/gcc/lambda-mat.c
@@ -21,9 +21,6 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
 #include "tree-flow.h"
 #include "lambda.h"
 
diff --git a/gcc/lambda-trans.c b/gcc/lambda-trans.c
index 0cf1db9..22f30b0 100644
--- a/gcc/lambda-trans.c
+++ b/gcc/lambda-trans.c
@@ -21,10 +21,6 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "target.h"
 #include "tree-flow.h"
 #include "lambda.h"
 
diff --git a/gcc/omega.c b/gcc/omega.c
index fff3a29..aee99e7 100644
--- a/gcc/omega.c
+++ b/gcc/omega.c
@@ -34,8 +34,6 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
 #include "tree.h"
 #include "diagnostic-core.h"
 #include "tree-pass.h"
diff --git a/gcc/sese.c b/gcc/sese.c
index 076f07a..bfb0276 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -23,25 +23,14 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "rtl.h"
-#include "basic-block.h"
-#include "diagnostic.h"
 #include "tree-pretty-print.h"
 #include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
 #include "tree-pass.h"
-#include "domwalk.h"
 #include "value-prof.h"
-#include "pointer-set.h"
-#include "gimple.h"
 #include "sese.h"
 
 /* Print to stderr the element ELT.  */
diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
index 3803a50..dab7286 100644
--- a/gcc/tree-browser.c
+++ b/gcc/tree-browser.c
@@ -22,19 +22,14 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "tree.h"
-#include "tree-inline.h"
 #include "tree-pretty-print.h"
-#include "hashtab.h"
-
 
 #define TB_OUT_FILE stdout
 #define TB_IN_FILE stdin
 #define TB_NIY fprintf (TB_OUT_FILE, "Sorry this command is not yet implemented.\n")
 #define TB_WF fprintf (TB_OUT_FILE, "Warning, this command failed.\n")
 
-
 /* Structures for handling Tree Browser's commands.  */
 #define DEFTBCODE(COMMAND, STRING, HELP)   COMMAND,
 enum TB_Comm_code {
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index 0c13c21..c721d43 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -27,20 +27,14 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
 #include "tree-pretty-print.h"
 #include "cfgloop.h"
 #include "tree-flow.h"
 #include "tree-chrec.h"
 #include "tree-pass.h"
 #include "params.h"
-#include "flags.h"
 #include "tree-scalar-evolution.h"
 
-
-
 /* Extended folder for chrecs.  */
 
 /* Determines whether CST is not a constant evolution.  */
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index a9782f4..3de3234 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -77,16 +77,8 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "flags.h"
-#include "tree.h"
-#include "basic-block.h"
-#include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
 #include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index d1a499b..783c47c 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -45,20 +45,12 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
-#include "basic-block.h"
 #include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
 #include "tree-scalar-evolution.h"
 #include "tree-pass.h"
-#include "lambda.h"
-#include "langhooks.h"
-#include "tree-vectorizer.h"
 
 /* If bit I is not set, it means that this node represents an
    operation that has already been performed, and that should not be
diff --git a/gcc/tree-loop-linear.c b/gcc/tree-loop-linear.c
index fa31b9d..5b19c17 100644
--- a/gcc/tree-loop-linear.c
+++ b/gcc/tree-loop-linear.c
@@ -19,17 +19,10 @@  You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
-#include "basic-block.h"
-#include "obstack.h"
 #include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-data-ref.h"
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index aba70c8..9ece887 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -23,16 +23,12 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "tree-flow.h"
 #include "cfgloop.h"
 #include "tree-data-ref.h"
-#include "tree-pretty-print.h"
+#include "tree-scalar-evolution.h"
 #include "gimple-pretty-print.h"
 #include "tree-pass.h"
-#include "tree-scalar-evolution.h"
-#include "hashtab.h"
 #include "langhooks.h"
 #include "tree-vectorizer.h"
 
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 24be2e8..d60e569 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -257,20 +257,12 @@  along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "ggc.h"
-#include "tree.h"
-#include "basic-block.h"
-#include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
 #include "tree-flow.h"
-#include "tree-dump.h"
-#include "timevar.h"
 #include "cfgloop.h"
 #include "tree-chrec.h"
 #include "tree-scalar-evolution.h"
 #include "tree-pass.h"
-#include "flags.h"
 #include "params.h"
 
 static tree analyze_scalar_evolution_1 (struct loop *, tree, tree);