summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog439
-rw-r--r--gcc/ada/ChangeLog10
-rw-r--r--gcc/ada/gcc-interface/cuintp.c3
-rw-r--r--gcc/ada/gcc-interface/decl.c3
-rw-r--r--gcc/ada/gcc-interface/misc.c3
-rw-r--r--gcc/ada/gcc-interface/targtyps.c3
-rw-r--r--gcc/ada/gcc-interface/trans.c3
-rw-r--r--gcc/ada/gcc-interface/utils.c3
-rw-r--r--gcc/ada/gcc-interface/utils2.c3
-rw-r--r--gcc/alias.c17
-rw-r--r--gcc/asan.c17
-rw-r--r--gcc/attribs.c3
-rw-r--r--gcc/auto-inc-dec.c13
-rw-r--r--gcc/auto-profile.c20
-rw-r--r--gcc/backend.h36
-rw-r--r--gcc/bb-reorder.c13
-rw-r--r--gcc/bt-load.c13
-rw-r--r--gcc/builtins.c13
-rw-r--r--gcc/c-family/ChangeLog23
-rw-r--r--gcc/c-family/array-notation-common.c3
-rw-r--r--gcc/c-family/c-ada-spec.c3
-rw-r--r--gcc/c-family/c-cilkplus.c3
-rw-r--r--gcc/c-family/c-common.h1
-rw-r--r--gcc/c-family/c-cppbuiltin.c1
-rw-r--r--gcc/c-family/c-dump.c1
-rw-r--r--gcc/c-family/c-format.c1
-rw-r--r--gcc/c-family/c-gimplify.c15
-rw-r--r--gcc/c-family/c-indentation.c1
-rw-r--r--gcc/c-family/c-lex.c1
-rw-r--r--gcc/c-family/c-omp.c1
-rw-r--r--gcc/c-family/c-opts.c1
-rw-r--r--gcc/c-family/c-pch.c1
-rw-r--r--gcc/c-family/c-ppoutput.c3
-rw-r--r--gcc/c-family/c-pragma.c3
-rw-r--r--gcc/c-family/c-pretty-print.c3
-rw-r--r--gcc/c-family/c-semantics.c3
-rw-r--r--gcc/c-family/c-ubsan.c3
-rw-r--r--gcc/c-family/cilk.c3
-rw-r--r--gcc/c-family/stub-objc.c3
-rw-r--r--gcc/c/ChangeLog12
-rw-r--r--gcc/c/c-array-notation.c3
-rw-r--r--gcc/c/c-aux-info.c3
-rw-r--r--gcc/c/c-convert.c3
-rw-r--r--gcc/c/c-decl.c3
-rw-r--r--gcc/c/c-errors.c3
-rw-r--r--gcc/c/c-lang.c3
-rw-r--r--gcc/c/c-objc-common.c3
-rw-r--r--gcc/c/c-parser.c3
-rw-r--r--gcc/c/c-typeck.c3
-rw-r--r--gcc/caller-save.c13
-rw-r--r--gcc/calls.c15
-rw-r--r--gcc/ccmp.c23
-rw-r--r--gcc/cfg.c12
-rw-r--r--gcc/cfg.h2
-rw-r--r--gcc/cfganal.c9
-rw-r--r--gcc/cfgbuild.c10
-rw-r--r--gcc/cfgcleanup.c14
-rw-r--r--gcc/cfgexpand.c23
-rw-r--r--gcc/cfghooks.c9
-rw-r--r--gcc/cfgloop.c15
-rw-r--r--gcc/cfgloop.h3
-rw-r--r--gcc/cfgloopanal.c11
-rw-r--r--gcc/cfgloopmanip.c15
-rw-r--r--gcc/cfgrtl.c15
-rw-r--r--gcc/cgraph.c17
-rw-r--r--gcc/cgraphbuild.c16
-rw-r--r--gcc/cgraphclones.c14
-rw-r--r--gcc/cgraphunit.c19
-rw-r--r--gcc/cilk-common.c6
-rw-r--r--gcc/combine-stack-adj.c13
-rw-r--r--gcc/combine.c13
-rw-r--r--gcc/compare-elim.c10
-rw-r--r--gcc/config/aarch64/aarch64-builtins.c17
-rw-r--r--gcc/config/aarch64/aarch64.c19
-rw-r--r--gcc/config/aarch64/cortex-a57-fma-steering.c12
-rw-r--r--gcc/config/alpha/alpha.c21
-rw-r--r--gcc/config/arc/arc.c15
-rw-r--r--gcc/config/arm/aarch-common.c1
-rw-r--r--gcc/config/arm/arm-builtins.c2
-rw-r--r--gcc/config/arm/arm-c.c1
-rw-r--r--gcc/config/arm/arm.c15
-rw-r--r--gcc/config/avr/avr-c.c1
-rw-r--r--gcc/config/avr/avr-log.c2
-rw-r--r--gcc/config/avr/avr.c13
-rw-r--r--gcc/config/bfin/bfin.c13
-rw-r--r--gcc/config/c6x/c6x.c13
-rw-r--r--gcc/config/cr16/cr16.c13
-rw-r--r--gcc/config/cris/cris.c13
-rw-r--r--gcc/config/darwin-c.c2
-rw-r--r--gcc/config/darwin.c17
-rw-r--r--gcc/config/epiphany/epiphany.c15
-rw-r--r--gcc/config/epiphany/mode-switch-use.c10
-rw-r--r--gcc/config/epiphany/resolve-sw-modes.c13
-rw-r--r--gcc/config/fr30/fr30.c13
-rw-r--r--gcc/config/frv/frv.c15
-rw-r--r--gcc/config/ft32/ft32.c13
-rw-r--r--gcc/config/h8300/h8300.c13
-rw-r--r--gcc/config/i386/i386-c.c3
-rw-r--r--gcc/config/i386/i386.c18
-rw-r--r--gcc/config/i386/msformat-c.c1
-rw-r--r--gcc/config/i386/winnt-cxx.c1
-rw-r--r--gcc/config/i386/winnt-stubs.c2
-rw-r--r--gcc/config/i386/winnt.c17
-rw-r--r--gcc/config/ia64/ia64-c.c1
-rw-r--r--gcc/config/ia64/ia64.c17
-rw-r--r--gcc/config/iq2000/iq2000.c15
-rw-r--r--gcc/config/lm32/lm32.c13
-rw-r--r--gcc/config/m32c/m32c-pragma.c1
-rw-r--r--gcc/config/m32c/m32c.c17
-rw-r--r--gcc/config/m32r/m32r.c15
-rw-r--r--gcc/config/m68k/m68k.c15
-rw-r--r--gcc/config/mcore/mcore.c13
-rw-r--r--gcc/config/mep/mep-pragma.c1
-rw-r--r--gcc/config/mep/mep.c17
-rw-r--r--gcc/config/microblaze/microblaze-c.c1
-rw-r--r--gcc/config/microblaze/microblaze.c13
-rw-r--r--gcc/config/mips/mips.c17
-rw-r--r--gcc/config/mmix/mmix.c13
-rw-r--r--gcc/config/mn10300/mn10300.c13
-rw-r--r--gcc/config/moxie/moxie.c13
-rw-r--r--gcc/config/msp430/msp430-c.c1
-rw-r--r--gcc/config/msp430/msp430.c15
-rw-r--r--gcc/config/nds32/nds32-cost.c15
-rw-r--r--gcc/config/nds32/nds32-fp-as-gp.c15
-rw-r--r--gcc/config/nds32/nds32-intrinsic.c15
-rw-r--r--gcc/config/nds32/nds32-isr.c15
-rw-r--r--gcc/config/nds32/nds32-md-auxiliary.c15
-rw-r--r--gcc/config/nds32/nds32-memory-manipulation.c15
-rw-r--r--gcc/config/nds32/nds32-pipelines-auxiliary.c15
-rw-r--r--gcc/config/nds32/nds32-predicates.c15
-rw-r--r--gcc/config/nds32/nds32.c15
-rw-r--r--gcc/config/nios2/nios2.c13
-rw-r--r--gcc/config/nvptx/nvptx.c11
-rw-r--r--gcc/config/pa/pa.c13
-rw-r--r--gcc/config/pdp11/pdp11.c13
-rw-r--r--gcc/config/rl78/rl78-c.c1
-rw-r--r--gcc/config/rl78/rl78.c15
-rw-r--r--gcc/config/rs6000/rs6000-c.c1
-rw-r--r--gcc/config/rs6000/rs6000.c16
-rw-r--r--gcc/config/rx/rx.c15
-rw-r--r--gcc/config/s390/s390-c.c1
-rw-r--r--gcc/config/s390/s390.c17
-rw-r--r--gcc/config/sh/sh-c.c1
-rw-r--r--gcc/config/sh/sh-mem.cc3
-rw-r--r--gcc/config/sh/sh.c19
-rw-r--r--gcc/config/sh/sh_optimize_sett_clrt.cc12
-rw-r--r--gcc/config/sh/sh_treg_combine.cc15
-rw-r--r--gcc/config/sol2-c.c3
-rw-r--r--gcc/config/sol2-cxx.c3
-rw-r--r--gcc/config/sol2-stubs.c3
-rw-r--r--gcc/config/sol2.c3
-rw-r--r--gcc/config/sparc/sparc-c.c1
-rw-r--r--gcc/config/sparc/sparc.c19
-rw-r--r--gcc/config/spu/spu-c.c1
-rw-r--r--gcc/config/spu/spu.c18
-rw-r--r--gcc/config/stormy16/stormy16.c17
-rw-r--r--gcc/config/tilegx/mul-tables.c6
-rw-r--r--gcc/config/tilegx/tilegx-c.c1
-rw-r--r--gcc/config/tilegx/tilegx.c16
-rw-r--r--gcc/config/tilepro/mul-tables.c6
-rw-r--r--gcc/config/tilepro/tilepro-c.c1
-rw-r--r--gcc/config/tilepro/tilepro.c16
-rw-r--r--gcc/config/v850/v850-c.c1
-rw-r--r--gcc/config/v850/v850.c15
-rw-r--r--gcc/config/vax/vax.c13
-rw-r--r--gcc/config/visium/visium.c15
-rw-r--r--gcc/config/vms/vms-c.c1
-rw-r--r--gcc/config/vms/vms.c3
-rw-r--r--gcc/config/vxworks.c1
-rw-r--r--gcc/config/xtensa/xtensa.c17
-rw-r--r--gcc/convert.c1
-rw-r--r--gcc/coverage.c9
-rw-r--r--gcc/cp/ChangeLog36
-rw-r--r--gcc/cp/call.c1
-rw-r--r--gcc/cp/class.c3
-rw-r--r--gcc/cp/constexpr.c3
-rw-r--r--gcc/cp/cp-array-notation.c3
-rw-r--r--gcc/cp/cp-gimplify.c18
-rw-r--r--gcc/cp/cp-lang.c1
-rw-r--r--gcc/cp/cp-objcp-common.c1
-rw-r--r--gcc/cp/cp-ubsan.c13
-rw-r--r--gcc/cp/cvt.c1
-rw-r--r--gcc/cp/decl.c1
-rw-r--r--gcc/cp/decl2.c1
-rw-r--r--gcc/cp/dump.c1
-rw-r--r--gcc/cp/error.c1
-rw-r--r--gcc/cp/except.c1
-rw-r--r--gcc/cp/expr.c1
-rw-r--r--gcc/cp/friend.c1
-rw-r--r--gcc/cp/init.c1
-rw-r--r--gcc/cp/lambda.c3
-rw-r--r--gcc/cp/lex.c1
-rw-r--r--gcc/cp/mangle.c1
-rw-r--r--gcc/cp/method.c1
-rw-r--r--gcc/cp/name-lookup.c1
-rw-r--r--gcc/cp/optimize.c1
-rw-r--r--gcc/cp/parser.c1
-rw-r--r--gcc/cp/pt.c1
-rw-r--r--gcc/cp/ptree.c1
-rw-r--r--gcc/cp/repo.c1
-rw-r--r--gcc/cp/rtti.c1
-rw-r--r--gcc/cp/search.c1
-rw-r--r--gcc/cp/semantics.c1
-rw-r--r--gcc/cp/tree.c1
-rw-r--r--gcc/cp/typeck.c1
-rw-r--r--gcc/cp/typeck2.c1
-rw-r--r--gcc/cppbuiltin.c1
-rw-r--r--gcc/cprop.c15
-rw-r--r--gcc/cse.c13
-rw-r--r--gcc/cselib.c11
-rw-r--r--gcc/data-streamer-in.c14
-rw-r--r--gcc/data-streamer-out.c14
-rw-r--r--gcc/data-streamer.c14
-rw-r--r--gcc/dbxout.c2
-rw-r--r--gcc/dce.c12
-rw-r--r--gcc/ddg.c15
-rw-r--r--gcc/debug.c1
-rw-r--r--gcc/df-core.c12
-rw-r--r--gcc/df-problems.c12
-rw-r--r--gcc/df-scan.c15
-rw-r--r--gcc/df.h6
-rw-r--r--gcc/dfp.c1
-rw-r--r--gcc/dojump.c7
-rw-r--r--gcc/dominance.c9
-rw-r--r--gcc/domwalk.c8
-rw-r--r--gcc/double-int.c1
-rw-r--r--gcc/dse.c17
-rw-r--r--gcc/dumpfile.c3
-rw-r--r--gcc/dwarf2asm.c1
-rw-r--r--gcc/dwarf2cfi.c2
-rw-r--r--gcc/dwarf2out.c2
-rw-r--r--gcc/emit-rtl.c14
-rw-r--r--gcc/et-forest.c4
-rw-r--r--gcc/except.c9
-rw-r--r--gcc/explow.c2
-rw-r--r--gcc/expmed.c13
-rw-r--r--gcc/expr.c21
-rw-r--r--gcc/final.c15
-rw-r--r--gcc/fixed-value.c1
-rw-r--r--gcc/fold-const.c15
-rw-r--r--gcc/fortran/ChangeLog23
-rw-r--r--gcc/fortran/convert.c3
-rw-r--r--gcc/fortran/cpp.c1
-rw-r--r--gcc/fortran/decl.c1
-rw-r--r--gcc/fortran/f95-lang.c3
-rw-r--r--gcc/fortran/iresolve.c3
-rw-r--r--gcc/fortran/match.c1
-rw-r--r--gcc/fortran/module.c3
-rw-r--r--gcc/fortran/options.c3
-rw-r--r--gcc/fortran/target-memory.c1
-rw-r--r--gcc/fortran/trans-array.c3
-rw-r--r--gcc/fortran/trans-common.c1
-rw-r--r--gcc/fortran/trans-const.c3
-rw-r--r--gcc/fortran/trans-decl.c1
-rw-r--r--gcc/fortran/trans-expr.c3
-rw-r--r--gcc/fortran/trans-intrinsic.c1
-rw-r--r--gcc/fortran/trans-io.c3
-rw-r--r--gcc/fortran/trans-openmp.c3
-rw-r--r--gcc/fortran/trans-stmt.c3
-rw-r--r--gcc/fortran/trans-types.c1
-rw-r--r--gcc/fortran/trans.c3
-rw-r--r--gcc/function.c15
-rw-r--r--gcc/fwprop.c12
-rw-r--r--gcc/gcc-plugin.h7
-rw-r--r--gcc/gcse-common.c5
-rw-r--r--gcc/gcse.c15
-rw-r--r--gcc/genattrtab.c10
-rw-r--r--gcc/genautomata.c2
-rw-r--r--gcc/genconditions.c2
-rw-r--r--gcc/genemit.c14
-rw-r--r--gcc/generic-match-head.c21
-rw-r--r--gcc/gengtype.c20
-rw-r--r--gcc/genopinit.c21
-rw-r--r--gcc/genoutput.c22
-rw-r--r--gcc/genpeep.c15
-rw-r--r--gcc/genpreds.c24
-rw-r--r--gcc/genrecog.c14
-rw-r--r--gcc/ggc-page.c7
-rw-r--r--gcc/gimple-builder.c14
-rw-r--r--gcc/gimple-expr.c16
-rw-r--r--gcc/gimple-fold.c22
-rw-r--r--gcc/gimple-iterator.c20
-rw-r--r--gcc/gimple-low.c14
-rw-r--r--gcc/gimple-match-head.c21
-rw-r--r--gcc/gimple-pretty-print.c19
-rw-r--r--gcc/gimple-ssa-isolate-paths.c23
-rw-r--r--gcc/gimple-ssa-strength-reduction.c23
-rw-r--r--gcc/gimple-ssa.h1
-rw-r--r--gcc/gimple-streamer-in.c21
-rw-r--r--gcc/gimple-streamer-out.c14
-rw-r--r--gcc/gimple-streamer.h3
-rw-r--r--gcc/gimple-walk.c12
-rw-r--r--gcc/gimple.c22
-rw-r--r--gcc/gimple.h3
-rw-r--r--gcc/gimplify-me.c18
-rw-r--r--gcc/gimplify.c20
-rw-r--r--gcc/go/ChangeLog6
-rw-r--r--gcc/go/go-backend.c1
-rw-r--r--gcc/go/go-gcc.cc3
-rw-r--r--gcc/go/go-lang.c3
-rw-r--r--gcc/godump.c3
-rw-r--r--gcc/graph.c8
-rw-r--r--gcc/graphite-blocking.c14
-rw-r--r--gcc/graphite-dependences.c16
-rw-r--r--gcc/graphite-interchange.c16
-rw-r--r--gcc/graphite-isl-ast-to-gimple.c16
-rw-r--r--gcc/graphite-optimize-isl.c16
-rw-r--r--gcc/graphite-poly.c16
-rw-r--r--gcc/graphite-scop-detection.c20
-rw-r--r--gcc/graphite-sese-to-poly.c23
-rw-r--r--gcc/graphite.c16
-rw-r--r--gcc/haifa-sched.c11
-rw-r--r--gcc/hw-doloop.c13
-rw-r--r--gcc/ifcvt.c15
-rw-r--r--gcc/init-regs.c13
-rw-r--r--gcc/internal-fn.c17
-rw-r--r--gcc/ipa-chkp.c15
-rw-r--r--gcc/ipa-comdats.c1
-rw-r--r--gcc/ipa-cp.c9
-rw-r--r--gcc/ipa-devirt.c15
-rw-r--r--gcc/ipa-icf-gimple.c19
-rw-r--r--gcc/ipa-icf.c22
-rw-r--r--gcc/ipa-inline-analysis.c22
-rw-r--r--gcc/ipa-inline-transform.c1
-rw-r--r--gcc/ipa-inline.c16
-rw-r--r--gcc/ipa-polymorphic-call.c15
-rw-r--r--gcc/ipa-profile.c16
-rw-r--r--gcc/ipa-prop.c24
-rw-r--r--gcc/ipa-pure-const.c16
-rw-r--r--gcc/ipa-ref.c3
-rw-r--r--gcc/ipa-reference.c15
-rw-r--r--gcc/ipa-split.c23
-rw-r--r--gcc/ipa-utils.c17
-rw-r--r--gcc/ipa-visibility.c1
-rw-r--r--gcc/ipa.c14
-rw-r--r--gcc/ira-build.c13
-rw-r--r--gcc/ira-color.c18
-rw-r--r--gcc/ira-conflicts.c13
-rw-r--r--gcc/ira-costs.c14
-rw-r--r--gcc/ira-emit.c19
-rw-r--r--gcc/ira-int.h4
-rw-r--r--gcc/ira-lives.c14
-rw-r--r--gcc/ira.c19
-rw-r--r--gcc/java/ChangeLog21
-rw-r--r--gcc/java/boehm.c3
-rw-r--r--gcc/java/builtins.c4
-rw-r--r--gcc/java/class.c3
-rw-r--r--gcc/java/constants.c1
-rw-r--r--gcc/java/decl.c3
-rw-r--r--gcc/java/except.c1
-rw-r--r--gcc/java/expr.c1
-rw-r--r--gcc/java/java-gimplify.c17
-rw-r--r--gcc/java/jcf-dump.c3
-rw-r--r--gcc/java/jcf-io.c3
-rw-r--r--gcc/java/jcf-parse.c3
-rw-r--r--gcc/java/jvgenmain.c3
-rw-r--r--gcc/java/lang.c1
-rw-r--r--gcc/java/mangle.c3
-rw-r--r--gcc/java/mangle_name.c3
-rw-r--r--gcc/java/resource.c3
-rw-r--r--gcc/java/typeck.c3
-rw-r--r--gcc/java/verify-glue.c3
-rw-r--r--gcc/jit/ChangeLog6
-rw-r--r--gcc/jit/dummy-frontend.c4
-rw-r--r--gcc/jit/jit-common.h3
-rw-r--r--gcc/jit/jit-playback.c4
-rw-r--r--gcc/jump.c11
-rw-r--r--gcc/langhooks.c2
-rw-r--r--gcc/lcm.c9
-rw-r--r--gcc/loop-doloop.c11
-rw-r--r--gcc/loop-init.c13
-rw-r--r--gcc/loop-invariant.c13
-rw-r--r--gcc/loop-iv.c13
-rw-r--r--gcc/loop-unroll.c9
-rw-r--r--gcc/lower-subreg.c14
-rw-r--r--gcc/lra-assigns.c16
-rw-r--r--gcc/lra-coalesce.c16
-rw-r--r--gcc/lra-constraints.c15
-rw-r--r--gcc/lra-eliminations.c15
-rw-r--r--gcc/lra-int.h8
-rw-r--r--gcc/lra-lives.c16
-rw-r--r--gcc/lra-remat.c16
-rw-r--r--gcc/lra-spills.c16
-rw-r--r--gcc/lra.c15
-rw-r--r--gcc/lto-cgraph.c16
-rw-r--r--gcc/lto-compress.c14
-rw-r--r--gcc/lto-opts.c15
-rw-r--r--gcc/lto-section-in.c15
-rw-r--r--gcc/lto-section-out.c15
-rw-r--r--gcc/lto-streamer-in.c21
-rw-r--r--gcc/lto-streamer-out.c21
-rw-r--r--gcc/lto-streamer.c15
-rw-r--r--gcc/lto/ChangeLog8
-rw-r--r--gcc/lto/lto-lang.c15
-rw-r--r--gcc/lto/lto-object.c15
-rw-r--r--gcc/lto/lto-partition.c15
-rw-r--r--gcc/lto/lto-symtab.c15
-rw-r--r--gcc/lto/lto.c19
-rw-r--r--gcc/mcf.c7
-rw-r--r--gcc/mode-switching.c12
-rw-r--r--gcc/modulo-sched.c16
-rw-r--r--gcc/objc/ChangeLog11
-rw-r--r--gcc/objc/objc-act.c3
-rw-r--r--gcc/objc/objc-encoding.c3
-rw-r--r--gcc/objc/objc-gnu-runtime-abi-01.c3
-rw-r--r--gcc/objc/objc-lang.c3
-rw-r--r--gcc/objc/objc-map.c3
-rw-r--r--gcc/objc/objc-next-runtime-abi-01.c3
-rw-r--r--gcc/objc/objc-next-runtime-abi-02.c3
-rw-r--r--gcc/objc/objc-runtime-shared-support.c3
-rw-r--r--gcc/objcp/ChangeLog5
-rw-r--r--gcc/objcp/objcp-decl.c3
-rw-r--r--gcc/objcp/objcp-lang.c3
-rw-r--r--gcc/omega.c3
-rw-r--r--gcc/omp-low.c23
-rw-r--r--gcc/optabs.c9
-rw-r--r--gcc/opts-global.c15
-rw-r--r--gcc/passes.c23
-rw-r--r--gcc/plugin.c3
-rw-r--r--gcc/postreload-gcse.c15
-rw-r--r--gcc/postreload.c15
-rw-r--r--gcc/predict.c21
-rw-r--r--gcc/print-rtl.c2
-rw-r--r--gcc/print-tree.c1
-rw-r--r--gcc/profile.c15
-rw-r--r--gcc/real.c1
-rw-r--r--gcc/realmpfr.c3
-rw-r--r--gcc/recog.c15
-rw-r--r--gcc/ree.c13
-rw-r--r--gcc/reg-stack.c14
-rw-r--r--gcc/regcprop.c10
-rw-r--r--gcc/reginfo.c13
-rw-r--r--gcc/regrename.c11
-rw-r--r--gcc/regs.h3
-rw-r--r--gcc/regset.h2
-rw-r--r--gcc/regstat.c10
-rw-r--r--gcc/reload.c15
-rw-r--r--gcc/reload1.c15
-rw-r--r--gcc/reorg.c14
-rw-r--r--gcc/resource.c12
-rw-r--r--gcc/resource.h3
-rw-r--r--gcc/rtl-chkp.c14
-rw-r--r--gcc/rtl.h12
-rw-r--r--gcc/rtlanal.c13
-rw-r--r--gcc/rtlhooks.c4
-rw-r--r--gcc/sanopt.c16
-rw-r--r--gcc/sched-deps.c14
-rw-r--r--gcc/sched-ebb.c11
-rw-r--r--gcc/sched-int.h4
-rw-r--r--gcc/sched-rgn.c11
-rw-r--r--gcc/sched-vis.c11
-rw-r--r--gcc/sdbout.c1
-rw-r--r--gcc/sel-sched-dump.c14
-rw-r--r--gcc/sel-sched-dump.h1
-rw-r--r--gcc/sel-sched-ir.c16
-rw-r--r--gcc/sel-sched-ir.h6
-rw-r--r--gcc/sel-sched.c15
-rw-r--r--gcc/sese.c22
-rw-r--r--gcc/shrink-wrap.c15
-rw-r--r--gcc/simplify-rtx.c6
-rw-r--r--gcc/ssa.h32
-rw-r--r--gcc/stack-ptr-mod.c13
-rw-r--r--gcc/stmt.c15
-rw-r--r--gcc/stor-layout.c2
-rw-r--r--gcc/store-motion.c15
-rw-r--r--gcc/stringpool.c3
-rw-r--r--gcc/symtab.c13
-rw-r--r--gcc/target-globals.c9
-rw-r--r--gcc/targhooks.c2
-rw-r--r--gcc/toplev.c16
-rw-r--r--gcc/tracer.c17
-rw-r--r--gcc/trans-mem.c21
-rw-r--r--gcc/tree-affine.c15
-rw-r--r--gcc/tree-browser.c3
-rw-r--r--gcc/tree-call-cdce.c18
-rw-r--r--gcc/tree-cfg.c23
-rw-r--r--gcc/tree-cfgcleanup.c23
-rw-r--r--gcc/tree-chkp-opt.c24
-rw-r--r--gcc/tree-chkp.c25
-rw-r--r--gcc/tree-chrec.c10
-rw-r--r--gcc/tree-complex.c23
-rw-r--r--gcc/tree-core.h2
-rw-r--r--gcc/tree-data-ref.c17
-rw-r--r--gcc/tree-dfa.c23
-rw-r--r--gcc/tree-diagnostic.c3
-rw-r--r--gcc/tree-dump.c1
-rw-r--r--gcc/tree-eh.c23
-rw-r--r--gcc/tree-emutls.c22
-rw-r--r--gcc/tree-if-conv.c23
-rw-r--r--gcc/tree-inline.c24
-rw-r--r--gcc/tree-into-ssa.c23
-rw-r--r--gcc/tree-iterator.c3
-rw-r--r--gcc/tree-loop-distribution.c22
-rw-r--r--gcc/tree-nested.c16
-rw-r--r--gcc/tree-nrv.c20
-rw-r--r--gcc/tree-object-size.c23
-rw-r--r--gcc/tree-outof-ssa.c25
-rw-r--r--gcc/tree-parloops.c22
-rw-r--r--gcc/tree-phinodes.c20
-rw-r--r--gcc/tree-predcom.c23
-rw-r--r--gcc/tree-pretty-print.c6
-rw-r--r--gcc/tree-profile.c20
-rw-r--r--gcc/tree-scalar-evolution.c22
-rw-r--r--gcc/tree-sra.c24
-rw-r--r--gcc/tree-ssa-address.c15
-rw-r--r--gcc/tree-ssa-alias.c20
-rw-r--r--gcc/tree-ssa-ccp.c22
-rw-r--r--gcc/tree-ssa-coalesce.c23
-rw-r--r--gcc/tree-ssa-copy.c22
-rw-r--r--gcc/tree-ssa-copyrename.c22
-rw-r--r--gcc/tree-ssa-dce.c23
-rw-r--r--gcc/tree-ssa-dom.c22
-rw-r--r--gcc/tree-ssa-dse.c24
-rw-r--r--gcc/tree-ssa-forwprop.c23
-rw-r--r--gcc/tree-ssa-ifcombine.c21
-rw-r--r--gcc/tree-ssa-live.c25
-rw-r--r--gcc/tree-ssa-loop-ch.c16
-rw-r--r--gcc/tree-ssa-loop-im.c22
-rw-r--r--gcc/tree-ssa-loop-ivcanon.c22
-rw-r--r--gcc/tree-ssa-loop-ivopts.c23
-rw-r--r--gcc/tree-ssa-loop-manip.c22
-rw-r--r--gcc/tree-ssa-loop-niter.c23
-rw-r--r--gcc/tree-ssa-loop-prefetch.c17
-rw-r--r--gcc/tree-ssa-loop-unswitch.c20
-rw-r--r--gcc/tree-ssa-loop.c16
-rw-r--r--gcc/tree-ssa-math-opts.c24
-rw-r--r--gcc/tree-ssa-operands.c21
-rw-r--r--gcc/tree-ssa-phiopt.c23
-rw-r--r--gcc/tree-ssa-phiprop.c22
-rw-r--r--gcc/tree-ssa-pre.c23
-rw-r--r--gcc/tree-ssa-propagate.c24
-rw-r--r--gcc/tree-ssa-reassoc.c21
-rw-r--r--gcc/tree-ssa-sccvn.c23
-rw-r--r--gcc/tree-ssa-scopedtables.c1
-rw-r--r--gcc/tree-ssa-sink.c20
-rw-r--r--gcc/tree-ssa-strlen.c24
-rw-r--r--gcc/tree-ssa-structalias.c25
-rw-r--r--gcc/tree-ssa-tail-merge.c20
-rw-r--r--gcc/tree-ssa-ter.c23
-rw-r--r--gcc/tree-ssa-threadedge.c22
-rw-r--r--gcc/tree-ssa-threadupdate.c20
-rw-r--r--gcc/tree-ssa-uncprop.c20
-rw-r--r--gcc/tree-ssa-uninit.c21
-rw-r--r--gcc/tree-ssa.c22
-rw-r--r--gcc/tree-ssanames.c20
-rw-r--r--gcc/tree-stdarg.c24
-rw-r--r--gcc/tree-streamer-in.c14
-rw-r--r--gcc/tree-streamer-out.c14
-rw-r--r--gcc/tree-streamer.c14
-rw-r--r--gcc/tree-switch-conversion.c22
-rw-r--r--gcc/tree-tailcall.c22
-rw-r--r--gcc/tree-vect-data-refs.c23
-rw-r--r--gcc/tree-vect-generic.c21
-rw-r--r--gcc/tree-vect-loop-manip.c22
-rw-r--r--gcc/tree-vect-loop.c23
-rw-r--r--gcc/tree-vect-patterns.c21
-rw-r--r--gcc/tree-vect-slp.c21
-rw-r--r--gcc/tree-vect-stmts.c23
-rw-r--r--gcc/tree-vectorizer.c20
-rw-r--r--gcc/tree-vrp.c23
-rw-r--r--gcc/tree.c23
-rw-r--r--gcc/tsan.c21
-rw-r--r--gcc/ubsan.c21
-rw-r--r--gcc/valtrack.c7
-rw-r--r--gcc/valtrack.h4
-rw-r--r--gcc/value-prof.c23
-rw-r--r--gcc/var-tracking.c11
-rw-r--r--gcc/varasm.c9
-rw-r--r--gcc/varpool.c14
-rw-r--r--gcc/vmsdbgout.c2
-rw-r--r--gcc/vtable-verify.c22
-rw-r--r--gcc/web.c12
-rw-r--r--gcc/wide-int.cc3
-rw-r--r--gcc/xcoffout.c1
574 files changed, 2180 insertions, 4688 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d325d90adf4..69c0c2e1823 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,442 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * tree-core.h: Include symtab.h.
+ * rtl.h: Include hard-reg-set.h but not flags.h.
+ (HARD_CONST): Remove condition compilation involving HARD_CONST since
+ hard-reg-set.h is always included.
+ * regs.h: Don't include hard-reg-set.h or rtl.h.
+ * cfg.h: Include dominance.h.
+ * gimple.h: Include tree-ssa-alias.h and gimple-expr.h.
+ * backend.h: New. Aggregate commonly used backend header files.
+ * gimple-ssa.h: Don't include tree-hasher.h.
+ * ssa.h: New. Aggregate commonly used SSA header files.
+ * regset.h: Remove bitmap.h and hard-reg-set.h #includes.
+ * sel-sched-ir.h: Flatten includes.
+ * lra-int.h: Flatten completely.
+ * sel-sched-dump.h: Flatten includes.
+ * ira-int.h: Flatten includes.
+ * gimple-streamer.h: Remove all includes.
+ * cfgloop.h: Remove all #includes except cfgloopmanip.h.
+ * resource.h: Flatten hard-reg-set.h and df.h.
+ * sched-int.h: Flatten insn-arrt.h and df.h.
+ * valtrack.h: flatten bitmap.h, df.h, and rtl.h
+ * df.h: Flatten includes, leaving regset.h, alloc-pool.h and timevar.h.
+ * genattrtab.c (write_header): Adjust generated includes.
+ * genautomata.c (main): Likewise.
+ * genconditions.c (write-header): Likewise.
+ * genemit.c (main): Likewise.
+ * gengtype.c (open_base_files): Likewise.
+ * genopinit.c (main): Likewise.
+ * genoutput.c (output_prologue): Likewise.
+ * genpeep.c (main): Likewise.
+ * genpreds.c (write_insn_preds_c): Likewise.
+ * genrecog.c (write_header): Likewise.
+ * alias.c: Adjust includes.
+ * asan.c: Likewise.
+ * attribs.c: Likewise.
+ * auto-inc-dec.c: Likewise.
+ * auto-profile.c: Likewise.
+ * bb-reorder.c: Likewise.
+ * bt-load.c: Likewise.
+ * builtins.c: Likewise.
+ * caller-save.c: Likewise.
+ * calls.c: Likewise.
+ * ccmp.c: Likewise.
+ * cfg.c: Likewise.
+ * cfganal.c: Likewise.
+ * cfgbuild.c: Likewise.
+ * cfgcleanup.c: Likewise.
+ * cfgexpand.c: Likewise.
+ * cfghooks.c: Likewise.
+ * cfgloop.c: Likewise.
+ * cfgloopanal.c: Likewise.
+ * cfgloopmanip.c: Likewise.
+ * cfgrtl.c: Likewise.
+ * cgraph.c: Likewise.
+ * cgraphbuild.c: Likewise.
+ * cgraphclones.c: Likewise.
+ * cgraphunit.c: Likewise.
+ * cilk-common.c: Likewise.
+ * combine-stack-adj.c: Likewise.
+ * combine.c: Likewise.
+ * compare-elim.c: Likewise.
+ * convert.c: Likewise.
+ * coverage.c: Likewise.
+ * cppbuiltin.c: Likewise.
+ * cprop.c: Likewise.
+ * cse.c: Likewise.
+ * cselib.c: Likewise.
+ * data-streamer-in.c: Likewise.
+ * data-streamer-out.c: Likewise.
+ * data-streamer.c: Likewise.
+ * dbxout.c: Likewise.
+ * dce.c: Likewise.
+ * ddg.c: Likewise.
+ * debug.c: Likewise.
+ * df-core.c: Likewise.
+ * df-problems.c: Likewise.
+ * df-scan.c: Likewise.
+ * dfp.c: Likewise.
+ * dojump.c: Likewise.
+ * dominance.c: Likewise.
+ * domwalk.c: Likewise.
+ * double-int.c: Likewise.
+ * dse.c: Likewise.
+ * dumpfile.c: Likewise.
+ * dwarf2asm.c: Likewise.
+ * dwarf2cfi.c: Likewise.
+ * dwarf2out.c: Likewise.
+ * emit-rtl.c: Likewise.
+ * et-forest.c: Likewise.
+ * except.c: Likewise.
+ * explow.c: Likewise.
+ * expmed.c: Likewise.
+ * expr.c: Likewise.
+ * final.c: Likewise.
+ * fixed-value.c: Likewise.
+ * fold-const.c: Likewise.
+ * function.c: Likewise.
+ * fwprop.c: Likewise.
+ * gcc-plugin.h: Likewise.
+ * gcse-common.c: Likewise.
+ * gcse.c: Likewise.
+ * generic-match-head.c: Likewise.
+ * ggc-page.c: Likewise.
+ * gimple-builder.c: Likewise.
+ * gimple-expr.c: Likewise.
+ * gimple-fold.c: Likewise.
+ * gimple-iterator.c: Likewise.
+ * gimple-low.c: Likewise.
+ * gimple-match-head.c: Likewise.
+ * gimple-pretty-print.c: Likewise.
+ * gimple-ssa-isolate-paths.c: Likewise.
+ * gimple-ssa-strength-reduction.c: Likewise.
+ * gimple-streamer-in.c: Likewise.
+ * gimple-streamer-out.c: Likewise.
+ * gimple-walk.c: Likewise.
+ * gimple.c: Likewise.
+ * gimplify-me.c: Likewise.
+ * gimplify.c: Likewise.
+ * godump.c: Likewise.
+ * graph.c: Likewise.
+ * graphite-blocking.c: Likewise.
+ * graphite-dependences.c: Likewise.
+ * graphite-interchange.c: Likewise.
+ * graphite-isl-ast-to-gimple.c: Likewise.
+ * graphite-optimize-isl.c: Likewise.
+ * graphite-poly.c: Likewise.
+ * graphite-scop-detection.c: Likewise.
+ * graphite-sese-to-poly.c: Likewise.
+ * graphite.c: Likewise.
+ * haifa-sched.c: Likewise.
+ * hw-doloop.c: Likewise.
+ * ifcvt.c: Likewise.
+ * init-regs.c: Likewise.
+ * internal-fn.c: Likewise.
+ * ipa-chkp.c: Likewise.
+ * ipa-comdats.c: Likewise.
+ * ipa-cp.c: Likewise.
+ * ipa-devirt.c: Likewise.
+ * ipa-icf-gimple.c: Likewise.
+ * ipa-icf.c: Likewise.
+ * ipa-inline-analysis.c: Likewise.
+ * ipa-inline-transform.c: Likewise.
+ * ipa-inline.c: Likewise.
+ * ipa-polymorphic-call.c: Likewise.
+ * ipa-profile.c: Likewise.
+ * ipa-prop.c: Likewise.
+ * ipa-pure-const.c: Likewise.
+ * ipa-ref.c: Likewise.
+ * ipa-reference.c: Likewise.
+ * ipa-split.c: Likewise.
+ * ipa-utils.c: Likewise.
+ * ipa-visibility.c: Likewise.
+ * ipa.c: Likewise.
+ * ira-build.c: Likewise.
+ * ira-color.c: Likewise.
+ * ira-conflicts.c: Likewise.
+ * ira-costs.c: Likewise.
+ * ira-emit.c: Likewise.
+ * ira-lives.c: Likewise.
+ * ira.c: Likewise.
+ * jump.c: Likewise.
+ * langhooks.c: Likewise.
+ * lcm.c: Likewise.
+ * loop-doloop.c: Likewise.
+ * loop-init.c: Likewise.
+ * loop-invariant.c: Likewise.
+ * loop-iv.c: Likewise.
+ * loop-unroll.c: Likewise.
+ * lower-subreg.c: Likewise.
+ * lra-assigns.c: Likewise.
+ * lra-coalesce.c: Likewise.
+ * lra-constraints.c: Likewise.
+ * lra-eliminations.c: Likewise.
+ * lra-lives.c: Likewise.
+ * lra-remat.c: Likewise.
+ * lra-spills.c: Likewise.
+ * lra.c: Likewise.
+ * lto-cgraph.c: Likewise.
+ * lto-compress.c: Likewise.
+ * lto-opts.c: Likewise.
+ * lto-section-in.c: Likewise.
+ * lto-section-out.c: Likewise.
+ * lto-streamer-in.c: Likewise.
+ * lto-streamer-out.c: Likewise.
+ * lto-streamer.c: Likewise.
+ * mcf.c: Likewise.
+ * mode-switching.c: Likewise.
+ * modulo-sched.c: Likewise.
+ * omega.c: Likewise.
+ * omp-low.c: Likewise.
+ * optabs.c: Likewise.
+ * opts-global.c: Likewise.
+ * passes.c: Likewise.
+ * plugin.c: Likewise.
+ * postreload-gcse.c: Likewise.
+ * postreload.c: Likewise.
+ * predict.c: Likewise.
+ * print-rtl.c: Likewise.
+ * print-tree.c: Likewise.
+ * profile.c: Likewise.
+ * real.c: Likewise.
+ * realmpfr.c: Likewise.
+ * recog.c: Likewise.
+ * ree.c: Likewise.
+ * reg-stack.c: Likewise.
+ * regcprop.c: Likewise.
+ * reginfo.c: Likewise.
+ * regrename.c: Likewise.
+ * regstat.c: Likewise.
+ * reload.c: Likewise.
+ * reload1.c: Likewise.
+ * reorg.c: Likewise.
+ * resource.c: Likewise.
+ * rtl-chkp.c: Likewise.
+ * rtlanal.c: Likewise.
+ * rtlhooks.c: Likewise.
+ * sanopt.c: Likewise.
+ * sched-deps.c: Likewise.
+ * sched-ebb.c: Likewise.
+ * sched-rgn.c: Likewise.
+ * sched-vis.c: Likewise.
+ * sdbout.c: Likewise.
+ * sel-sched-dump.c: Likewise.
+ * sel-sched-ir.c: Likewise.
+ * sel-sched.c: Likewise.
+ * sese.c: Likewise.
+ * shrink-wrap.c: Likewise.
+ * simplify-rtx.c: Likewise.
+ * stack-ptr-mod.c: Likewise.
+ * stmt.c: Likewise.
+ * stor-layout.c: Likewise.
+ * store-motion.c: Likewise.
+ * stringpool.c: Likewise.
+ * symtab.c: Likewise.
+ * target-globals.c: Likewise.
+ * targhooks.c: Likewise.
+ * toplev.c: Likewise.
+ * tracer.c: Likewise.
+ * trans-mem.c: Likewise.
+ * tree-affine.c: Likewise.
+ * tree-browser.c: Likewise.
+ * tree-call-cdce.c: Likewise.
+ * tree-cfg.c: Likewise.
+ * tree-cfgcleanup.c: Likewise.
+ * tree-chkp-opt.c: Likewise.
+ * tree-chkp.c: Likewise.
+ * tree-chrec.c: Likewise.
+ * tree-complex.c: Likewise.
+ * tree-data-ref.c: Likewise.
+ * tree-dfa.c: Likewise.
+ * tree-diagnostic.c: Likewise.
+ * tree-dump.c: Likewise.
+ * tree-eh.c: Likewise.
+ * tree-emutls.c: Likewise.
+ * tree-if-conv.c: Likewise.
+ * tree-inline.c: Likewise.
+ * tree-into-ssa.c: Likewise.
+ * tree-iterator.c: Likewise.
+ * tree-loop-distribution.c: Likewise.
+ * tree-nested.c: Likewise.
+ * tree-nrv.c: Likewise.
+ * tree-object-size.c: Likewise.
+ * tree-outof-ssa.c: Likewise.
+ * tree-parloops.c: Likewise.
+ * tree-phinodes.c: Likewise.
+ * tree-predcom.c: Likewise.
+ * tree-pretty-print.c: Likewise.
+ * tree-profile.c: Likewise.
+ * tree-scalar-evolution.c: Likewise.
+ * tree-sra.c: Likewise.
+ * tree-ssa-address.c: Likewise.
+ * tree-ssa-alias.c: Likewise.
+ * tree-ssa-ccp.c: Likewise.
+ * tree-ssa-coalesce.c: Likewise.
+ * tree-ssa-copy.c: Likewise.
+ * tree-ssa-copyrename.c: Likewise.
+ * tree-ssa-dce.c: Likewise.
+ * tree-ssa-dom.c: Likewise.
+ * tree-ssa-dse.c: Likewise.
+ * tree-ssa-forwprop.c: Likewise.
+ * tree-ssa-ifcombine.c: Likewise.
+ * tree-ssa-live.c: Likewise.
+ * tree-ssa-loop-ch.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-loop.c: Likewise.
+ * tree-ssa-math-opts.c: Likewise.
+ * tree-ssa-operands.c: Likewise.
+ * tree-ssa-phiopt.c: Likewise.
+ * tree-ssa-phiprop.c: Likewise.
+ * tree-ssa-pre.c: Likewise.
+ * tree-ssa-propagate.c: Likewise.
+ * tree-ssa-reassoc.c: Likewise.
+ * tree-ssa-sccvn.c: Likewise.
+ * tree-ssa-scopedtables.c: Likewise.
+ * tree-ssa-sink.c: Likewise.
+ * tree-ssa-strlen.c: Likewise.
+ * tree-ssa-structalias.c: Likewise.
+ * tree-ssa-tail-merge.c: Likewise.
+ * tree-ssa-ter.c: Likewise.
+ * tree-ssa-threadedge.c: Likewise.
+ * tree-ssa-threadupdate.c: Likewise.
+ * tree-ssa-uncprop.c: Likewise.
+ * tree-ssa-uninit.c: Likewise.
+ * tree-ssa.c: Likewise.
+ * tree-ssanames.c: Likewise.
+ * tree-stdarg.c: Likewise.
+ * tree-streamer-in.c: Likewise.
+ * tree-streamer-out.c: Likewise.
+ * tree-streamer.c: Likewise.
+ * tree-switch-conversion.c: Likewise.
+ * tree-tailcall.c: Likewise.
+ * tree-vect-data-refs.c: Likewise.
+ * tree-vect-generic.c: Likewise.
+ * tree-vect-loop-manip.c: Likewise.
+ * tree-vect-loop.c: Likewise.
+ * tree-vect-patterns.c: Likewise.
+ * tree-vect-slp.c: Likewise.
+ * tree-vect-stmts.c: Likewise.
+ * tree-vectorizer.c: Likewise.
+ * tree-vrp.c: Likewise.
+ * tree.c: Likewise.
+ * tsan.c: Likewise.
+ * ubsan.c: Likewise.
+ * valtrack.c: Likewise.
+ * value-prof.c: Likewise.
+ * var-tracking.c: Likewise.
+ * varasm.c: Likewise.
+ * varpool.c: Likewise.
+ * vmsdbgout.c: Likewise.
+ * vtable-verify.c: Likewise.
+ * web.c: Likewise.
+ * wide-int.cc: Likewise.
+ * xcoffout.c: Likewise.
+ * config/aarch64/aarch64-builtins.c: Likewise.
+ * config/aarch64/aarch64.c: Likewise.
+ * config/aarch64/cortex-a57-fma-steering.c: Likewise.
+ * config/alpha/alpha.c: Likewise.
+ * config/arc/arc.c: Likewise.
+ * config/arm/aarch-common.c: Likewise.
+ * config/arm/arm-builtins.c: Likewise.
+ * config/arm/arm-c.c: Likewise.
+ * config/arm/arm.c: Likewise.
+ * config/avr/avr-c.c: Likewise.
+ * config/avr/avr-log.c: Likewise.
+ * config/avr/avr.c: Likewise.
+ * config/bfin/bfin.c: Likewise.
+ * config/c6x/c6x.c: Likewise.
+ * config/cr16/cr16.c: Likewise.
+ * config/cris/cris.c: Likewise.
+ * config/darwin-c.c: Likewise.
+ * config/darwin.c: Likewise.
+ * config/epiphany/epiphany.c: Likewise.
+ * config/epiphany/mode-switch-use.c: Likewise.
+ * config/epiphany/resolve-sw-modes.c: Likewise.
+ * config/fr30/fr30.c: Likewise.
+ * config/frv/frv.c: Likewise.
+ * config/ft32/ft32.c: Likewise.
+ * config/h8300/h8300.c: Likewise.
+ * config/i386/i386-c.c: Likewise.
+ * config/i386/i386.c: Likewise.
+ * config/i386/msformat-c.c: Likewise.
+ * config/i386/winnt-cxx.c: Likewise.
+ * config/i386/winnt-stubs.c: Likewise.
+ * config/i386/winnt.c: Likewise.
+ * config/ia64/ia64-c.c: Likewise.
+ * config/ia64/ia64.c: Likewise.
+ * config/iq2000/iq2000.c: Likewise.
+ * config/lm32/lm32.c: Likewise.
+ * config/m32c/m32c-pragma.c: Likewise.
+ * config/m32c/m32c.c: Likewise.
+ * config/m32r/m32r.c: Likewise.
+ * config/m68k/m68k.c: Likewise.
+ * config/mcore/mcore.c: Likewise.
+ * config/mep/mep-pragma.c: Likewise.
+ * config/mep/mep.c: Likewise.
+ * config/microblaze/microblaze-c.c: Likewise.
+ * config/microblaze/microblaze.c: Likewise.
+ * config/mips/mips.c: Likewise.
+ * config/mmix/mmix.c: Likewise.
+ * config/mn10300/mn10300.c: Likewise.
+ * config/moxie/moxie.c: Likewise.
+ * config/msp430/msp430-c.c: Likewise.
+ * config/msp430/msp430.c: Likewise.
+ * config/nds32/nds32-cost.c: Likewise.
+ * config/nds32/nds32-fp-as-gp.c: Likewise.
+ * config/nds32/nds32-intrinsic.c: Likewise.
+ * config/nds32/nds32-isr.c: Likewise.
+ * config/nds32/nds32-md-auxiliary.c: Likewise.
+ * config/nds32/nds32-memory-manipulation.c: Likewise.
+ * config/nds32/nds32-pipelines-auxiliary.c: Likewise.
+ * config/nds32/nds32-predicates.c: Likewise.
+ * config/nds32/nds32.c: Likewise.
+ * config/nios2/nios2.c: Likewise.
+ * config/nvptx/nvptx.c: Likewise.
+ * config/pa/pa.c: Likewise.
+ * config/pdp11/pdp11.c: Likewise.
+ * config/rl78/rl78-c.c: Likewise.
+ * config/rl78/rl78.c: Likewise.
+ * config/rs6000/rs6000-c.c: Likewise.
+ * config/rs6000/rs6000.c: Likewise.
+ * config/rx/rx.c: Likewise.
+ * config/s390/s390-c.c: Likewise.
+ * config/s390/s390.c: Likewise.
+ * config/sh/sh-c.c: Likewise.
+ * config/sh/sh-mem.cc: Likewise.
+ * config/sh/sh.c: Likewise.
+ * config/sh/sh_optimize_sett_clrt.cc: Likewise.
+ * config/sh/sh_treg_combine.cc: Likewise.
+ * config/sol2-c.c: Likewise.
+ * config/sol2-cxx.c: Likewise.
+ * config/sol2-stubs.c: Likewise.
+ * config/sol2.c: Likewise.
+ * config/sparc/sparc-c.c: Likewise.
+ * config/sparc/sparc.c: Likewise.
+ * config/spu/spu-c.c: Likewise.
+ * config/spu/spu.c: Likewise.
+ * config/stormy16/stormy16.c: Likewise.
+ * config/tilegx/mul-tables.c: Likewise.
+ * config/tilegx/tilegx-c.c: Likewise.
+ * config/tilegx/tilegx.c: Likewise.
+ * config/tilepro/mul-tables.c: Likewise.
+ * config/tilepro/tilepro-c.c: Likewise.
+ * config/tilepro/tilepro.c: Likewise.
+ * config/v850/v850-c.c: Likewise.
+ * config/v850/v850.c: Likewise.
+ * config/vax/vax.c: Likewise.
+ * config/visium/visium.c: Likewise.
+ * config/vms/vms-c.c: Likewise.
+ * config/vms/vms.c: Likewise.
+ * config/vxworks.c: Likewise.
+ * config/xtensa/xtensa.c: Likewise.
+
2015-07-07 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.md (*jcc_bt<mode>): Only split before reload.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 61982165287..437e72f73fb 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * gcc-interface/cuintp.c: Adjust includes.
+ * gcc-interface/decl.c: Likewise.
+ * gcc-interface/misc.c: Likewise.
+ * gcc-interface/targtyps.c: Likewise.
+ * gcc-interface/trans.c: Likewise.
+ * gcc-interface/utils.c: Likewise.
+ * gcc-interface/utils2.c: Likewise.
+
2015-07-06 John Marino <gnugcc@marino.st>
* s-oscons-tmplt.c: Add support for DragonFly alongside FreeBSD.
diff --git a/gcc/ada/gcc-interface/cuintp.c b/gcc/ada/gcc-interface/cuintp.c
index bd01daebb4e..347658e0e4e 100644
--- a/gcc/ada/gcc-interface/cuintp.c
+++ b/gcc/ada/gcc-interface/cuintp.c
@@ -32,9 +32,8 @@
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "fold-const.h"
#include "ada.h"
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 3c2609d6c46..971c0669969 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -29,9 +29,8 @@
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index fec71999ac3..5b2d8b3d55b 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -31,9 +31,8 @@
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "print-tree.h"
diff --git a/gcc/ada/gcc-interface/targtyps.c b/gcc/ada/gcc-interface/targtyps.c
index 8b5cb98ca92..5e756c258ba 100644
--- a/gcc/ada/gcc-interface/targtyps.c
+++ b/gcc/ada/gcc-interface/targtyps.c
@@ -30,10 +30,9 @@
#include "coretypes.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
+#include "tree.h"
#include "inchash.h"
#include "options.h"
-#include "tree.h"
#include "tm.h"
#include "tm_p.h"
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 5c9ea086943..413550a5211 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -29,9 +29,8 @@
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index a02dc67a305..b9f803d616a 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -29,9 +29,8 @@
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c
index f0ec0b5bf31..6a998d3ada9 100644
--- a/gcc/ada/gcc-interface/utils2.c
+++ b/gcc/ada/gcc-interface/utils2.c
@@ -29,9 +29,8 @@
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
diff --git a/gcc/alias.c b/gcc/alias.c
index 3e75b91b63d..3203722a984 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -21,15 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -48,16 +47,8 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "dumpfile.h"
#include "target.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-ssa.h"
#include "rtl-iter.h"
diff --git a/gcc/asan.c b/gcc/asan.c
index 5fac2470323..1caeb32497d 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -23,22 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "options.h"
#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "calls.h"
@@ -52,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "asan.h"
#include "gimple-pretty-print.h"
#include "target.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/attribs.c b/gcc/attribs.c
index 784079b6814..6cbe011883d 100644
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -21,9 +21,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "stringpool.h"
#include "attribs.h"
#include "stor-layout.h"
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index df52229322d..2b105395401 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.c
@@ -21,19 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "regs.h"
#include "flags.h"
@@ -49,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tree-pass.h"
-#include "df.h"
#include "dbgcnt.h"
#include "target.h"
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index 5fdd33f57ac..33f5632f9ea 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -27,19 +27,15 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "tree-pass.h"
#include "flags.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "diagnostic-core.h"
#include "gcov-io.h"
#include "profile.h"
@@ -47,16 +43,11 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "tree-pass.h"
#include "cfgloop.h"
-#include "tree-ssa-alias.h"
#include "tree-cfg.h"
#include "tree-cfgcleanup.h"
-#include "tree-ssa-operands.h"
#include "tree-into-ssa.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "value-prof.h"
#include "coverage.h"
@@ -66,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-prop.h"
#include "ipa-inline.h"
#include "tree-inline.h"
-#include "stringpool.h"
#include "auto-profile.h"
/* The following routines implements AutoFDO optimization.
diff --git a/gcc/backend.h b/gcc/backend.h
new file mode 100644
index 00000000000..4066376c3a2
--- /dev/null
+++ b/gcc/backend.h
@@ -0,0 +1,36 @@
+/* Common Backend requirements.
+
+ Copyright (C) 2015 Free Software Foundation, Inc.
+ Contributed by Andrew MacLeod <amacleod@redhat.com>
+
+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_BACKEND_H
+#define GCC_BACKEND_H
+
+/* This is an aggregation header file. This means it should contain only
+ other include files. */
+
+#include "tm.h"
+#include "function.h"
+#include "bitmap.h"
+#include "sbitmap.h"
+#include "predict.h"
+#include "basic-block.h"
+#include "cfg.h"
+
+#endif /*GCC_BACKEND_H */
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 84c91524755..cb421438f31 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -81,17 +81,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "regs.h"
#include "flags.h"
#include "output.h"
#include "target.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "tm_p.h"
#include "obstack.h"
#include "insn-config.h"
@@ -108,15 +106,10 @@
#include "diagnostic-core.h"
#include "toplev.h" /* user_defined_section_attribute */
#include "tree-pass.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "bb-reorder.h"
#include "cgraph.h"
#include "except.h"
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index 9c1d04e1173..031b95de082 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -21,16 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
-#include "hard-reg-set.h"
+#include "df.h"
#include "regs.h"
#include "target.h"
-#include "symtab.h"
-#include "function.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -46,14 +44,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "tree-pass.h"
#include "recog.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "cfgloop.h"
#include "rtl-iter.h"
#include "fibonacci_heap.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index f5923b12016..530cf85c087 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -20,11 +20,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
@@ -32,15 +32,8 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "tree-object-size.h"
#include "realmpfr.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cfgrtl.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "flags.h"
#include "regs.h"
#include "except.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index f2b923f0df3..63ba71450cc 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,26 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * array-notation-common.c: Adjust includes.
+ * c-ada-spec.c: Likewise.
+ * c-cilkplus.c: Likewise.
+ * c-common.h: Likewise.
+ * c-cppbuiltin.c: Likewise.
+ * c-dump.c: Likewise.
+ * c-format.c: Likewise.
+ * c-gimplify.c: Likewise.
+ * c-indentation.c: Likewise.
+ * c-lex.c: Likewise.
+ * c-omp.c: Likewise.
+ * c-opts.c: Likewise.
+ * c-pch.c: Likewise.
+ * c-ppoutput.c: Likewise.
+ * c-pragma.c: Likewise.
+ * c-pretty-print.c: Likewise.
+ * c-semantics.c: Likewise.
+ * c-ubsan.c: Likewise.
+ * cilk.c: Likewise.
+ * stub-objc.c: Likewise.
+
2015-07-07 Eric Botcazou <ebotcazou@adacore.com>
* c-ada-spec.h (cpp_operation): Add IS_MOVE_CONSTRUCTOR.
diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c
index f75936ad852..85ded8d6b7c 100644
--- a/gcc/c-family/array-notation-common.c
+++ b/gcc/c-family/array-notation-common.c
@@ -25,9 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "langhooks.h"
#include "tree-iterator.h"
#include "c-family/c-common.h"
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index abe22d7f92a..38a8fb266ac 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -24,9 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "dumpfile.h"
#include "c-ada-spec.h"
diff --git a/gcc/c-family/c-cilkplus.c b/gcc/c-family/c-cilkplus.c
index c61cf47b824..f402d0d3e1e 100644
--- a/gcc/c-family/c-cilkplus.c
+++ b/gcc/c-family/c-cilkplus.c
@@ -24,9 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "c-common.h"
/* Validate the body of a _Cilk_for construct or a <#pragma simd> for
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index d84c58eba35..1acce015684 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "cpplib.h"
#include "alias.h"
#include "flags.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index cdf2d5ab776..1beb2dbfcb7 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "stringpool.h"
diff --git a/gcc/c-family/c-dump.c b/gcc/c-family/c-dump.c
index cc006585d58..6ff9552c066 100644
--- a/gcc/c-family/c-dump.c
+++ b/gcc/c-family/c-dump.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tree-dump.h"
#include "c-common.h"
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index c6e8f5ebbf2..1dac985399a 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "flags.h"
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index 98a6d53c9d3..1c81773a91c 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -27,19 +27,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "function.h"
+#include "predict.h"
+#include "basic-block.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
#include "fold-const.h"
#include "c-common.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "tree-inline.h"
#include "diagnostic-core.h"
diff --git a/gcc/c-family/c-indentation.c b/gcc/c-family/c-indentation.c
index b05185c26f0..252467e8d57 100644
--- a/gcc/c-family/c-indentation.c
+++ b/gcc/c-family/c-indentation.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index fe31256060d..e9937163609 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index d1646975d4d..607d16d6e28 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-common.h"
#include "c-pragma.h"
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 80481c352ac..33087bade7b 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "options.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-common.h"
#include "c-pragma.h"
diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c
index 187526aa244..b433e71e0cb 100644
--- a/gcc/c-family/c-pch.c
+++ b/gcc/c-family/c-pch.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "cpplib.h"
#include "options.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "flags.h"
#include "c-common.h"
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index 276b110e74d..83ad4618b69 100644
--- a/gcc/c-family/c-ppoutput.c
+++ b/gcc/c-family/c-ppoutput.c
@@ -22,9 +22,8 @@
#include "cpplib.h"
#include "../libcpp/internal.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "c-common.h" /* For flags. */
#include "c-pragma.h" /* For parse_in. */
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index af753c7ecb9..b85e7687b17 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "attribs.h"
#include "varasm.h"
diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c
index 4be1d4f332f..d1a0e1298b2 100644
--- a/gcc/c-family/c-pretty-print.c
+++ b/gcc/c-family/c-pretty-print.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stor-layout.h"
#include "attribs.h"
#include "intl.h"
diff --git a/gcc/c-family/c-semantics.c b/gcc/c-family/c-semantics.c
index c34026fb39c..cea23541d95 100644
--- a/gcc/c-family/c-semantics.c
+++ b/gcc/c-family/c-semantics.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "hard-reg-set.h"
#include "function.h"
#include "splay-tree.h"
diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index 5a95236f003..0baf118bc0b 100644
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "alloc-pool.h"
#include "tm.h"
#include "hard-reg-set.h"
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 4f8026fdb44..1012a4fd3aa 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -24,9 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "langhooks.h"
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index 9d225e34701..dd4c9fead9b 100644
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "flags.h"
#include "tree.h"
+#include "flags.h"
#include "c-common.h"
#include "c-objc.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 15c2303c2de..792198b8f0f 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,15 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-array-notation.c: Adjust includes.
+ * c-aux-info.c: Likewise.
+ * c-convert.c: Likewise.
+ * c-decl.c: Likewise.
+ * c-errors.c: Likewise.
+ * c-lang.c: Likewise.
+ * c-objc-common.c: Likewise.
+ * c-parser.c: Likewise.
+ * c-typeck.c: Likewise.
+
2015-06-29 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR fortran/66605
diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index e6a1539cda9..26147cec960 100644
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -68,10 +68,9 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "symtab.h"
+#include "tree.h"
#include "alias.h"
#include "flags.h"
-#include "tree.h"
#include "c-tree.h"
#include "gimple-expr.h"
#include "tree-iterator.h"
diff --git a/gcc/c/c-aux-info.c b/gcc/c/c-aux-info.c
index 01e81f92510..510f54139e1 100644
--- a/gcc/c/c-aux-info.c
+++ b/gcc/c/c-aux-info.c
@@ -25,9 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "c-tree.h"
enum formals_style_enum {
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index aa8427b0fb6..f023de92438 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -27,9 +27,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "flags.h"
#include "convert.h"
#include "c-family/c-common.h"
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 383f0a766bf..8b02877c722 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -29,9 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "intl.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "fold-const.h"
#include "print-tree.h"
#include "stor-layout.h"
diff --git a/gcc/c/c-errors.c b/gcc/c/c-errors.c
index 1c1a1da97e4..e5fbf05e76f 100644
--- a/gcc/c/c-errors.c
+++ b/gcc/c/c-errors.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "c-tree.h"
#include "tm_p.h"
#include "flags.h"
diff --git a/gcc/c/c-lang.c b/gcc/c/c-lang.c
index 327ead21cdf..d3c266f3416 100644
--- a/gcc/c/c-lang.c
+++ b/gcc/c/c-lang.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "c-tree.h"
#include "c-family/c-common.h"
#include "langhooks.h"
diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c
index a783f805b28..bbb949a8051 100644
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -20,10 +20,9 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "symtab.h"
+#include "tree.h"
#include "alias.h"
#include "flags.h"
-#include "tree.h"
#include "c-tree.h"
#include "intl.h"
#include "c-family/c-pretty-print.h"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index b863dbc64f0..9fb1107628f 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -39,10 +39,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h" /* For rtl.h: needs enum reg_class. */
-#include "symtab.h"
+#include "tree.h"
#include "alias.h"
#include "flags.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "attribs.h"
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 6ea35137d50..247a7bf329d 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -27,9 +27,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "trans-mem.h"
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 45aa68d4974..1526e03c15d 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -20,23 +20,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
#include "insn-config.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "recog.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "df.h"
#include "reload.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index e97c356ca80..ee56efa0124 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -20,24 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "stringpool.h"
#include "attribs.h"
-#include "predict.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -55,8 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "tm_p.h"
#include "timevar.h"
-#include "sbitmap.h"
-#include "bitmap.h"
#include "langhooks.h"
#include "target.h"
#include "cgraph.h"
diff --git a/gcc/ccmp.c b/gcc/ccmp.c
index 32ae8ac75d0..3c3fbcd1273 100644
--- a/gcc/ccmp.c
+++ b/gcc/ccmp.c
@@ -20,18 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
+#include "ssa.h"
#include "tm_p.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "stor-layout.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -45,24 +44,12 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "tree-iterator.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
-#include "tree-ssanames.h"
#include "target.h"
#include "common/common-target.h"
-#include "df.h"
#include "tree-ssa-live.h"
#include "tree-outof-ssa.h"
#include "cfgexpand.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "ccmp.h"
/* The following functions expand conditional compare (CCMP) instructions.
diff --git a/gcc/cfg.c b/gcc/cfg.c
index fb13b7de06a..8c2723ee0be 100644
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -52,18 +52,12 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "alloc-pool.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "predict.h"
-#include "tm.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "cfganal.h"
-#include "basic-block.h"
#include "df.h"
+#include "options.h"
+#include "cfganal.h"
#include "cfgloop.h" /* FIXME: For struct loop. */
#include "dumpfile.h"
diff --git a/gcc/cfg.h b/gcc/cfg.h
index f5ea2ce897f..7674667100b 100644
--- a/gcc/cfg.h
+++ b/gcc/cfg.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CFG_H
#define GCC_CFG_H
+#include "dominance.h"
+
/* What sort of profiling information we have. */
enum profile_status_d
{
diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index a99fd73a79e..22cfd280c61 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -22,16 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "predict.h"
-#include "tm.h"
+#include "backend.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "bitmap.h"
-#include "sbitmap.h"
#include "timevar.h"
/* Store the data structures necessary for depth-first search. */
diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 43c0b3a125d..236b84dc445 100644
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.c
@@ -21,20 +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 "backend.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "rtl.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
-#include "basic-block.h"
#include "regs.h"
#include "flags.h"
#include "except.h"
@@ -49,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "diagnostic-core.h"
#include "timevar.h"
-#include "sbitmap.h"
static void make_edges (basic_block, basic_block, int);
static void make_label_edge (sbitmap, basic_block, rtx, int);
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index dfd1315548f..0183ca888fc 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -32,12 +32,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
-#include "hard-reg-set.h"
#include "regs.h"
#include "insn-config.h"
#include "flags.h"
@@ -48,11 +47,9 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "tm_p.h"
#include "target.h"
-#include "function.h" /* For inline functions in emit-rtl.h they need crtl. */
#include "emit-rtl.h"
#include "tree-pass.h"
#include "cfgloop.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -60,15 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "dce.h"
#include "dbgcnt.h"
#include "rtl-iter.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 4f9a31dbaef..777816aa618 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -20,28 +20,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
-#include "hard-reg-set.h"
+#include "ssa.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "varasm.h"
#include "stor-layout.h"
#include "stmt.h"
#include "print-tree.h"
#include "tm_p.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "insn-codes.h"
#include "optabs.h"
#include "flags.h"
@@ -53,20 +47,12 @@ along with GCC; see the file COPYING3. If not see
#include "emit-rtl.h"
#include "expr.h"
#include "langhooks.h"
-#include "bitmap.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "tree-ssanames.h"
#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
@@ -81,7 +67,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "tree-ssa-live.h"
#include "tree-outof-ssa.h"
-#include "sbitmap.h"
#include "cfgloop.h"
#include "regs.h" /* For reg_renumber. */
#include "insn-attr.h" /* For INSN_SCHEDULING. */
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index c649b7e8fd2..285ec3d291f 100644
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -22,18 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "dumpfile.h"
-#include "tm.h"
+#include "backend.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "rtl.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "tree-ssa.h"
#include "timevar.h"
#include "diagnostic-core.h"
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index 0d9519d061f..6d42206edca 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -20,25 +20,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "cfgloop.h"
#include "diagnostic-core.h"
#include "flags.h"
-#include "tree.h"
#include "fold-const.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "dumpfile.h"
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index fe3bb921ea4..96ce90d60f5 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CFGLOOP_H
#define GCC_CFGLOOP_H
-#include "bitmap.h"
-#include "sbitmap.h"
-#include "function.h"
#include "cfgloopmanip.h"
/* Structure to hold decision about unrolling/peeling. */
diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index ac9c9ae5099..575ae7a4905 100644
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -20,20 +20,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
-#include "hard-reg-set.h"
#include "obstack.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "cfgloop.h"
-#include "symtab.h"
+#include "tree.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c
index b5c13a79127..b665f1a7776 100644
--- a/gcc/cfgloopmanip.c
+++ b/gcc/cfgloopmanip.c
@@ -20,23 +20,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
-#include "predict.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "cfgloop.h"
-#include "tree.h"
#include "fold-const.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "tree-ssa-loop-manip.h"
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 4a711b3aa4f..cebec20382e 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -40,20 +40,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "bb-reorder.h"
#include "regs.h"
#include "flags.h"
@@ -63,7 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "insn-attr.h"
#include "insn-config.h"
-#include "rtl.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -76,7 +70,6 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "cfgloop.h"
#include "tree-pass.h"
-#include "df.h"
/* Holds the interesting leading and trailing notes for the function.
Only applicable if the CFG is in cfglayout mode. */
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 8314ecfc483..d13bcd3a645 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -26,10 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
#include "calls.h"
@@ -40,19 +41,10 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "debug.h"
#include "target.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cgraph.h"
#include "intl.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "timevar.h"
#include "dumpfile.h"
@@ -62,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "value-prof.h"
#include "except.h"
#include "diagnostic-core.h"
-#include "rtl.h"
#include "ipa-utils.h"
#include "lto-streamer.h"
#include "alloc-pool.h"
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index 4dc4c2696c6..7d2d0969fab 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -21,22 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "alias.h"
+#include "fold-const.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "langhooks.h"
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index aad9b8176fe..1cfd53b959d 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -67,24 +67,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "emit-rtl.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "bitmap.h"
#include "tree-cfg.h"
#include "tree-inline.h"
#include "langhooks.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 7e78bf78915..0082191f86e 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -160,32 +160,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
#include "stringpool.h"
+#include "gimple-ssa.h"
#include "output.h"
-#include "rtl.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "dominance.h"
#include "cfgcleanup.h"
-#include "cfg.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
#include "tree-into-ssa.h"
#include "tree-ssa.h"
diff --git a/gcc/cilk-common.c b/gcc/cilk-common.c
index d62f5a75910..d8340b2f42e 100644
--- a/gcc/cilk-common.c
+++ b/gcc/cilk-common.c
@@ -24,17 +24,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "langhooks.h"
#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "rtl.h"
+#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index a39ac8d8b55..a549f88fd02 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -41,18 +41,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
-#include "function.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -61,12 +59,7 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
-#include "df.h"
#include "except.h"
#include "reload.h"
#include "tree-pass.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index b97aa10be07..55cfc15e9a4 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -78,23 +78,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "stor-layout.h"
#include "tm_p.h"
#include "flags.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "insn-config.h"
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
#include "expmed.h"
@@ -114,7 +108,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtlhooks-def.h"
#include "params.h"
#include "tree-pass.h"
-#include "df.h"
#include "valtrack.h"
#include "cgraph.h"
#include "obstack.h"
diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c
index c4aa810ac55..b65d09e7938 100644
--- a/gcc/compare-elim.c
+++ b/gcc/compare-elim.c
@@ -57,22 +57,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
#include "flags.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "tree-pass.h"
#include "target.h"
-#include "df.h"
#include "domwalk.h"
diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index ec60955c6af..b6c89b91a8f 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -22,16 +22,18 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
+#include "function.h"
+#include "predict.h"
+#include "basic-block.h"
+#include "cfg.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "calls.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -47,21 +49,14 @@
#include "diagnostic-core.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#define v8qi_UP V8QImode
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 5d4dc83f448..f7a9f3ebbad 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -21,32 +21,26 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "insn-codes.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
+#include "insn-codes.h"
#include "insn-attr.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
#include "regs.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
-#include "hard-reg-set.h"
#include "output.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -63,12 +57,9 @@
#include "recog.h"
#include "langhooks.h"
#include "diagnostic-core.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "optabs.h"
#include "dwarf2.h"
diff --git a/gcc/config/aarch64/cortex-a57-fma-steering.c b/gcc/config/aarch64/cortex-a57-fma-steering.c
index 14ef927a43c..093c0e389cb 100644
--- a/gcc/config/aarch64/cortex-a57-fma-steering.c
+++ b/gcc/config/aarch64/cortex-a57-fma-steering.c
@@ -21,23 +21,17 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "rtl.h"
+#include "df.h"
#include "regs.h"
#include "insn-config.h"
-#include "hard-reg-set.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "predict.h"
-#include "basic-block.h"
#include "insn-attr.h"
#include "recog.h"
#include "output.h"
-#include "bitmap.h"
#include "obstack.h"
-#include "df.h"
#include "target.h"
-#include "rtl.h"
#include "emit-rtl.h"
#include "context.h"
#include "tree-pass.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 7f0c6a7b4fd..41c8d94b716 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -22,24 +22,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
+#include "ssa.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -57,32 +57,21 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "debug.h"
#include "langhooks.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "tree-pass.h"
#include "context.h"
#include "pass_manager.h"
#include "gimple-iterator.h"
#include "gimplify.h"
-#include "gimple-ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-stdarg.h"
#include "tm-constrs.h"
-#include "df.h"
#include "libfuncs.h"
#include "opts.h"
#include "params.h"
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index d09520fccb7..61032f128e7 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -31,22 +31,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
-#include "function.h"
#include "toplev.h"
#include "tm_p.h"
#include "target.h"
@@ -67,16 +65,11 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "tm-constrs.h"
#include "reload.h" /* For operands_match_p */
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tree-pass.h"
#include "context.h"
#include "pass_manager.h"
diff --git a/gcc/config/arm/aarch-common.c b/gcc/config/arm/aarch-common.c
index 41ea22dae9b..5dd8222539e 100644
--- a/gcc/config/arm/aarch-common.c
+++ b/gcc/config/arm/aarch-common.c
@@ -28,7 +28,6 @@
#include "tm_p.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-common.h"
#include "rtl.h"
diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c
index f960e0ab444..65e72a4233a 100644
--- a/gcc/config/arm/arm-builtins.c
+++ b/gcc/config/arm/arm-builtins.c
@@ -23,11 +23,9 @@
#include "tm.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
index d1003efc9fe..297995b8100 100644
--- a/gcc/config/arm/arm-c.c
+++ b/gcc/config/arm/arm-c.c
@@ -22,7 +22,6 @@
#include "tm.h"
#include "tm_p.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tm_p.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 9d697af5ef8..a7ce0c701d6 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -23,11 +23,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
@@ -35,14 +35,12 @@
#include "varasm.h"
#include "obstack.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "reload.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -53,15 +51,11 @@
#include "optabs.h"
#include "diagnostic-core.h"
#include "recog.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "cgraph.h"
#include "except.h"
#include "tm_p.h"
@@ -69,7 +63,6 @@
#include "sched-int.h"
#include "debug.h"
#include "langhooks.h"
-#include "df.h"
#include "intl.h"
#include "libfuncs.h"
#include "params.h"
@@ -80,8 +73,6 @@
#include "builtins.h"
#include "tm-constrs.h"
#include "rtl-iter.h"
-#include "sched-int.h"
-#include "tree.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/avr/avr-c.c b/gcc/config/avr/avr-c.c
index efe690ca2fd..57ca020a6bb 100644
--- a/gcc/config/avr/avr-c.c
+++ b/gcc/config/avr/avr-c.c
@@ -26,7 +26,6 @@
#include "tm_p.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "target.h"
diff --git a/gcc/config/avr/avr-log.c b/gcc/config/avr/avr-log.c
index 8d53db998be..83f107c9db4 100644
--- a/gcc/config/avr/avr-log.c
+++ b/gcc/config/avr/avr-log.c
@@ -24,11 +24,9 @@
#include "tm.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "print-tree.h"
#include "output.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "tm_p.h"
#include "tree-pass.h" /* for current_pass */
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index c002377d19e..4baa356986a 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -21,10 +21,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-attr.h"
@@ -32,8 +33,6 @@
#include "flags.h"
#include "reload.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "print-tree.h"
@@ -41,7 +40,6 @@
#include "stor-layout.h"
#include "stringpool.h"
#include "output.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -57,16 +55,11 @@
#include "tm_p.h"
#include "target.h"
#include "params.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "builtins.h"
#include "context.h"
#include "tree-pass.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 2c6f1958f52..3119fe7c9a2 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -21,10 +21,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "insn-codes.h"
#include "conditions.h"
@@ -32,14 +33,11 @@
#include "output.h"
#include "insn-attr.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "calls.h"
#include "flags.h"
#include "except.h"
-#include "function.h"
#include "target.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,15 +48,11 @@
#include "diagnostic-core.h"
#include "recog.h"
#include "optabs.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "cgraph.h"
#include "langhooks.h"
#include "bfin-protos.h"
@@ -67,7 +61,6 @@
#include "tm-constrs.h"
#include "gt-bfin.h"
#include "timevar.h"
-#include "df.h"
#include "sel-sched.h"
#include "hw-doloop.h"
#include "opts.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index 159335d75c9..de49d8b33b9 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -22,11 +22,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -36,8 +36,6 @@
#include "output.h"
#include "insn-attr.h"
#include "insn-codes.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -49,21 +47,16 @@
#include "regs.h"
#include "optabs.h"
#include "recog.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "timevar.h"
#include "tm_p.h"
#include "tm-preds.h"
#include "tm-constrs.h"
-#include "df.h"
#include "diagnostic-core.h"
#include "cgraph.h"
#include "langhooks.h"
diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index cb135456b4f..47d8c77cc34 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -21,17 +21,16 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
@@ -39,7 +38,6 @@
#include "insn-attr.h"
#include "flags.h"
#include "except.h"
-#include "function.h"
#include "recog.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,17 +48,12 @@
#include "expr.h"
#include "optabs.h"
#include "diagnostic-core.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "target.h"
-#include "df.h"
#include "builtins.h"
/* This file should be included last. */
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index d77926ea811..0773b7ad0a0 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -21,23 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-attr.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
#include "stmt.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -54,16 +52,11 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "opts.h"
#include "cgraph.h"
#include "builtins.h"
diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index e9232c0aaf6..19f4404a601 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "target.h"
#include "incpath.h"
@@ -39,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-target.h"
#include "c-family/c-target-def.h"
#include "predict.h"
-#include "dominance.h"
#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 6f0c29ad735..ec4048d75ff 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -21,10 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -32,13 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "varasm.h"
#include "stor-layout.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -52,24 +51,16 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "debug.h"
#include "obstack.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "cgraph.h"
#include "lto-streamer.h"
diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
index 60000bf3ea8..f0889bca99b 100644
--- a/gcc/config/epiphany/epiphany.c
+++ b/gcc/config/epiphany/epiphany.c
@@ -21,24 +21,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
#include "stringpool.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "function.h"
#include "insn-codes.h"
#include "optabs.h"
#include "expmed.h"
@@ -52,16 +50,11 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "tm_p.h"
#include "target.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "langhooks.h"
#include "tm-constrs.h"
#include "tree-pass.h" /* for current_pass */
diff --git a/gcc/config/epiphany/mode-switch-use.c b/gcc/config/epiphany/mode-switch-use.c
index 86963fdec1f..f0657450aaa 100644
--- a/gcc/config/epiphany/mode-switch-use.c
+++ b/gcc/config/epiphany/mode-switch-use.c
@@ -22,26 +22,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "df.h"
#include "emit-rtl.h"
#include "tree-pass.h"
#include "insn-attr.h"
#include "insn-config.h"
#include "recog.h"
#include "tm_p.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#ifndef TARGET_INSERT_MODE_SWITCH_USE
#define TARGET_INSERT_MODE_SWITCH_USE NULL
diff --git a/gcc/config/epiphany/resolve-sw-modes.c b/gcc/config/epiphany/resolve-sw-modes.c
index f3376e9e3a2..34ed2f599f5 100644
--- a/gcc/config/epiphany/resolve-sw-modes.c
+++ b/gcc/config/epiphany/resolve-sw-modes.c
@@ -21,22 +21,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
-#include "sbitmap.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
-#include "rtl.h"
#include "insn-config.h"
#include "insn-codes.h"
#include "emit-rtl.h"
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index 2895598f215..e96c62131a1 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -23,23 +23,21 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "output.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -49,16 +47,11 @@
#include "expr.h"
#include "obstack.h"
#include "except.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "diagnostic-core.h"
#include "tm_p.h"
#include "target.h"
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 23b5f3cb826..7b8ec2f445d 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -20,17 +20,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "rtl.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -39,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "recog.h"
#include "reload.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -52,20 +50,15 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "diagnostic-core.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "tm_p.h"
#include "target.h"
#include "targhooks.h"
#include "langhooks.h"
-#include "df.h"
#include "dumpfile.h"
#include "builtins.h"
#include "ifcvt.h"
diff --git a/gcc/config/ft32/ft32.c b/gcc/config/ft32/ft32.c
index 4adf39b8b57..8a8dff7392c 100644
--- a/gcc/config/ft32/ft32.c
+++ b/gcc/config/ft32/ft32.c
@@ -21,10 +21,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -36,27 +37,19 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "stor-layout.h"
#include "calls.h"
#include "expr.h"
#include "optabs.h"
#include "except.h"
-#include "function.h"
#include "target.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "builtins.h"
#include "emit-rtl.h"
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index 0f11511918d..1f25b858a89 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -22,24 +22,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
#include "stringpool.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -53,16 +51,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "tm-constrs.h"
#include "target.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "builtins.h"
/* This file should be included last. */
diff --git a/gcc/config/i386/i386-c.c b/gcc/config/i386/i386-c.c
index d95772b40f6..35cecd004ae 100644
--- a/gcc/config/i386/i386-c.c
+++ b/gcc/config/i386/i386-c.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "tm_p.h"
#include "flags.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e42d2f8e6d6..bf38bce50c1 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -20,11 +20,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "attribs.h"
@@ -33,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
@@ -41,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "except.h"
-#include "function.h"
#include "recog.h"
#include "expmed.h"
#include "dojump.h"
@@ -52,36 +51,27 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
#include "reload.h"
#include "cgraph.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "cfgloop.h"
#include "dwarf2.h"
-#include "df.h"
#include "tm-constrs.h"
#include "params.h"
#include "cselib.h"
#include "debug.h"
#include "sched-int.h"
-#include "sbitmap.h"
#include "fibheap.h"
#include "opts.h"
#include "diagnostic.h"
diff --git a/gcc/config/i386/msformat-c.c b/gcc/config/i386/msformat-c.c
index 9319d0497bb..ce2156c6731 100644
--- a/gcc/config/i386/msformat-c.c
+++ b/gcc/config/i386/msformat-c.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "flags.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/i386/winnt-cxx.c b/gcc/config/i386/winnt-cxx.c
index dcb2e0b9619..506cb93cc8f 100644
--- a/gcc/config/i386/winnt-cxx.c
+++ b/gcc/config/i386/winnt-cxx.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
diff --git a/gcc/config/i386/winnt-stubs.c b/gcc/config/i386/winnt-stubs.c
index 3bdc9d6d0bc..41ffbeb697d 100644
--- a/gcc/config/i386/winnt-stubs.c
+++ b/gcc/config/i386/winnt-stubs.c
@@ -24,10 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "output.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "flags.h"
#include "tm_p.h"
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 51045cbd29f..e9c7d287b92 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -22,13 +22,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
+#include "function.h"
+#include "predict.h"
+#include "basic-block.h"
+#include "cfg.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "output.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "varasm.h"
@@ -38,23 +41,15 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "target.h"
#include "except.h"
-#include "predict.h"
-#include "function.h"
#include "emit-rtl.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
diff --git a/gcc/config/ia64/ia64-c.c b/gcc/config/ia64/ia64-c.c
index 1265793cafd..395f793bf07 100644
--- a/gcc/config/ia64/ia64-c.c
+++ b/gcc/config/ia64/ia64-c.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "cpplib.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 47b44691cd5..64fbe21636a 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -22,25 +22,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -50,15 +49,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "except.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "libfuncs.h"
#include "diagnostic-core.h"
#include "sched-int.h"
@@ -67,15 +62,11 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "intl.h"
-#include "df.h"
#include "debug.h"
#include "params.h"
#include "dbgcnt.h"
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index 0b8d0526b65..90c73b86a22 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -20,23 +20,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -53,16 +51,11 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "target.h"
#include "langhooks.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "builtins.h"
/* This file should be included last. */
diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c
index a15bcfd281c..55d0d209f23 100644
--- a/gcc/config/lm32/lm32.c
+++ b/gcc/config/lm32/lm32.c
@@ -22,20 +22,16 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -43,8 +39,6 @@
#include "insn-codes.h"
#include "recog.h"
#include "output.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "calls.h"
#include "flags.h"
@@ -64,7 +58,6 @@
#include "target.h"
#include "langhooks.h"
#include "tm-constrs.h"
-#include "df.h"
#include "builtins.h"
/* This file should be included last. */
diff --git a/gcc/config/m32c/m32c-pragma.c b/gcc/config/m32c/m32c-pragma.c
index 90470144efb..fa372ef1f9a 100644
--- a/gcc/config/m32c/m32c-pragma.c
+++ b/gcc/config/m32c/m32c-pragma.c
@@ -23,7 +23,6 @@
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-pragma.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index 2b9aae3ecd7..3bf87c5eef6 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -21,10 +21,12 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -36,13 +38,10 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -55,22 +54,14 @@
#include "target.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "df.h"
#include "tm-constrs.h"
#include "builtins.h"
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index cabf8fb9221..2d77002377f 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -20,24 +20,22 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "stringpool.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "dbxout.h"
#include "insn-attr.h"
#include "flags.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -46,16 +44,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "target.h"
#include "tm-constrs.h"
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index cf67e7588a3..4e39d201a54 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -20,17 +20,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "calls.h"
#include "stor-layout.h"
#include "varasm.h"
-#include "rtl.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "regs.h"
#include "insn-config.h"
#include "conditions.h"
@@ -49,16 +47,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "target.h"
#include "debug.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
/* ??? Need to add a dependency between m68k.o and sched-int.h. */
#include "sched-int.h"
#include "insn-codes.h"
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index f25c0d16170..a18b0429f45 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -20,11 +20,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -33,14 +33,12 @@
#include "tm_p.h"
#include "mcore.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "obstack.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -51,16 +49,11 @@
#include "recog.h"
#include "diagnostic-core.h"
#include "target.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "builtins.h"
/* This file should be included last. */
diff --git a/gcc/config/mep/mep-pragma.c b/gcc/config/mep/mep-pragma.c
index de66e7ec3a3..e3cc7f114f8 100644
--- a/gcc/config/mep/mep-pragma.c
+++ b/gcc/config/mep/mep-pragma.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "diagnostic-core.h"
#include "c-family/c-pragma.h"
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 9a568795de4..bfdd2dc6be5 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -21,18 +21,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "calls.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -41,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "recog.h"
#include "obstack.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -56,22 +55,14 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "target.h"
#include "langhooks.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "opts.h"
#include "dumpfile.h"
diff --git a/gcc/config/microblaze/microblaze-c.c b/gcc/config/microblaze/microblaze-c.c
index a540331fb83..245dc8c4f06 100644
--- a/gcc/config/microblaze/microblaze-c.c
+++ b/gcc/config/microblaze/microblaze-c.c
@@ -25,7 +25,6 @@
#include "tm.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-common.h"
#include "tm_p.h"
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 7fde179aaef..8ed3bfa40e7 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -22,22 +22,20 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
#include "insn-attr.h"
#include "recog.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
-#include "function.h"
#include "flags.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,16 +48,11 @@
#include "target.h"
#include "tm_p.h"
#include "gstab.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "insn-codes.h"
#include "optabs.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index ce21a0fd215..078bfdcef37 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -24,24 +24,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-attr.h"
#include "recog.h"
#include "output.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
-#include "function.h"
#include "flags.h"
#include "expmed.h"
#include "dojump.h"
@@ -59,24 +58,16 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
-#include "bitmap.h"
#include "diagnostic.h"
#include "target-globals.h"
#include "opts.h"
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index ee2da088a9d..871e4cd40d3 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -21,25 +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 "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "output.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "flags.h"
-#include "symtab.h"
-#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
@@ -56,7 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "tm_p.h"
#include "target.h"
-#include "df.h"
#include "tm-constrs.h"
#include "builtins.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 49bf7725e23..349ed5a5c8a 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -21,16 +21,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
@@ -38,7 +37,6 @@
#include "flags.h"
#include "recog.h"
#include "reload.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -52,16 +50,11 @@
#include "tm_p.h"
#include "tm-constrs.h"
#include "target.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "opts.h"
#include "cfgloop.h"
#include "dumpfile.h"
diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c
index 7a80f77bde3..af05d823bc5 100644
--- a/gcc/config/moxie/moxie.c
+++ b/gcc/config/moxie/moxie.c
@@ -21,10 +21,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -36,12 +37,9 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -54,16 +52,11 @@
#include "target.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "builtins.h"
/* This file should be included last. */
diff --git a/gcc/config/msp430/msp430-c.c b/gcc/config/msp430/msp430-c.c
index e4f7cdaaac1..f53a16187fa 100644
--- a/gcc/config/msp430/msp430-c.c
+++ b/gcc/config/msp430/msp430-c.c
@@ -23,7 +23,6 @@
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-common.h"
#include "msp430-protos.h"
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index e83efb68152..19849473e34 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -21,22 +21,20 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -51,16 +49,11 @@
#include "diagnostic-core.h"
#include "toplev.h"
#include "reload.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "debug.h"
#include "target.h"
diff --git a/gcc/config/nds32/nds32-cost.c b/gcc/config/nds32/nds32-cost.c
index 4cd4db1c660..7afdc4be7e2 100644
--- a/gcc/config/nds32/nds32-cost.c
+++ b/gcc/config/nds32/nds32-cost.c
@@ -23,16 +23,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -40,7 +39,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,16 +48,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32-fp-as-gp.c b/gcc/config/nds32/nds32-fp-as-gp.c
index b90307286e7..85110829f83 100644
--- a/gcc/config/nds32/nds32-fp-as-gp.c
+++ b/gcc/config/nds32/nds32-fp-as-gp.c
@@ -23,16 +23,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -40,7 +39,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,16 +48,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32-intrinsic.c b/gcc/config/nds32/nds32-intrinsic.c
index 735d0e79ad1..4bfcc8207b0 100644
--- a/gcc/config/nds32/nds32-intrinsic.c
+++ b/gcc/config/nds32/nds32-intrinsic.c
@@ -23,16 +23,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -40,7 +39,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,16 +48,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32-isr.c b/gcc/config/nds32/nds32-isr.c
index edbabc49c11..a61aa32b901 100644
--- a/gcc/config/nds32/nds32-isr.c
+++ b/gcc/config/nds32/nds32-isr.c
@@ -23,16 +23,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -40,7 +39,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,16 +48,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32-md-auxiliary.c b/gcc/config/nds32/nds32-md-auxiliary.c
index bdcd623cbde..c01ce822f50 100644
--- a/gcc/config/nds32/nds32-md-auxiliary.c
+++ b/gcc/config/nds32/nds32-md-auxiliary.c
@@ -24,16 +24,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -41,7 +40,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -51,16 +49,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32-memory-manipulation.c b/gcc/config/nds32/nds32-memory-manipulation.c
index 0bc7fb558e1..c857ab784c5 100644
--- a/gcc/config/nds32/nds32-memory-manipulation.c
+++ b/gcc/config/nds32/nds32-memory-manipulation.c
@@ -24,16 +24,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -41,7 +40,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -51,16 +49,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32-pipelines-auxiliary.c b/gcc/config/nds32/nds32-pipelines-auxiliary.c
index 89ffb5a8231..ec6111c50c2 100644
--- a/gcc/config/nds32/nds32-pipelines-auxiliary.c
+++ b/gcc/config/nds32/nds32-pipelines-auxiliary.c
@@ -24,16 +24,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -41,7 +40,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -51,16 +49,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32-predicates.c b/gcc/config/nds32/nds32-predicates.c
index 03ef338303d..e0009e0db6e 100644
--- a/gcc/config/nds32/nds32-predicates.c
+++ b/gcc/config/nds32/nds32-predicates.c
@@ -23,16 +23,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -40,7 +39,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,16 +48,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index b58e4bc50d6..9b42325bcbc 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -23,16 +23,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h" /* Required by recog.h. */
#include "conditions.h"
#include "output.h"
@@ -40,7 +39,6 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,16 +48,11 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "tm-constrs.h"
#include "optabs.h" /* For GEN_FCN. */
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 51f7aa2defb..84d8ed7c055 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -23,21 +23,19 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -48,21 +46,16 @@
#include "expr.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "diagnostic-core.h"
#include "toplev.h"
#include "target.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "df.h"
#include "debug.h"
#include "reload.h"
#include "stor-layout.h"
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index 3e8ab51c4a3..f44909b0d2c 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -23,17 +23,15 @@
#include <sstream>
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "insn-codes.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -55,11 +53,8 @@
#include "dbxout.h"
#include "target.h"
#include "diagnostic.h"
-#include "predict.h"
-#include "basic-block.h"
#include "cfgrtl.h"
#include "stor-layout.h"
-#include "df.h"
#include "builtins.h"
/* This file should be included last. */
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 6cc3c2ae44e..a92239075d7 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -21,17 +21,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-attr.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
@@ -40,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "dbxout.h"
#include "except.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -52,20 +50,15 @@ along with GCC; see the file COPYING3. If not see
#include "reload.h"
#include "diagnostic-core.h"
#include "recog.h"
-#include "predict.h"
#include "tm_p.h"
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
#include "opts.h"
#include "builtins.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index f0b1b8b84a6..2730400083d 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -21,19 +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 "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
-#include "function.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "symtab.h"
-#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
@@ -47,16 +45,11 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "tm_p.h"
#include "target.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "opts.h"
#include "dbxout.h"
#include "builtins.h"
diff --git a/gcc/config/rl78/rl78-c.c b/gcc/config/rl78/rl78-c.c
index 1298fab15b7..4ce56edc0d5 100644
--- a/gcc/config/rl78/rl78-c.c
+++ b/gcc/config/rl78/rl78-c.c
@@ -23,7 +23,6 @@
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-common.h"
#include "rl78-protos.h"
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index 680e4dbcc47..efa4b0bdaa2 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -21,23 +21,21 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -51,16 +49,11 @@
#include "diagnostic-core.h"
#include "toplev.h"
#include "reload.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "debug.h"
#include "target.h"
diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index 229213a754a..e2891cf25ae 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -26,7 +26,6 @@
#include "tm.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 1308d0c9060..c570d98e8c4 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -21,10 +21,12 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-attr.h"
@@ -32,15 +34,12 @@
#include "recog.h"
#include "obstack.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "print-tree.h"
#include "varasm.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -52,15 +51,11 @@
#include "except.h"
#include "output.h"
#include "dbxout.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "diagnostic-core.h"
#include "toplev.h"
#include "tm_p.h"
@@ -70,12 +65,9 @@
#include "reload.h"
#include "cfgloop.h"
#include "sched-int.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index ae994a42ae2..7bda176da88 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -25,22 +25,20 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -54,16 +52,11 @@
#include "diagnostic-core.h"
#include "toplev.h"
#include "reload.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "tm_p.h"
#include "debug.h"
#include "target.h"
diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index acb320d0a31..492c85dab67 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -33,7 +33,6 @@
#include "tm.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 4ef8e42304d..0bc490a6736 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -23,11 +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 "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
#include "stringpool.h"
@@ -36,14 +37,12 @@ along with GCC; see the file COPYING3. If not see
#include "calls.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "except.h"
-#include "function.h"
#include "recog.h"
#include "expmed.h"
#include "dojump.h"
@@ -53,28 +52,20 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "reload.h"
#include "diagnostic-core.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "target.h"
#include "debug.h"
#include "langhooks.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
-#include "df.h"
#include "params.h"
#include "cfgloop.h"
#include "opts.h"
diff --git a/gcc/config/sh/sh-c.c b/gcc/config/sh/sh-c.c
index 4aada59a95a..a98c1485273 100644
--- a/gcc/config/sh/sh-c.c
+++ b/gcc/config/sh/sh-c.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
diff --git a/gcc/config/sh/sh-mem.cc b/gcc/config/sh/sh-mem.cc
index f76a71013e9..b0a8cfc1f97 100644
--- a/gcc/config/sh/sh-mem.cc
+++ b/gcc/config/sh/sh-mem.cc
@@ -23,9 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
@@ -39,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tm_p.h"
#include "predict.h"
-#include "dominance.h"
#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 0139095cf53..5f6558c75a0 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -25,20 +25,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "insn-config.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
+#include "insn-config.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -57,25 +56,17 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "target.h"
#include "langhooks.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
#include "intl.h"
#include "sched-int.h"
#include "params.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "cfgloop.h"
#include "alloc-pool.h"
diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index 60c872f086d..4c974d9dad7 100644
--- a/gcc/config/sh/sh_optimize_sett_clrt.cc
+++ b/gcc/config/sh/sh_optimize_sett_clrt.cc
@@ -20,20 +20,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
+#include "backend.h"
+#include "rtl.h"
+#include "df.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
-#include "rtl.h"
#include "insn-config.h"
#include "tree-pass.h"
#include "target.h"
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index 9be01dec91f..4d12175a4a5 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -21,28 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
-#include "rtl.h"
#include "insn-config.h"
#include "insn-codes.h"
#include "emit-rtl.h"
#include "recog.h"
#include "tree-pass.h"
#include "target.h"
-#include "symtab.h"
-#include "tree.h"
#include "optabs.h"
#include "flags.h"
#include "alias.h"
diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c
index 4dbcebc8adb..fe36eb91372 100644
--- a/gcc/config/sol2-c.c
+++ b/gcc/config/sol2-c.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "attribs.h"
#include "tm.h"
diff --git a/gcc/config/sol2-cxx.c b/gcc/config/sol2-cxx.c
index 658e56fd1aa..3e470c637b8 100644
--- a/gcc/config/sol2-cxx.c
+++ b/gcc/config/sol2-cxx.c
@@ -21,9 +21,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "cp/cp-tree.h"
#include "tm.h"
diff --git a/gcc/config/sol2-stubs.c b/gcc/config/sol2-stubs.c
index efdd6ae2006..8342caa0745 100644
--- a/gcc/config/sol2-stubs.c
+++ b/gcc/config/sol2-stubs.c
@@ -21,9 +21,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "tm.h"
#include "tm_p.h"
diff --git a/gcc/config/sol2.c b/gcc/config/sol2.c
index 168c8951125..af8dab54d3b 100644
--- a/gcc/config/sol2.c
+++ b/gcc/config/sol2.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "varasm.h"
#include "output.h"
diff --git a/gcc/config/sparc/sparc-c.c b/gcc/config/sparc/sparc-c.c
index b19d48f8201..2b859994c17 100644
--- a/gcc/config/sparc/sparc-c.c
+++ b/gcc/config/sparc/sparc-c.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tm_p.h"
#include "flags.h"
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 2556eecc8ca..42e12c2f9b6 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -23,25 +23,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "insn-codes.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "function.h"
#include "except.h"
#include "expmed.h"
#include "dojump.h"
@@ -56,26 +55,18 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "target.h"
#include "common/common-target.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "langhooks.h"
#include "reload.h"
#include "params.h"
-#include "df.h"
#include "opts.h"
#include "tree-pass.h"
#include "context.h"
diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index 3c683746cfb..f8185db7bc5 100644
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -20,7 +20,6 @@
#include "tm.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 97690e3b34b..5ff1083b70d 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -17,10 +17,12 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-attr.h"
@@ -28,14 +30,11 @@
#include "recog.h"
#include "obstack.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -46,15 +45,11 @@
#include "optabs.h"
#include "except.h"
#include "output.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "diagnostic-core.h"
#include "tm_p.h"
#include "target.h"
@@ -62,16 +57,11 @@
#include "reload.h"
#include "sched-int.h"
#include "params.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "tm-constrs.h"
-#include "sbitmap.h"
-#include "df.h"
#include "ddg.h"
#include "timevar.h"
#include "dumpfile.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 142498db47d..a491cb2700d 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -21,10 +21,12 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -35,14 +37,11 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -55,23 +54,15 @@
#include "target.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
-#include "df.h"
#include "reload.h"
#include "builtins.h"
diff --git a/gcc/config/tilegx/mul-tables.c b/gcc/config/tilegx/mul-tables.c
index 6f5df4730b8..aca99e77c73 100644
--- a/gcc/config/tilegx/mul-tables.c
+++ b/gcc/config/tilegx/mul-tables.c
@@ -24,16 +24,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "symtab.h"
+#include "tree.h"
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
#include "machmode.h"
#include "tm.h"
-#include "hard-reg-set.h"
+#include "rtl.h"
#include "input.h"
#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "statistics.h"
#include "double-int.h"
@@ -42,7 +41,6 @@
#include "alias.h"
#include "wide-int.h"
#include "inchash.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/tilegx/tilegx-c.c b/gcc/config/tilegx/tilegx-c.c
index b38bcd2f4b2..833dfe2f2a1 100644
--- a/gcc/config/tilegx/tilegx-c.c
+++ b/gcc/config/tilegx/tilegx-c.c
@@ -25,7 +25,6 @@
#include "tm_p.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index 1f285e09139..68af9947985 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -21,19 +21,18 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
#include "insn-config.h"
#include "output.h"
#include "insn-attr.h"
#include "recog.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -45,15 +44,11 @@
#include "langhooks.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "tm_p.h"
#include "tm-constrs.h"
@@ -61,12 +56,9 @@
#include "dwarf2.h"
#include "timevar.h"
#include "fold-const.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "gimplify.h"
diff --git a/gcc/config/tilepro/mul-tables.c b/gcc/config/tilepro/mul-tables.c
index 49821861ca4..1c3f55c3066 100644
--- a/gcc/config/tilepro/mul-tables.c
+++ b/gcc/config/tilepro/mul-tables.c
@@ -24,14 +24,12 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "symtab.h"
+#include "tree.h"
#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "rtl.h"
+#include "function.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/tilepro/tilepro-c.c b/gcc/config/tilepro/tilepro-c.c
index dd5f97f445b..bb67c882a04 100644
--- a/gcc/config/tilepro/tilepro-c.c
+++ b/gcc/config/tilepro/tilepro-c.c
@@ -25,7 +25,6 @@
#include "tm_p.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c
index 92447391eba..29302a6d3a5 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -21,19 +21,18 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
#include "insn-config.h"
#include "output.h"
#include "insn-attr.h"
#include "recog.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -45,15 +44,11 @@
#include "langhooks.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "sel-sched.h"
#include "tm_p.h"
@@ -62,12 +57,9 @@
#include "dwarf2.h"
#include "timevar.h"
#include "fold-const.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "gimplify.h"
diff --git a/gcc/config/v850/v850-c.c b/gcc/config/v850/v850-c.c
index 6191d7b9aab..de123b538be 100644
--- a/gcc/config/v850/v850-c.c
+++ b/gcc/config/v850/v850-c.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 96811654e81..3dcd8923635 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -21,24 +21,22 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -48,16 +46,11 @@
#include "diagnostic-core.h"
#include "tm_p.h"
#include "target.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "opts.h"
#include "builtins.h"
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 08706f74791..06f16191925 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -20,28 +20,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
-#include "dominance.h"
-#include "cfg.h"
+#include "df.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "calls.h"
#include "varasm.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
-#include "function.h"
#include "output.h"
#include "insn-attr.h"
#include "recog.h"
diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c
index 135f74d41ef..29d52fa830e 100644
--- a/gcc/config/visium/visium.c
+++ b/gcc/config/visium/visium.c
@@ -21,26 +21,22 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "alias.h"
#include "flags.h"
-#include "symtab.h"
-#include "tree-core.h"
#include "fold-const.h"
-#include "tree-check.h"
-#include "tree.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
-#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
#include "insn-attr.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -53,14 +49,11 @@
#include "optabs.h"
#include "target.h"
#include "common/common-target.h"
-#include "predict.h"
-#include "basic-block.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "langhooks.h"
#include "reload.h"
#include "tm-constrs.h"
-#include "df.h"
#include "params.h"
#include "errors.h"
#include "tree-pass.h"
diff --git a/gcc/config/vms/vms-c.c b/gcc/config/vms/vms-c.c
index 97ac89265c3..4b6190007d3 100644
--- a/gcc/config/vms/vms-c.c
+++ b/gcc/config/vms/vms-c.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "c-family/c-pragma.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/vms/vms.c b/gcc/config/vms/vms.c
index 5570125675f..203acbab698 100644
--- a/gcc/config/vms/vms.c
+++ b/gcc/config/vms/vms.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "vms-protos.h"
#include "target.h"
diff --git a/gcc/config/vxworks.c b/gcc/config/vxworks.c
index c24c1126ed1..e7176840620 100644
--- a/gcc/config/vxworks.c
+++ b/gcc/config/vxworks.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index cacb79eb17c..0cb100eb87e 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -21,20 +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 "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -42,8 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "recog.h"
#include "output.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
@@ -64,14 +59,10 @@ along with GCC; see the file COPYING3. If not see
#include "libfuncs.h"
#include "target.h"
#include "langhooks.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
-#include "df.h"
#include "builtins.h"
#include "dumpfile.h"
#include "hw-doloop.h"
diff --git a/gcc/convert.c b/gcc/convert.c
index c3cb0ae29aa..bff29784e18 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 2ddf710bdf8..3c165a4fecf 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -27,10 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -38,8 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "output.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -49,10 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "toplev.h"
#include "tm_p.h"
#include "coverage.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f393a232802..c345f83d9e6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,39 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * call.c: Adjust includes.
+ * class.c: Likewise.
+ * constexpr.c: Likewise.
+ * cp-array-notation.c: Likewise.
+ * cp-gimplify.c: Likewise.
+ * cp-lang.c: Likewise.
+ * cp-objcp-common.c: Likewise.
+ * cp-ubsan.c: Likewise.
+ * cvt.c: Likewise.
+ * decl.c: Likewise.
+ * decl2.c: Likewise.
+ * dump.c: Likewise.
+ * error.c: Likewise.
+ * except.c: Likewise.
+ * expr.c: Likewise.
+ * friend.c: Likewise.
+ * init.c: Likewise.
+ * lambda.c: Likewise.
+ * lex.c: Likewise.
+ * mangle.c: Likewise.
+ * method.c: Likewise.
+ * name-lookup.c: Likewise.
+ * optimize.c: Likewise.
+ * parser.c: Likewise.
+ * pt.c: Likewise.
+ * ptree.c: Likewise.
+ * repo.c: Likewise.
+ * rtti.c: Likewise.
+ * search.c: Likewise.
+ * semantics.c: Likewise.
+ * tree.c: Likewise.
+ * typeck.c: Likewise.
+ * typeck2.c: Likewise.
+
2015-07-07 Eric Botcazou <ebotcazou@adacore.com>
* decl2.c (cpp_check): Deal with IS_MOVE_CONSTRUCTOR.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 44346bf8f92..4da1072bf3d 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "trans-mem.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index b5f2c3451da..b5b5b8b5cee 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -25,10 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
+#include "tree.h"
#include "options.h"
#include "tm.h"
-#include "tree.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "attribs.h"
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index a122ded0a26..fe962fee003 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -24,9 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "varasm.h"
#include "cp-tree.h"
#include "c-family/c-objc.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index a84efd5b151..eb675e53b25 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -54,9 +54,8 @@
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
#include "diagnostic.h"
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index b95489e7816..c36d3399133 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -23,21 +23,18 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "function.h"
+#include "predict.h"
+#include "basic-block.h"
#include "tree.h"
-#include "stor-layout.h"
#include "cp-tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
+#include "stor-layout.h"
#include "c-family/c-common.h"
#include "tree-iterator.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "flags.h"
#include "splay-tree.h"
@@ -45,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-ubsan.h"
#include "cilk.h"
#include "gimplify.h"
-#include "gimple-expr.h"
/* Forward declarations. */
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 0818be4bd4c..45f41c01ac2 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "cp-tree.h"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index cb17daf831c..31f12c8b7a3 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index c0d1ffcfc43..8fab27d6553 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@@ -22,14 +22,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "predict.h"
+#include "basic-block.h"
#include "tree.h"
+#include "cp-tree.h"
+#include "gimple.h"
+#include "options.h"
#include "alloc-pool.h"
#include "output.h"
#include "toplev.h"
#include "ubsan.h"
-#include "cp-tree.h"
#include "c-family/c-common.h"
#include "c-family/c-ubsan.h"
#include "asan.h"
@@ -38,11 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "builtins.h"
#include "fold-const.h"
#include "stringpool.h"
-#include "predict.h"
-#include "tree-ssa-alias.h"
-#include "basic-block.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "lto-streamer.h"
#include "cgraph.h"
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index a2776781d98..13bc1f7766f 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "flags.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8bea2e3accf..b70a2cc1b0f 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stringpool.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index cd43e62a84c..cac0508f881 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index 2382e27b428..25a15d71e26 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "cp-tree.h"
#include "tree-dump.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 3710046bbef..b2b063842ee 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index c5d80d9ce03..f7409b5c14d 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "trans-mem.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 4270fffe509..6d2d658c7fa 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "flags.h"
#include "cp-tree.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 96655f327f1..14fc5d0b267 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "cp-tree.h"
#include "flags.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 871ddb5e686..860a277629e 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 13c12559608..dcd3bb92ca0 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -25,9 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "tm.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index d8ee8e33965..a142410a295 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index cf260c419e1..a157b2b776c 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -49,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stor-layout.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 2d5aa636a11..570f800f7c2 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 1d7afea2aca..2246fa05f60 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "print-tree.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 89750c0964c..33c67c0450a 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 8d8ec3003c2..d64b22711a5 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "cpplib.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "print-tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3cd7bac8ff0..2f336ed41da 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index 9e0073a0a19..8abdb729ced 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "print-tree.h"
#include "cp-tree.h"
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 62c35f90ddc..5155a2fa295 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index baa11879301..ed81322a577 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tm_p.h"
#include "stringpool.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 53b038e5cf4..646ff06a3ef 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "cp-tree.h"
#include "intl.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 8de2522a6d4..1277c2d6d6c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stmt.h"
#include "varasm.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 0d1112c33d0..4fcdb6c52a6 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-hasher.h"
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 2d03d758448..24866ef59bc 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index ea0ae64b4e8..eb51784f2cf 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c
index 9a366c22b92..180330d192f 100644
--- a/gcc/cppbuiltin.c
+++ b/gcc/cppbuiltin.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "version.h"
#include "flags.h"
diff --git a/gcc/cprop.c b/gcc/cprop.c
index 25968689285..86660ad3ad0 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -20,28 +20,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -57,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "obstack.h"
#include "tree-pass.h"
-#include "df.h"
#include "dbgcnt.h"
#include "target.h"
#include "cfgloop.h"
diff --git a/gcc/cse.c b/gcc/cse.c
index e01240cd2e6..728e0721ab3 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -20,25 +20,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -54,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "rtlhooks-def.h"
#include "tree-pass.h"
-#include "df.h"
#include "dbgcnt.h"
#include "rtl-iter.h"
diff --git a/gcc/cselib.c b/gcc/cselib.c
index 6c04813dcc1..fc7deab76cf 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -20,30 +20,25 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"/* FIXME: For hashing DEBUG_EXPR & friends. */
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "function.h"
#include "emit-rtl.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "alloc-pool.h"
#include "cselib.h"
-#include "predict.h"
-#include "basic-block.h"
#include "valtrack.h"
#include "params.h"
#include "alloc-pool.h"
#include "target.h"
-#include "bitmap.h"
/* A list of cselib_val structures. */
struct elt_list
diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index 7a75edfa2f1..51916a5ae9c 100644
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -25,19 +25,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "cgraph.h"
#include "data-streamer.h"
diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index e68d1fb2834..fdc36628aa2 100644
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -24,19 +24,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "cgraph.h"
#include "data-streamer.h"
diff --git a/gcc/data-streamer.c b/gcc/data-streamer.c
index 014e5f2801a..2c45eff8454 100644
--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.c
@@ -23,19 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "cgraph.h"
#include "data-streamer.h"
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 17261c17fc2..7f4a0eac11a 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -71,7 +71,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -87,7 +86,6 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "tm_p.h"
#include "debug.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "target.h"
#include "common/common-target.h"
diff --git a/gcc/dce.c b/gcc/dce.c
index 0f7d35e7182..347c490fdca 100644
--- a/gcc/dce.c
+++ b/gcc/dce.c
@@ -20,23 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "except.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "cselib.h"
#include "dce.h"
#include "valtrack.h"
diff --git a/gcc/ddg.c b/gcc/ddg.c
index ca7ebe20499..ada465725cb 100644
--- a/gcc/ddg.c
+++ b/gcc/ddg.c
@@ -22,27 +22,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
#include "except.h"
#include "recog.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "target.h"
#include "cfgloop.h"
-#include "sbitmap.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -51,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "bitmap.h"
-#include "df.h"
#include "ddg.h"
#include "rtl-iter.h"
diff --git a/gcc/debug.c b/gcc/debug.c
index d72dd460c65..3b6a6251349 100644
--- a/gcc/debug.c
+++ b/gcc/debug.c
@@ -20,7 +20,6 @@
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "debug.h"
diff --git a/gcc/df-core.c b/gcc/df-core.c
index ea1f16842a2..8d2d7a13a75 100644
--- a/gcc/df-core.c
+++ b/gcc/df-core.c
@@ -377,24 +377,16 @@ are write-only operations.
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "regs.h"
#include "alloc-pool.h"
#include "flags.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "sbitmap.h"
-#include "bitmap.h"
-#include "df.h"
#include "tree-pass.h"
#include "params.h"
#include "cfgloop.h"
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index a34578157ae..acf93dd5bcd 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -24,26 +24,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "regs.h"
#include "alloc-pool.h"
#include "flags.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "sbitmap.h"
-#include "bitmap.h"
#include "target.h"
#include "timevar.h"
-#include "df.h"
#include "except.h"
#include "dce.h"
#include "valtrack.h"
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index 22942407f26..010a4b85497 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -24,28 +24,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
#include "alias.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "regs.h"
#include "alloc-pool.h"
#include "flags.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "sbitmap.h"
-#include "bitmap.h"
#include "dumpfile.h"
-#include "tree.h"
#include "target.h"
-#include "df.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
diff --git a/gcc/df.h b/gcc/df.h
index 7023c9a98e6..cea12a33f13 100644
--- a/gcc/df.h
+++ b/gcc/df.h
@@ -25,13 +25,7 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_DF_H
#define GCC_DF_H
-#include "bitmap.h"
#include "regset.h"
-#include "sbitmap.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "alloc-pool.h"
#include "timevar.h"
diff --git a/gcc/dfp.c b/gcc/dfp.c
index 7c9a86f81a7..ceb43d1799e 100644
--- a/gcc/dfp.c
+++ b/gcc/dfp.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tm_p.h"
#include "dfp.h"
diff --git a/gcc/dojump.c b/gcc/dojump.c
index 15b1ebf93cb..f580d41f17d 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -20,16 +20,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "insn-config.h"
#include "insn-attr.h"
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
@@ -44,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "langhooks.h"
-#include "predict.h"
-#include "basic-block.h"
#include "tm_p.h"
#include "target.h"
diff --git a/gcc/dominance.c b/gcc/dominance.c
index fb61596a82b..1c692c80280 100644
--- a/gcc/dominance.c
+++ b/gcc/dominance.c
@@ -35,22 +35,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
-#include "hard-reg-set.h"
#include "obstack.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "diagnostic-core.h"
#include "alloc-pool.h"
#include "et-forest.h"
#include "timevar.h"
#include "graphds.h"
-#include "bitmap.h"
/* We name our nodes with integers, beginning with 1. Zero is reserved for
'undefined' or 'end of list'. The name of each node is given by the dfs
diff --git a/gcc/domwalk.c b/gcc/domwalk.c
index 65113533d33..bbf9ff8786f 100644
--- a/gcc/domwalk.c
+++ b/gcc/domwalk.c
@@ -21,16 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "predict.h"
+#include "backend.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "domwalk.h"
-#include "sbitmap.h"
/* This file implements a generic walker for dominator trees.
diff --git a/gcc/double-int.c b/gcc/double-int.c
index 7ffcac25a75..8785d7b01b6 100644
--- a/gcc/double-int.c
+++ b/gcc/double-int.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h" /* For BITS_PER_UNIT and *_BIG_ENDIAN. */
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
static int add_double_with_sign (unsigned HOST_WIDE_INT, HOST_WIDE_INT,
diff --git a/gcc/dse.c b/gcc/dse.c
index 0a4ba8f8569..aaf8d7320c3 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -25,29 +25,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "regset.h"
#include "flags.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "cselib.h"
#include "tree-pass.h"
#include "alloc-pool.h"
#include "insn-config.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -62,10 +56,7 @@ along with GCC; see the file COPYING3. If not see
#include "dbgcnt.h"
#include "target.h"
#include "params.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-ssa.h"
#include "rtl-iter.h"
#include "cfgcleanup.h"
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index d5f601f139d..79dd810c05d 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "gimple-pretty-print.h"
#include "context.h"
diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index 7cd997a8948..9f3c4b1c0c0 100644
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index b567b23f938..138bae045dc 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -25,10 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "cfgbuild.h"
#include "dwarf2.h"
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 9d4b39ec00c..f9e14fc16e3 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -61,13 +61,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "varasm.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "emit-rtl.h"
#include "version.h"
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 80c0adb1a35..200bb74fc9c 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -34,19 +34,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "tree-eh.h"
#include "tm_p.h"
#include "flags.h"
@@ -61,10 +57,8 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "regs.h"
#include "recog.h"
-#include "bitmap.h"
#include "debug.h"
#include "langhooks.h"
-#include "df.h"
#include "params.h"
#include "target.h"
#include "builtins.h"
diff --git a/gcc/et-forest.c b/gcc/et-forest.c
index a3f60d33823..a1a02f21004 100644
--- a/gcc/et-forest.c
+++ b/gcc/et-forest.c
@@ -32,10 +32,8 @@ License along with libiberty; see the file COPYING3. If not see
#undef DEBUG_ET
#ifdef DEBUG_ET
-#include "tm.h"
+#include "backend.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
#endif
/* The occurrence of a node in the et tree. */
diff --git a/gcc/except.c b/gcc/except.c
index 399034aab05..d94cdabf25d 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -112,17 +112,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "insn-codes.h"
#include "optabs.h"
#include "insn-config.h"
@@ -146,11 +143,7 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "tree-pretty-print.h"
diff --git a/gcc/explow.c b/gcc/explow.c
index cfd8dc579cb..bd342c106f1 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -25,13 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "tm_p.h"
#include "flags.h"
#include "except.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 69c48a6b8b4..6fb5807f6e9 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -22,19 +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 "diagnostic-core.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
#include "flags.h"
#include "insn-config.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -47,9 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "recog.h"
#include "langhooks.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "target.h"
struct target_expmed default_target_expmed;
diff --git a/gcc/expr.c b/gcc/expr.c
index 8c2b8bf080b..0fd01fbf4ea 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -20,21 +20,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "df.h"
+#include "ssa.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "stor-layout.h"
#include "attribs.h"
#include "varasm.h"
#include "flags.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "except.h"
-#include "function.h"
#include "insn-config.h"
#include "insn-attr.h"
#include "expmed.h"
@@ -56,21 +55,11 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "tm_p.h"
#include "tree-iterator.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
-#include "tree-ssanames.h"
#include "target.h"
#include "common/common-target.h"
#include "timevar.h"
-#include "df.h"
#include "diagnostic.h"
#include "tree-ssa-live.h"
#include "tree-outof-ssa.h"
diff --git a/gcc/final.c b/gcc/final.c
index fe2d6adb3ba..cb83964d05e 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -45,13 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "varasm.h"
-#include "hard-reg-set.h"
#include "rtl.h"
+#include "df.h"
+#include "alias.h"
+#include "varasm.h"
#include "tm_p.h"
#include "regs.h"
#include "insn-config.h"
@@ -61,16 +60,11 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "output.h"
#include "except.h"
-#include "function.h"
#include "rtl-error.h"
#include "toplev.h" /* exact_log2, floor_log2 */
#include "reload.h"
#include "intl.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "target.h"
#include "targhooks.h"
#include "debug.h"
@@ -85,7 +79,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "tree-ssa.h"
#include "coverage.h"
-#include "df.h"
#include "cfgloop.h"
#include "params.h"
#include "tree-pretty-print.h" /* for dump_function_header */
diff --git a/gcc/fixed-value.c b/gcc/fixed-value.c
index 151b6a10ba1..39bdebea09b 100644
--- a/gcc/fixed-value.c
+++ b/gcc/fixed-value.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "diagnostic-core.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 23ef423df78..a81807ed220 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -43,19 +43,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
#include "tree-iterator.h"
#include "realmpfr.h"
-#include "rtl.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -70,13 +68,8 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "langhooks.h"
#include "md5.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "tree-dfa.h"
#include "builtins.h"
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 75bce2f6e53..295229a52cb 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,26 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * convert.c: Adjust includes.
+ * cpp.c: Likewise.
+ * decl.c: Likewise.
+ * f95-lang.c: Likewise.
+ * iresolve.c: Likewise.
+ * match.c: Likewise.
+ * module.c: Likewise.
+ * options.c: Likewise.
+ * target-memory.c: Likewise.
+ * trans-array.c: Likewise.
+ * trans-common.c: Likewise.
+ * trans-const.c: Likewise.
+ * trans-decl.c: Likewise.
+ * trans-expr.c: Likewise.
+ * trans-intrinsic.c: Likewise.
+ * trans-io.c: Likewise.
+ * trans-openmp.c: Likewise.
+ * trans-stmt.c: Likewise.
+ * trans-types.c: Likewise.
+ * trans.c: Likewise.
+
2015-07-07 Andre Vehreschild <vehre@gmx.de>
PR fortran/66578
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index dfef05b8d7f..21fc36fc747 100644
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -26,9 +26,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "convert.h"
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index 363763f0962..daffc2069bf 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "version.h"
#include "flags.h"
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 04dc7f4d13f..8ab4d79fb9e 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "constructor.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 1d960941854..f73bc08aba6 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -29,9 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "flags.h"
#include "langhooks.h"
#include "langhooks-def.h"
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index 9dab49e5f48..cf79256b14e 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -30,9 +30,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "gfortran.h"
#include "intrinsic.h"
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index c66addb180e..14035319dd5 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "match.h"
#include "parse.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 24662f464de..ebfb89bb150 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -74,9 +74,8 @@ along with GCC; see the file COPYING3. If not see
#include "constructor.h"
#include "cpp.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "scanner.h"
#include <zlib.h>
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 9c30cf3a9e5..e367e157e14 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "flags.h"
#include "intl.h"
#include "opts.h"
diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index ddb6b4f3897..9895bc315f1 100644
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index afea5eca7d0..a520f03ddf7 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -80,9 +80,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "gimple-expr.h"
#include "diagnostic-core.h" /* For internal_error/fatal_error. */
diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c
index cad846a08dd..7f4bfe58c69 100644
--- a/gcc/fortran/trans-common.c
+++ b/gcc/fortran/trans-common.c
@@ -100,7 +100,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 5673b983358..1d1e9634633 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -25,9 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "realmpfr.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index aec20189528..f95ca167c2f 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "gfortran.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 195f7a4f536..adc5c0aabe8 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -26,9 +26,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "diagnostic-core.h" /* For fatal_error. */
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 11554818e7a..66bc72afbab 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h" /* For UNITS_PER_WORD. */
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index db0f6d941a2..7afa726c961 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index ca7e2503c40..294b6ef731d 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "gimple-expr.h"
#include "gimplify.h" /* For create_tmp_var_raw. */
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index a6ab07a8204..c5eb04c7ed7 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -24,9 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "gfortran.h"
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index db628a5dc84..61f58273f13 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
FLOAT_TYPE_SIZE, DOUBLE_TYPE_SIZE and
LONG_DOUBLE_TYPE_SIZE. */
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index 9e85b37232b..aece77ab5cd 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "gimple-expr.h" /* For create_tmp_var_raw. */
#include "stringpool.h"
diff --git a/gcc/function.c b/gcc/function.c
index ea0d6e87b62..972cdc87db0 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -34,20 +34,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "rtl-error.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "stringpool.h"
#include "flags.h"
#include "except.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -69,15 +67,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "gimplify.h"
#include "tree-pass.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
#include "params.h"
#include "bb-reorder.h"
#include "shrink-wrap.h"
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index b62ad3f2029..4cfbf24db80 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -21,25 +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 "backend.h"
+#include "rtl.h"
+#include "df.h"
#include "diagnostic-core.h"
#include "sparseset.h"
-#include "rtl.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
#include "flags.h"
#include "obstack.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
#include "target.h"
#include "cfgloop.h"
#include "tree-pass.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index 1eb0e5b8984..f04ef70dd26 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -27,12 +27,8 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
@@ -42,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-ref.h"
#include "alias.h"
#include "flags.h"
-#include "symtab.h"
#include "tree-core.h"
#include "fold-const.h"
#include "tree-check.h"
diff --git a/gcc/gcse-common.c b/gcc/gcse-common.c
index c9f7329db29..5bc4a4ef2a2 100644
--- a/gcc/gcse-common.c
+++ b/gcc/gcse-common.c
@@ -23,11 +23,8 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
-#include "predict.h"
-#include "bitmap.h"
-#include "basic-block.h"
#include "df.h"
#include "gcse-common.h"
diff --git a/gcc/gcse.c b/gcc/gcse.c
index bcd7c8fb694..3ecad6ed250 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -135,29 +135,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "hard-reg-set.h"
-#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "tm_p.h"
#include "regs.h"
#include "ira.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -173,7 +167,6 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "obstack.h"
#include "tree-pass.h"
-#include "df.h"
#include "dbgcnt.h"
#include "target.h"
#include "gcse.h"
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 85ec738a9a4..253a6beff6d 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -5103,16 +5103,14 @@ write_header (FILE *outf)
fprintf (outf, "#include \"config.h\"\n");
fprintf (outf, "#include \"system.h\"\n");
fprintf (outf, "#include \"coretypes.h\"\n");
- fprintf (outf, "#include \"tm.h\"\n");
- fprintf (outf, "#include \"input.h\"\n");
+ fprintf (outf, "#include \"backend.h\"\n");
+ fprintf (outf, "#include \"tree.h\"\n");
+ fprintf (outf, "#include \"rtl.h\"\n");
fprintf (outf, "#include \"alias.h\"\n");
- fprintf (outf, "#include \"symtab.h\"\n");
fprintf (outf, "#include \"options.h\"\n");
- fprintf (outf, "#include \"tree.h\"\n");
fprintf (outf, "#include \"varasm.h\"\n");
fprintf (outf, "#include \"stor-layout.h\"\n");
fprintf (outf, "#include \"calls.h\"\n");
- fprintf (outf, "#include \"rtl.h\"\n");
fprintf (outf, "#include \"insn-attr.h\"\n");
fprintf (outf, "#include \"tm_p.h\"\n");
fprintf (outf, "#include \"insn-config.h\"\n");
@@ -5122,9 +5120,7 @@ write_header (FILE *outf)
fprintf (outf, "#include \"output.h\"\n");
fprintf (outf, "#include \"toplev.h\"\n");
fprintf (outf, "#include \"flags.h\"\n");
- fprintf (outf, "#include \"function.h\"\n");
fprintf (outf, "#include \"emit-rtl.h\"\n");
- fprintf (outf, "#include \"predict.h\"\n");
fprintf (outf, "\n");
fprintf (outf, "#define operands recog_data.operand\n\n");
}
diff --git a/gcc/genautomata.c b/gcc/genautomata.c
index 68933fe0eba..e1aeae5f2eb 100644
--- a/gcc/genautomata.c
+++ b/gcc/genautomata.c
@@ -9673,9 +9673,7 @@ main (int argc, char **argv)
"#include \"system.h\"\n"
"#include \"coretypes.h\"\n"
"#include \"tm.h\"\n"
- "#include \"input.h\"\n"
"#include \"alias.h\"\n"
- "#include \"symtab.h\"\n"
"#include \"tree.h\"\n"
"#include \"varasm.h\"\n"
"#include \"stor-layout.h\"\n"
diff --git a/gcc/genconditions.c b/gcc/genconditions.c
index 89d273898a6..73c93777773 100644
--- a/gcc/genconditions.c
+++ b/gcc/genconditions.c
@@ -87,6 +87,8 @@ write_header (void)
#include \"hard-reg-set.h\"\n\
#include \"predict.h\"\n\
#include \"basic-block.h\"\n\
+#include \"bitmap.h\"\n\
+#include \"df.h\"\n\
#include \"resource.h\"\n\
#include \"diagnostic-core.h\"\n\
#include \"reload.h\"\n\
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 4ee07a0f3bc..7409a88b6b6 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -744,18 +744,14 @@ from the machine description file `md'. */\n\n");
printf ("#include \"config.h\"\n");
printf ("#include \"system.h\"\n");
printf ("#include \"coretypes.h\"\n");
- printf ("#include \"tm.h\"\n");
- printf ("#include \"input.h\"\n");
- printf ("#include \"alias.h\"\n");
- printf ("#include \"symtab.h\"\n");
+ printf ("#include \"backend.h\"\n");
printf ("#include \"tree.h\"\n");
+ printf ("#include \"rtl.h\"\n");
+ printf ("#include \"alias.h\"\n");
printf ("#include \"varasm.h\"\n");
printf ("#include \"stor-layout.h\"\n");
printf ("#include \"calls.h\"\n");
- printf ("#include \"rtl.h\"\n");
printf ("#include \"tm_p.h\"\n");
- printf ("#include \"hard-reg-set.h\"\n");
- printf ("#include \"function.h\"\n");
printf ("#include \"flags.h\"\n");
printf ("#include \"insn-config.h\"\n");
printf ("#include \"expmed.h\"\n");
@@ -769,15 +765,13 @@ from the machine description file `md'. */\n\n");
printf ("#include \"dfp.h\"\n");
printf ("#include \"output.h\"\n");
printf ("#include \"recog.h\"\n");
- printf ("#include \"predict.h\"\n");
- printf ("#include \"basic-block.h\"\n");
+ printf ("#include \"df.h\"\n");
printf ("#include \"resource.h\"\n");
printf ("#include \"reload.h\"\n");
printf ("#include \"diagnostic-core.h\"\n");
printf ("#include \"regs.h\"\n");
printf ("#include \"tm-constrs.h\"\n");
printf ("#include \"ggc.h\"\n");
- printf ("#include \"basic-block.h\"\n");
printf ("#include \"dumpfile.h\"\n");
printf ("#include \"target.h\"\n\n");
printf ("#define FAIL return (end_sequence (), _val)\n");
diff --git a/gcc/generic-match-head.c b/gcc/generic-match-head.c
index ea4a2961054..66615a4fab4 100644
--- a/gcc/generic-match-head.c
+++ b/gcc/generic-match-head.c
@@ -21,27 +21,18 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "stor-layout.h"
#include "flags.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
-#include "tree-ssanames.h"
#include "gimple-fold.h"
#include "gimple-iterator.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -53,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tree-dfa.h"
#include "builtins.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "dumpfile.h"
#include "generic-match.h"
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 137e0ffdb96..e49b7c84177 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -1710,21 +1710,13 @@ open_base_files (void)
{
/* The order of files here matters very much. */
static const char *const ifiles[] = {
- "config.h", "system.h", "coretypes.h", "tm.h", "insn-codes.h",
- "splay-tree.h", "obstack.h", "bitmap.h", "input.h",
- "alias.h", "symtab.h", "options.h",
- "tree.h", "fold-const.h", "rtl.h",
- "hard-reg-set.h", "predict.h",
- "function.h", "insn-config.h", "flags.h",
- "tree.h", "expmed.h", "dojump.h",
+ "config.h", "system.h", "coretypes.h", "backend.h", "tree.h",
+ "rtl.h", "gimple.h", "fold-const.h", "insn-codes.h", "splay-tree.h",
+ "alias.h", "insn-config.h", "flags.h", "expmed.h", "dojump.h",
"explow.h", "calls.h", "emit-rtl.h", "varasm.h", "stmt.h",
- "expr.h", "alloc-pool.h",
- "basic-block.h", "cselib.h", "insn-addr.h",
- "optabs.h", "libfuncs.h", "debug.h",
- "dominance.h", "cfg.h", "basic-block.h",
- "tree-ssa-alias.h", "internal-fn.h", "gimple-fold.h", "tree-eh.h",
- "gimple-expr.h", "is-a.h",
- "gimple.h", "gimple-iterator.h", "gimple-ssa.h", "tree-cfg.h",
+ "expr.h", "alloc-pool.h", "cselib.h", "insn-addr.h", "optabs.h",
+ "libfuncs.h", "debug.h", "internal-fn.h", "gimple-fold.h", "tree-eh.h",
+ "gimple-iterator.h", "gimple-ssa.h", "tree-cfg.h",
"tree-phinodes.h", "ssa-iterators.h", "stringpool.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",
diff --git a/gcc/genopinit.c b/gcc/genopinit.c
index 7fa59eb89aa..525317708fe 100644
--- a/gcc/genopinit.c
+++ b/gcc/genopinit.c
@@ -464,31 +464,16 @@ main (int argc, char **argv)
"#include \"config.h\"\n"
"#include \"system.h\"\n"
"#include \"coretypes.h\"\n"
- "#include \"tm.h\"\n"
- "#include \"hash-set.h\"\n"
- "#include \"machmode.h\"\n"
- "#include \"vec.h\"\n"
- "#include \"double-int.h\"\n"
- "#include \"input.h\"\n"
- "#include \"alias.h\"\n"
- "#include \"symtab.h\"\n"
- "#include \"wide-int.h\"\n"
- "#include \"inchash.h\"\n"
+ "#include \"backend.h\"\n"
"#include \"tree.h\"\n"
+ "#include \"rtl.h\"\n"
+ "#include \"alias.h\"\n"
"#include \"varasm.h\"\n"
"#include \"stor-layout.h\"\n"
"#include \"calls.h\"\n"
- "#include \"rtl.h\"\n"
- "#include \"predict.h\"\n"
"#include \"tm_p.h\"\n"
"#include \"flags.h\"\n"
"#include \"insn-config.h\"\n"
- "#include \"hashtab.h\"\n"
- "#include \"hard-reg-set.h\"\n"
- "#include \"function.h\"\n"
- "#include \"statistics.h\"\n"
- "#include \"real.h\"\n"
- "#include \"fixed-value.h\"\n"
"#include \"expmed.h\"\n"
"#include \"dojump.h\"\n"
"#include \"explow.h\"\n"
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index 2144b8e0381..cb78448d0b0 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -226,29 +226,14 @@ output_prologue (void)
printf ("#include \"config.h\"\n");
printf ("#include \"system.h\"\n");
printf ("#include \"coretypes.h\"\n");
- printf ("#include \"tm.h\"\n");
+ printf ("#include \"backend.h\"\n");
+ printf ("#include \"tree.h\"\n");
+ printf ("#include \"rtl.h\"\n");
printf ("#include \"flags.h\"\n");
- printf ("#include \"ggc.h\"\n");
- printf ("#include \"hash-set.h\"\n");
- printf ("#include \"machmode.h\"\n");
- printf ("#include \"vec.h\"\n");
- printf ("#include \"double-int.h\"\n");
- printf ("#include \"input.h\"\n");
printf ("#include \"alias.h\"\n");
- printf ("#include \"symtab.h\"\n");
- printf ("#include \"wide-int.h\"\n");
- printf ("#include \"inchash.h\"\n");
- printf ("#include \"tree.h\"\n");
printf ("#include \"varasm.h\"\n");
printf ("#include \"stor-layout.h\"\n");
printf ("#include \"calls.h\"\n");
- printf ("#include \"rtl.h\"\n");
- printf ("#include \"hashtab.h\"\n");
- printf ("#include \"hard-reg-set.h\"\n");
- printf ("#include \"function.h\"\n");
- printf ("#include \"statistics.h\"\n");
- printf ("#include \"real.h\"\n");
- printf ("#include \"fixed-value.h\"\n");
printf ("#include \"insn-config.h\"\n");
printf ("#include \"expmed.h\"\n");
printf ("#include \"dojump.h\"\n");
@@ -266,7 +251,6 @@ output_prologue (void)
printf ("#include \"output.h\"\n");
printf ("#include \"target.h\"\n");
printf ("#include \"tm-constrs.h\"\n");
- printf ("#include \"predict.h\"\n");
}
static void
diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index b914e85f863..18d8b5e7885 100644
--- a/gcc/genpeep.c
+++ b/gcc/genpeep.c
@@ -363,28 +363,19 @@ from the machine description file `md'. */\n\n");
printf ("#include \"config.h\"\n");
printf ("#include \"system.h\"\n");
printf ("#include \"coretypes.h\"\n");
- printf ("#include \"tm.h\"\n");
+ printf ("#include \"backend.h\"\n");
+ printf ("#include \"tree.h\"\n");
+ printf ("#include \"rtl.h\"\n");
printf ("#include \"insn-config.h\"\n");
- printf ("#include \"hash-set.h\"\n");
- printf ("#include \"machmode.h\"\n");
- printf ("#include \"vec.h\"\n");
- printf ("#include \"double-int.h\"\n");
- printf ("#include \"input.h\"\n");
printf ("#include \"alias.h\"\n");
- printf ("#include \"symtab.h\"\n");
- printf ("#include \"wide-int.h\"\n");
- printf ("#include \"inchash.h\"\n");
- printf ("#include \"tree.h\"\n");
printf ("#include \"varasm.h\"\n");
printf ("#include \"stor-layout.h\"\n");
printf ("#include \"calls.h\"\n");
- printf ("#include \"rtl.h\"\n");
printf ("#include \"tm_p.h\"\n");
printf ("#include \"regs.h\"\n");
printf ("#include \"output.h\"\n");
printf ("#include \"recog.h\"\n");
printf ("#include \"except.h\"\n");
- printf ("#include \"function.h\"\n");
printf ("#include \"diagnostic-core.h\"\n");
printf ("#include \"flags.h\"\n");
printf ("#include \"tm-constrs.h\"\n\n");
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index 9a4c6a61539..4b553540565 100644
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -1523,37 +1523,19 @@ write_insn_preds_c (void)
#include \"config.h\"\n\
#include \"system.h\"\n\
#include \"coretypes.h\"\n\
-#include \"tm.h\"\n\
+#include \"backend.h\"\n\
+#include \"tree.h\"\n\
#include \"rtl.h\"\n\
-#include \"hash-set.h\"\n\
-#include \"machmode.h\"\n\
-#include \"hash-map.h\"\n\
-#include \"vec.h\"\n\
-#include \"double-int.h\"\n\
-#include \"input.h\"\n\
#include \"alias.h\"\n\
-#include \"symtab.h\"\n\
-#include \"wide-int.h\"\n\
-#include \"inchash.h\"\n\
-#include \"tree.h\"\n\
#include \"varasm.h\"\n\
#include \"stor-layout.h\"\n\
#include \"calls.h\"\n\
#include \"tm_p.h\"\n\
-#include \"hashtab.h\"\n\
-#include \"hash-set.h\"\n\
-#include \"vec.h\"\n\
-#include \"machmode.h\"\n\
-#include \"hard-reg-set.h\"\n\
-#include \"input.h\"\n\
-#include \"function.h\"\n\
#include \"insn-config.h\"\n\
#include \"recog.h\"\n\
#include \"output.h\"\n\
#include \"flags.h\"\n\
-#include \"hard-reg-set.h\"\n\
-#include \"predict.h\"\n\
-#include \"basic-block.h\"\n\
+#include \"df.h\"\n\
#include \"resource.h\"\n\
#include \"diagnostic-core.h\"\n\
#include \"reload.h\"\n\
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index b2e233571b9..96656f8fe5a 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -4179,30 +4179,20 @@ write_header (void)
#include \"config.h\"\n\
#include \"system.h\"\n\
#include \"coretypes.h\"\n\
-#include \"tm.h\"\n\
+#include \"backend.h\"\n\
#include \"rtl.h\"\n\
#include \"tm_p.h\"\n\
-#include \"hashtab.h\"\n\
-#include \"hash-set.h\"\n\
-#include \"vec.h\"\n\
-#include \"machmode.h\"\n\
-#include \"hard-reg-set.h\"\n\
-#include \"input.h\"\n\
-#include \"function.h\"\n\
#include \"emit-rtl.h\"\n\
#include \"insn-config.h\"\n\
#include \"recog.h\"\n\
#include \"output.h\"\n\
#include \"flags.h\"\n\
-#include \"hard-reg-set.h\"\n\
-#include \"predict.h\"\n\
-#include \"basic-block.h\"\n\
+#include \"df.h\"\n\
#include \"resource.h\"\n\
#include \"diagnostic-core.h\"\n\
#include \"reload.h\"\n\
#include \"regs.h\"\n\
#include \"tm-constrs.h\"\n\
-#include \"predict.h\"\n\
\n");
puts ("\n\
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 0f07000e3e1..4002845449c 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -20,9 +20,8 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "rtl.h"
#include "tm_p.h"
@@ -31,13 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "ggc-internal.h"
#include "timevar.h"
#include "params.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cgraph.h"
#include "cfgloop.h"
#include "plugin.h"
-#include "predict.h"
-#include "basic-block.h"
/* Prefer MAP_ANON(YMOUS) to /dev/zero, since we don't need to keep a
file open. Prefer either to valloc. */
diff --git a/gcc/gimple-builder.c b/gcc/gimple-builder.c
index f2be20ce436..90e6941799b 100644
--- a/gcc/gimple-builder.c
+++ b/gcc/gimple-builder.c
@@ -21,20 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "tree-ssanames.h"
diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index 5f05d9361f0..b558d90dd24 100644
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -22,25 +22,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "alias.h"
+#include "fold-const.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "stringpool.h"
+#include "gimple-ssa.h"
#include "gimplify.h"
#include "stor-layout.h"
#include "demangle.h"
-#include "gimple-ssa.h"
/* ----- Type related ----- */
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index ee9abe710cc..7e8bd0d5a92 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -21,15 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "stringpool.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
+#include "fold-const.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -42,19 +40,11 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "stor-layout.h"
#include "dumpfile.h"
-#include "bitmap.h"
-#include "predict.h"
#include "dominance.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-dfa.h"
#include "tree-ssa.h"
@@ -71,8 +61,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "tree-eh.h"
#include "gimple-match.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
/* Return true when DECL can be referenced from current unit.
FROM_DECL (if non-null) specify constructor of variable DECL was taken from.
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index 3781b462237..7b22a342abe 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -21,28 +21,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "ssa.h"
+#include "alias.h"
+#include "fold-const.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-ssa.h"
#include "value-prof.h"
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index bd858ce8cb3..d4697e21ac6 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -21,21 +21,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
#include "fold-const.h"
#include "tree-nested.h"
#include "calls.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-iterator.h"
#include "tree-inline.h"
diff --git a/gcc/gimple-match-head.c b/gcc/gimple-match-head.c
index 7b1f1ace8f9..875b7246575 100644
--- a/gcc/gimple-match-head.c
+++ b/gcc/gimple-match-head.c
@@ -20,28 +20,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "alias.h"
-#include "symtab.h"
#include "options.h"
-#include "tree.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "stor-layout.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
-#include "tree-ssanames.h"
#include "gimple-fold.h"
#include "gimple-iterator.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -53,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tree-dfa.h"
#include "builtins.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "dumpfile.h"
#include "gimple-match.h"
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index e8e3a6d0494..8c230cc47eb 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -22,29 +22,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-ssanames.h"
#include "dumpfile.h" /* for dump_flags */
#include "value-prof.h"
#include "trans-mem.h"
diff --git a/gcc/gimple-ssa-isolate-paths.c b/gcc/gimple-ssa-isolate-paths.c
index 2633736bb2b..8b98d76e510 100644
--- a/gcc/gimple-ssa-isolate-paths.c
+++ b/gcc/gimple-ssa-isolate-paths.c
@@ -23,31 +23,18 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "flags.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "tree-ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "gimple-ssa.h"
-#include "tree-ssa-operands.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "cfgloop.h"
#include "tree-pass.h"
#include "tree-cfg.h"
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index 1d666676c31..4bc72259aa6 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -37,25 +37,17 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "stor-layout.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -69,12 +61,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "cfgloop.h"
#include "gimple-pretty-print.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "domwalk.h"
#include "params.h"
#include "tree-ssa-address.h"
diff --git a/gcc/gimple-ssa.h b/gcc/gimple-ssa.h
index 25dde083158..53cb46c1eae 100644
--- a/gcc/gimple-ssa.h
+++ b/gcc/gimple-ssa.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GIMPLE_SSA_H
#define GCC_GIMPLE_SSA_H
-#include "tree-hasher.h"
#include "tree-ssa-operands.h"
/* This structure is used to map a gimple statement to a label,
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index 6081c5b12b7..33a5148011e 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -24,27 +24,16 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "cgraph.h"
#include "data-streamer.h"
#include "tree-streamer.h"
diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c
index b1389fc3f01..aa50e553753 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@@ -23,20 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "cgraph.h"
diff --git a/gcc/gimple-streamer.h b/gcc/gimple-streamer.h
index 63a6a3c5d34..d77f33d1061 100644
--- a/gcc/gimple-streamer.h
+++ b/gcc/gimple-streamer.h
@@ -22,9 +22,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GIMPLE_STREAMER_H
#define GCC_GIMPLE_STREAMER_H
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "lto-streamer.h"
/* In gimple-streamer-in.c */
diff --git a/gcc/gimple-walk.c b/gcc/gimple-walk.c
index 05ea179e09f..f8add6c9069 100644
--- a/gcc/gimple-walk.c
+++ b/gcc/gimple-walk.c
@@ -22,18 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "predict.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "gimple-expr.h"
-#include "tree-ssa-alias.h"
-#include "basic-block.h"
+#include "alias.h"
#include "fold-const.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "stmt.h"
diff --git a/gcc/gimple.c b/gcc/gimple.c
index b32c6b5ada4..3d07857f9e2 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -22,29 +22,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
#include "target.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "calls.h"
#include "stmt.h"
#include "stor-layout.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple.h"
#include "gimplify.h"
#include "diagnostic.h"
#include "value-prof.h"
@@ -52,12 +44,8 @@ along with GCC; see the file COPYING3. If not see
#include "alias.h"
#include "demangle.h"
#include "langhooks.h"
-#include "bitmap.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "lto-streamer.h"
#include "cgraph.h"
-#include "gimple-ssa.h"
/* All the tuples have their operand vector (if present) at the very bottom
diff --git a/gcc/gimple.h b/gcc/gimple.h
index 253f4385dec..bcf0acff2bb 100644
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -22,6 +22,9 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GIMPLE_H
#define GCC_GIMPLE_H
+#include "tree-ssa-alias.h"
+#include "gimple-expr.h"
+
typedef gimple gimple_seq_node;
enum gimple_code {
diff --git a/gcc/gimplify-me.c b/gcc/gimplify-me.c
index caad2fc6954..f56bdbb78d6 100644
--- a/gcc/gimplify-me.c
+++ b/gcc/gimplify-me.c
@@ -25,28 +25,20 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "stmt.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
/* Expand EXPR to list of gimple statements STMTS. GIMPLE_TEST_F specifies
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 74b2dcd25d2..c621305fe6b 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -24,14 +24,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -42,28 +41,19 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "stringpool.h"
#include "stor-layout.h"
#include "print-tree.h"
#include "tree-iterator.h"
#include "tree-inline.h"
#include "tree-pretty-print.h"
#include "langhooks.h"
-#include "bitmap.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-ssanames.h"
#include "tree-ssa.h"
#include "diagnostic-core.h"
#include "target.h"
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index b775b20d903..d7638ee47d9 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * go-backend.c: Adjust includes.
+ * go-gcc.cc: Likewise.
+ * go-lang.c: Likewise.
+
2015-06-25 Andrew MacLeod <amacleod@redhat.com>
* go-gcc.cc: Remove ipa-ref.h and plugin-api.h from include list.
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index ad25565ba5f..b6dcc25d0aa 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "simple-object.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
#include "tm_p.h"
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 41bcdf8c0ff..6f274fcd8b4 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -26,10 +26,9 @@
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
+#include "tree.h"
#include "options.h"
#include "inchash.h"
-#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index ee5b6714489..ad673bcc350 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "opts.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "tm.h"
#include "hard-reg-set.h"
diff --git a/gcc/godump.c b/gcc/godump.c
index 783f3d4cd98..ea177bde3c7 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -32,9 +32,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "obstack.h"
#include "debug.h"
#include "wide-int-print.h"
diff --git a/gcc/graph.c b/gcc/graph.c
index f6bdfa7b851..69dfe97d1dd 100644
--- a/gcc/graph.c
+++ b/gcc/graph.c
@@ -23,15 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "diagnostic-core.h" /* for fatal_error */
-#include "sbitmap.h"
-#include "predict.h"
-#include "tm.h"
+#include "backend.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "cfgloop.h"
#include "graph.h"
#include "dumpfile.h"
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index c47b7be2ef5..297c6376232 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -36,20 +36,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
+#include "options.h"
+#include "fold-const.h"
#include "dominance.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop.h"
#include "dumpfile.h"
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index ececaf9df83..1ccb8ab7585 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -35,21 +35,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop.h"
#include "tree-pass.h"
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index 35c9001e0e8..0ddfae92f23 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -47,21 +47,13 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop.h"
#include "dumpfile.h"
diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 60b36dd72b2..1980a1b342e 100644
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -42,21 +42,13 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop.h"
#include "tree-pass.h"
diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index 717f1cbdc87..b87e645dd57 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -36,21 +36,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop.h"
#include "dumpfile.h"
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index 88daa3a9cec..9aecc49464d 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -47,21 +47,13 @@ extern "C" {
#include "coretypes.h"
#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop.h"
#include "dumpfile.h"
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 3397fba0367..007368bf2ab 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -33,25 +33,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#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"
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index e9d3a05a5aa..91955929344 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -44,30 +44,18 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
@@ -82,7 +70,6 @@ extern "C" {
#include "tree-ssa-propagate.h"
#ifdef HAVE_isl
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/graphite.c b/gcc/graphite.c
index 8af8c759dcc..d633da60200 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -48,21 +48,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa-loop.h"
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index e685cc8a1af..b197c85b96e 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -125,24 +125,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
-#include "hard-reg-set.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
#include "regs.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
#include "except.h"
#include "recog.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "target.h"
#include "common/common-target.h"
diff --git a/gcc/hw-doloop.c b/gcc/hw-doloop.c
index 2341bc6576d..eadbcd6d51a 100644
--- a/gcc/hw-doloop.c
+++ b/gcc/hw-doloop.c
@@ -21,14 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "flags.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -39,13 +37,8 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "regs.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "tm_p.h"
-#include "df.h"
#include "cfgloop.h"
#include "recog.h"
#include "target.h"
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index f796799fc3d..a9ec6a39110 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -20,26 +20,20 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+
#include "regs.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
#include "except.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -56,7 +50,6 @@
#include "cfgloop.h"
#include "target.h"
#include "tree-pass.h"
-#include "df.h"
#include "dbgcnt.h"
#include "shrink-wrap.h"
#include "ifcvt.h"
diff --git a/gcc/init-regs.c b/gcc/init-regs.c
index 5d7d4cc2e02..68fb7fe5d05 100644
--- a/gcc/init-regs.c
+++ b/gcc/init-regs.c
@@ -20,14 +20,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -39,11 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tree-pass.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "df.h"
/* Check all of the uses of pseudo variables. If any use that is MUST
uninitialized, add a store of 0 immediately before it. For
diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c
index c398c125bcf..5b0a44d3d79 100644
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.c
@@ -21,16 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "options.h"
#include "fold-const.h"
#include "internal-fn.h"
#include "stor-layout.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -43,13 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "ubsan.h"
#include "target.h"
#include "stringpool.h"
diff --git a/gcc/ipa-chkp.c b/gcc/ipa-chkp.c
index acb89bed65f..7358d30c195 100644
--- a/gcc/ipa-chkp.c
+++ b/gcc/ipa-chkp.c
@@ -22,23 +22,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tree-pass.h"
#include "stringpool.h"
-#include "bitmap.h"
-#include "gimple-expr.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "calls.h"
-#include "tree-ssa-alias.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "gimple.h"
#include "lto-streamer.h"
#include "cgraph.h"
#include "tree-chkp.h"
diff --git a/gcc/ipa-comdats.c b/gcc/ipa-comdats.c
index fda793adfbd..e78ea35521a 100644
--- a/gcc/ipa-comdats.c
+++ b/gcc/ipa-comdats.c
@@ -53,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "hard-reg-set.h"
#include "function.h"
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 02b027d0c52..16b9cde43b9 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -104,23 +104,18 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "gimple-fold.h"
#include "gimple-expr.h"
#include "target.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tm.h"
+#include "backend.h"
#include "hard-reg-set.h"
-#include "function.h"
#include "cgraph.h"
#include "alloc-pool.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
-#include "bitmap.h"
#include "tree-pass.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 905776e0a0c..a20629fa8ed 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -108,19 +108,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "print-tree.h"
#include "calls.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cgraph.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -134,11 +130,8 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "tree-pretty-print.h"
#include "ipa-utils.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "alloc-pool.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c
index 8317dc1d5c8..e72769395fb 100644
--- a/gcc/ipa-icf-gimple.c
+++ b/gcc/ipa-icf-gimple.c
@@ -23,20 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
-#include "gimple-expr.h"
#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
+#include "internal-fn.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -48,9 +42,7 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "stringpool.h"
#include "tree-dfa.h"
#include "tree-pass.h"
#include "gimple-pretty-print.h"
@@ -60,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "data-streamer.h"
#include "ipa-utils.h"
#include <list>
-#include "tree-ssanames.h"
#include "tree-eh.h"
#include "builtins.h"
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 691c90d59d5..c4386c0f762 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -56,22 +56,14 @@ along with GCC; see the file COPYING3. If not see
#include <list>
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
-#include "gimple-expr.h"
#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
+#include "internal-fn.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -83,11 +75,7 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-dfa.h"
#include "tree-pass.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 18bc68a41b3..d5dbfbd6887 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -67,13 +67,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "stringpool.h"
#include "print-tree.h"
#include "tree-inline.h"
#include "langhooks.h"
@@ -83,23 +84,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "tree-pass.h"
#include "coverage.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
#include "cgraph.h"
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 6cb9a9e98b6..12f701a27f1 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "langhooks.h"
#include "intl.h"
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 6e598d165ca..f836df664fd 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -92,10 +92,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "trans-mem.h"
#include "calls.h"
@@ -108,17 +109,8 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "tree-pass.h"
#include "coverage.h"
-#include "rtl.h"
-#include "bitmap.h"
#include "profile.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-ssa.h"
#include "cgraph.h"
#include "alloc-pool.h"
diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index d876b3b1ab5..458e1e93246 100644
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@@ -21,16 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "print-tree.h"
#include "calls.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -43,15 +41,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "target.h"
#include "tree-pretty-print.h"
-#include "predict.h"
-#include "basic-block.h"
#include "cgraph.h"
#include "ipa-utils.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "alloc-pool.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c
index 809a677fb09..698729b1b0b 100644
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@@ -47,23 +47,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
+#include "alias.h"
+#include "fold-const.h"
#include "cgraph.h"
#include "tree-pass.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "flags.h"
#include "target.h"
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index b5044cf3c5f..6074194ccb0 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -21,24 +21,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -61,11 +53,7 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
-#include "bitmap.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-into-ssa.h"
#include "tree-dfa.h"
#include "tree-pass.h"
@@ -78,8 +66,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-streamer.h"
#include "params.h"
#include "ipa-utils.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "dbgcnt.h"
#include "domwalk.h"
#include "builtins.h"
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index dbceb048176..f0373e65d8f 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -34,25 +34,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
#include "fold-const.h"
#include "print-tree.h"
#include "calls.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "tree-cfg.h"
diff --git a/gcc/ipa-ref.c b/gcc/ipa-ref.c
index 8a2ca4cc256..2faa513c357 100644
--- a/gcc/ipa-ref.c
+++ b/gcc/ipa-ref.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "target.h"
#include "tm.h"
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index d53abb6ffe8..465a74bcc9f 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -39,27 +39,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
#include "alias.h"
-#include "symtab.h"
#include "options.h"
-#include "tree.h"
#include "fold-const.h"
#include "calls.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "tree-inline.h"
#include "tree-pass.h"
#include "splay-tree.h"
#include "cgraph.h"
#include "ipa-utils.h"
-#include "bitmap.h"
#include "ipa-reference.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 13d9a6447e5..df6572f282d 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -78,24 +78,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "stringpool.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -115,11 +106,7 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-dfa.h"
#include "tree-pass.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index d666b0a286c..fb3a9a1faa2 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -21,29 +21,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
#include "alias.h"
-#include "symtab.h"
#include "options.h"
-#include "tree.h"
#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "tree-inline.h"
#include "dumpfile.h"
#include "langhooks.h"
#include "splay-tree.h"
#include "cgraph.h"
#include "ipa-utils.h"
-#include "bitmap.h"
#include "ipa-reference.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index f6c1f4099e8..93073d80d10 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -77,7 +77,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "hard-reg-set.h"
#include "function.h"
diff --git a/gcc/ipa.c b/gcc/ipa.c
index fdfb88072da..75e367f0115 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@@ -20,21 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
#include "alias.h"
-#include "symtab.h"
#include "options.h"
-#include "tree.h"
#include "fold-const.h"
#include "calls.h"
#include "stringpool.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cgraph.h"
#include "tree-pass.h"
-#include "gimple-expr.h"
#include "gimplify.h"
#include "flags.h"
#include "target.h"
@@ -48,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "profile.h"
#include "params.h"
#include "internal-fn.h"
-#include "tree-ssa-alias.h"
-#include "gimple.h"
#include "dbgcnt.h"
diff --git a/gcc/ira-build.c b/gcc/ira-build.c
index 9fcbcb0aa2b..2dc6ec4c0ee 100644
--- a/gcc/ira-build.c
+++ b/gcc/ira-build.c
@@ -21,25 +21,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "target.h"
#include "regs.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "recog.h"
#include "diagnostic-core.h"
#include "params.h"
-#include "df.h"
#include "reload.h"
#include "sparseset.h"
+#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 972a053402f..98858b3d536 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -21,23 +21,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "target.h"
#include "regs.h"
#include "flags.h"
-#include "sbitmap.h"
-#include "bitmap.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,7 +42,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "reload.h"
#include "params.h"
-#include "df.h"
+#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
typedef struct allocno_hard_regs *allocno_hard_regs_t;
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c
index b999c59940a..a093fdc6e70 100644
--- a/gcc/ira-conflicts.c
+++ b/gcc/ira-conflicts.c
@@ -21,22 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "regs.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "regs.h"
#include "tm_p.h"
#include "target.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "recog.h"
#include "diagnostic-core.h"
#include "params.h"
-#include "df.h"
#include "sparseset.h"
+#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
#include "addresses.h"
diff --git a/gcc/ira-costs.c b/gcc/ira-costs.c
index 0d39215b047..e520f77820d 100644
--- a/gcc/ira-costs.c
+++ b/gcc/ira-costs.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
#include "rtl.h"
-#include "symtab.h"
-#include "function.h"
+#include "tree.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -39,10 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tm_p.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "regs.h"
#include "addresses.h"
#include "recog.h"
@@ -50,6 +43,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "target.h"
#include "params.h"
+#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
/* The flags is set up every time when we calculate pseudo register
diff --git a/gcc/ira-emit.c b/gcc/ira-emit.c
index d204ec13a28..df9f71b6ad3 100644
--- a/gcc/ira-emit.c
+++ b/gcc/ira-emit.c
@@ -68,25 +68,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "regs.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "regs.h"
#include "tm_p.h"
#include "target.h"
#include "flags.h"
#include "obstack.h"
-#include "bitmap.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
-#include "basic-block.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -99,7 +92,9 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "params.h"
#include "reload.h"
-#include "df.h"
+#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
diff --git a/gcc/ira-int.h b/gcc/ira-int.h
index c2853dcdd37..a7c0f40b53b 100644
--- a/gcc/ira-int.h
+++ b/gcc/ira-int.h
@@ -21,10 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_IRA_INT_H
#define GCC_IRA_INT_H
-#include "cfgloop.h"
-#include "ira.h"
-#include "alloc-pool.h"
-
/* To provide consistency in naming, all IRA external variables,
functions, common typedefs start with prefix ira_. */
diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index 8bd62d2dc70..4f5f3cc4716 100644
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -21,24 +21,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "regs.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "regs.h"
#include "tm_p.h"
#include "target.h"
#include "flags.h"
#include "except.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "recog.h"
#include "diagnostic-core.h"
#include "params.h"
-#include "df.h"
-#include "sbitmap.h"
#include "sparseset.h"
+#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
/* The code in this file is similar to one in global but the code
diff --git a/gcc/ira.c b/gcc/ira.c
index 92d5eb11ed7..8397b8fcd29 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -366,27 +366,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "regs.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "hard-reg-set.h"
#include "rtl.h"
+#include "df.h"
+#include "regs.h"
+#include "alias.h"
#include "tm_p.h"
#include "target.h"
#include "flags.h"
#include "obstack.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "df.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -403,6 +395,9 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "reload.h"
#include "diagnostic-core.h"
+#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
#include "lra.h"
#include "dce.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 320c9426031..e560d70bf9c 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,24 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * boehm.c: Adjust includes.
+ * builtins.c: Likewise.
+ * class.c: Likewise.
+ * constants.c: Likewise.
+ * decl.c: Likewise.
+ * except.c: Likewise.
+ * expr.c: Likewise.
+ * java-gimplify.c: Likewise.
+ * jcf-dump.c: Likewise.
+ * jcf-io.c: Likewise.
+ * jcf-parse.c: Likewise.
+ * jvgenmain.c: Likewise.
+ * lang.c: Likewise.
+ * mangle.c: Likewise.
+ * mangle_name.c: Likewise.
+ * resource.c: Likewise.
+ * typeck.c: Likewise.
+ * verify-glue.c: Likewise.
+
2015-06-25 Andrew MacLeod <amacleod@redhat.com>
* class.c: Remove ipa-ref.h and plugin-api.h from include list.
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c
index 51714b4dae7..717dd168c9c 100644
--- a/gcc/java/boehm.c
+++ b/gcc/java/boehm.c
@@ -28,9 +28,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "java-tree.h"
#include "parse.h"
#include "diagnostic-core.h"
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index 6c7545b9ada..f10227f19e1 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -31,9 +31,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
@@ -45,7 +44,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
Front ends should never have to look at that. */
#include "rtl.h"
#include "insn-codes.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 902323eeceb..234bddcf807 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -27,9 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index 3aa7bcff378..942c867fb70 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -26,7 +26,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "tm.h"
#include "jcf.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index b855fcaa3c9..c035fe05896 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -28,9 +28,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/java/except.c b/gcc/java/except.c
index 557726c05e5..a2bd0daf4e8 100644
--- a/gcc/java/except.c
+++ b/gcc/java/except.c
@@ -26,7 +26,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 92a328e1bda..0af90680fc7 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -33,7 +33,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
PARM_BOUNDARY. */
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index 036fdccfeb1..43a462d7f75 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -25,21 +25,18 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "tm.h"
+#include "function.h"
+#include "predict.h"
+#include "basic-block.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "options.h"
#include "fold-const.h"
#include "java-tree.h"
#include "dumpfile.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
static tree java_gimplify_block (tree);
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 83299f2a775..8bd8e072430 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -55,9 +55,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "java-tree.h"
#include "version.h"
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index be251d462f1..87d194279b4 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -29,9 +29,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "java-tree.h"
#include <dirent.h>
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 20d412b8978..bb6e743e2b4 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -27,9 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "obstack.h"
#include "flags.h"
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index dcdcb397877..2f6d94bf346 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -29,9 +29,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "obstack.h"
#include "jcf.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "java-tree.h"
#include "intl.h"
#include "diagnostic.h"
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index d2b519c6c8e..11e786cb5be 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -28,7 +28,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "java-tree.h"
#include "jcf.h"
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index 111e4bd82c8..a9fc8867fd0 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -29,9 +29,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "jcf.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "java-tree.h"
#include "obstack.h"
diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c
index 050f5da9727..26c1931d9f4 100644
--- a/gcc/java/mangle_name.c
+++ b/gcc/java/mangle_name.c
@@ -29,9 +29,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "jcf.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "java-tree.h"
#include "obstack.h"
#include "diagnostic-core.h"
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 549a2a7648c..6fb730b76e2 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -25,9 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index df06a4bf8f6..6cbb3561dca 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -27,9 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c
index c98a3ddf0d1..a1630c7d77e 100644
--- a/gcc/java/verify-glue.c
+++ b/gcc/java/verify-glue.c
@@ -28,9 +28,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "parse.h"
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index dbead11e0e2..6fdcb604623 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * dummy-frontend.c: Adjust includes.
+ * jit-common.h: Likewise.
+ * jit-playback.c: Likewise.
+
2015-07-07 David Malcolm <dmalcolm@redhat.com>
PR jit/66783
diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index 3ddab5084ff..3d0b3ea7640 100644
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -23,11 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "alias.h"
#include "flags.h"
-#include "symtab.h"
-#include "tree-core.h"
+#include "tree.h"
#include "stor-layout.h"
#include "inchash.h"
-#include "tree.h"
#include "debug.h"
#include "langhooks.h"
#include "langhooks-def.h"
diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 3397215bc91..28ce2bcb4e9 100644
--- a/gcc/jit/jit-common.h
+++ b/gcc/jit/jit-common.h
@@ -25,9 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "flags.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "tree-iterator.h"
#ifdef GCC_VERSION
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index 1fe1091f7d3..2b99c49613f 100644
--- a/gcc/jit/jit-playback.c
+++ b/gcc/jit/jit-playback.c
@@ -27,10 +27,8 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "alias.h"
#include "flags.h"
-#include "symtab.h"
-#include "tree-core.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "hash-map.h"
#include "vec.h"
#include "hashtab.h"
diff --git a/gcc/jump.c b/gcc/jump.c
index 1bf54871220..66ea73c7a93 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -36,24 +36,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "tm_p.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "regs.h"
#include "insn-config.h"
#include "insn-attr.h"
#include "recog.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
-#include "symtab.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index cf89a3a5af3..83d916f26ea 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "toplev.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
@@ -39,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks-def.h"
#include "diagnostic.h"
#include "tree-diagnostic.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "cgraph.h"
#include "timevar.h"
diff --git a/gcc/lcm.c b/gcc/lcm.c
index af5e78e0fa4..f6d1ed542f4 100644
--- a/gcc/lcm.c
+++ b/gcc/lcm.c
@@ -51,22 +51,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
#include "lcm.h"
-#include "basic-block.h"
#include "tm_p.h"
-#include "sbitmap.h"
#include "dumpfile.h"
/* Edge based LCM routines. */
diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index 7da5ab322c7..d1117e99f8c 100644
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "flags.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "alias.h"
#include "tree.h"
+#include "alias.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -40,12 +37,8 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "diagnostic-core.h"
#include "tm_p.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgloop.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "params.h"
#include "target.h"
#include "dumpfile.h"
diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index 85957770b3b..b786442fc36 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -20,24 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "regs.h"
#include "obstack.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "cfgloop.h"
#include "tree-pass.h"
#include "flags.h"
-#include "df.h"
#include "tree-ssa-loop-niter.h"
#include "loop-unroll.h"
#include "tree-scalar-evolution.h"
diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c
index d3a74399f1b..8d9a5196f17 100644
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -37,22 +37,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "obstack.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "cfgloop.h"
-#include "symtab.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -64,7 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "recog.h"
#include "target.h"
-#include "df.h"
#include "except.h"
#include "params.h"
#include "regs.h"
diff --git a/gcc/loop-iv.c b/gcc/loop-iv.c
index d02d5429715..9130aa377f5 100644
--- a/gcc/loop-iv.c
+++ b/gcc/loop-iv.c
@@ -50,20 +50,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
-#include "hard-reg-set.h"
+#include "df.h"
#include "obstack.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "cfgloop.h"
-#include "symtab.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -75,7 +69,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "intl.h"
#include "diagnostic-core.h"
-#include "df.h"
#include "dumpfile.h"
#include "rtl-iter.h"
diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c
index 3fa7fc0ceeb..f19b10d0b62 100644
--- a/gcc/loop-unroll.c
+++ b/gcc/loop-unroll.c
@@ -20,20 +20,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
-#include "hard-reg-set.h"
#include "obstack.h"
#include "profile.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "cfgloop.h"
#include "params.h"
#include "insn-codes.h"
diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c
index bacb65f856d..2083133e01e 100644
--- a/gcc/lower-subreg.c
+++ b/gcc/lower-subreg.c
@@ -22,25 +22,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "tm_p.h"
#include "flags.h"
#include "insn-config.h"
#include "obstack.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
-#include "basic-block.h"
#include "recog.h"
-#include "bitmap.h"
#include "dce.h"
#include "expmed.h"
#include "dojump.h"
@@ -53,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "regs.h"
#include "tree-pass.h"
-#include "df.h"
#include "lower-subreg.h"
#include "rtl-iter.h"
diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c
index abdb419251b..409f999b8b6 100644
--- a/gcc/lra-assigns.c
+++ b/gcc/lra-assigns.c
@@ -77,9 +77,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "rtl-error.h"
#include "tm_p.h"
#include "target.h"
@@ -87,11 +88,8 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "function.h"
-#include "symtab.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -100,15 +98,13 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "except.h"
-#include "df.h"
#include "ira.h"
#include "sparseset.h"
#include "params.h"
+#include "lra.h"
+#include "insn-attr.h"
+#include "insn-codes.h"
#include "lra-int.h"
/* Current iteration number of the pass and current iteration number
diff --git a/gcc/lra-coalesce.c b/gcc/lra-coalesce.c
index 8fb2488258e..3ec4e157a96 100644
--- a/gcc/lra-coalesce.c
+++ b/gcc/lra-coalesce.c
@@ -45,19 +45,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
-#include "function.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -66,16 +64,14 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "except.h"
#include "timevar.h"
#include "ira.h"
#include "alloc-pool.h"
+#include "lra.h"
+#include "insn-attr.h"
+#include "insn-codes.h"
#include "lra-int.h"
-#include "df.h"
/* Arrays whose elements represent the first and the next pseudo
(regno) in the coalesced pseudos group to which given pseudo (its
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 75c2a77b3dc..cdb3a9707ab 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -109,9 +109,10 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "regs.h"
#include "insn-config.h"
@@ -120,11 +121,8 @@
#include "output.h"
#include "addresses.h"
#include "target.h"
-#include "function.h"
-#include "symtab.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -133,17 +131,14 @@
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "except.h"
#include "optabs.h"
-#include "df.h"
#include "ira.h"
#include "rtl-error.h"
#include "params.h"
+#include "lra.h"
+#include "insn-attr.h"
#include "lra-int.h"
/* Value of LRA_CURR_RELOAD_NUM at the beginning of BB of the current
diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c
index 1fc37e1b55d..c8da0c20dea 100644
--- a/gcc/lra-eliminations.c
+++ b/gcc/lra-eliminations.c
@@ -54,9 +54,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "regs.h"
#include "insn-config.h"
@@ -65,11 +66,8 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "addresses.h"
#include "target.h"
-#include "function.h"
-#include "symtab.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -78,15 +76,12 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "except.h"
#include "optabs.h"
-#include "df.h"
#include "ira.h"
#include "rtl-error.h"
+#include "lra.h"
+#include "insn-attr.h"
#include "lra-int.h"
/* This structure is used to record information about hard register
diff --git a/gcc/lra-int.h b/gcc/lra-int.h
index e1d5ef2c918..a7763e856dd 100644
--- a/gcc/lra-int.h
+++ b/gcc/lra-int.h
@@ -21,14 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_LRA_INT_H
#define GCC_LRA_INT_H
-#include "lra.h"
-#include "bitmap.h"
-#include "recog.h"
-#include "insn-attr.h"
-#include "insn-codes.h"
-#include "insn-config.h"
-#include "regs.h"
-
#define lra_assert(c) gcc_checking_assert (c)
/* The parameter used to prevent infinite reloading for an insn. Each
diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index 88c0ef671b4..b270b0e6be6 100644
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -28,19 +28,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "function.h"
-#include "symtab.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -49,15 +47,13 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "except.h"
-#include "df.h"
#include "ira.h"
#include "sparseset.h"
+#include "lra.h"
+#include "insn-attr.h"
+#include "insn-codes.h"
#include "lra-int.h"
/* Program points are enumerated by numbers from range
diff --git a/gcc/lra-remat.c b/gcc/lra-remat.c
index 20c510642c2..1c259a3b766 100644
--- a/gcc/lra-remat.c
+++ b/gcc/lra-remat.c
@@ -55,9 +55,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "rtl-error.h"
#include "tm_p.h"
#include "target.h"
@@ -65,11 +66,8 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "function.h"
-#include "symtab.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -78,15 +76,13 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "except.h"
-#include "df.h"
#include "ira.h"
#include "sparseset.h"
#include "params.h"
+#include "lra.h"
+#include "insn-attr.h"
+#include "insn-codes.h"
#include "lra-int.h"
/* Number of candidates for rematerialization. */
diff --git a/gcc/lra-spills.c b/gcc/lra-spills.c
index d9996a58df9..a210c41da31 100644
--- a/gcc/lra-spills.c
+++ b/gcc/lra-spills.c
@@ -58,19 +58,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
-#include "function.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -79,18 +77,16 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "except.h"
#include "timevar.h"
#include "target.h"
#include "alloc-pool.h"
+#include "lra.h"
+#include "insn-attr.h"
+#include "insn-codes.h"
#include "lra-int.h"
#include "ira.h"
-#include "df.h"
/* Max regno at the start of the pass. */
diff --git a/gcc/lra.c b/gcc/lra.c
index bdd8e3ca3df..793098bd4e4 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -103,9 +103,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "regs.h"
#include "insn-config.h"
@@ -114,9 +115,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "addresses.h"
#include "flags.h"
-#include "function.h"
-#include "symtab.h"
-#include "tree.h"
#include "optabs.h"
#include "alias.h"
#include "expmed.h"
@@ -127,20 +125,17 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
-#include "basic-block.h"
#include "except.h"
#include "tree-pass.h"
#include "timevar.h"
#include "target.h"
#include "ira.h"
#include "alloc-pool.h"
+#include "lra.h"
+#include "insn-attr.h"
#include "lra-int.h"
-#include "df.h"
/* Dump bitmap SET with TITLE and BB INDEX. */
void
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index c30fa2354bc..97585c961b2 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -23,21 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "stringpool.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -50,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "params.h"
#include "langhooks.h"
-#include "bitmap.h"
#include "diagnostic-core.h"
#include "except.h"
#include "timevar.h"
diff --git a/gcc/lto-compress.c b/gcc/lto-compress.c
index d979b78b758..c688caec215 100644
--- a/gcc/lto-compress.c
+++ b/gcc/lto-compress.c
@@ -28,19 +28,13 @@ along with GCC; see the file COPYING3. If not see
#include <zlib.h>
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "diagnostic-core.h"
#include "langhooks.h"
#include "cgraph.h"
diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c
index 2270d080ed5..ae660d92329 100644
--- a/gcc/lto-opts.c
+++ b/gcc/lto-opts.c
@@ -23,20 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "bitmap.h"
#include "flags.h"
#include "opts.h"
#include "options.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index d24929ee727..58560a85d49 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -22,20 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
-#include "gimple-expr.h"
#include "gimple.h"
#include "rtl.h"
+#include "alias.h"
+#include "fold-const.h"
+#include "internal-fn.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index c0a4821566e..83a9758eab6 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -22,20 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
-#include "gimple-expr.h"
#include "gimple.h"
#include "rtl.h"
+#include "alias.h"
+#include "fold-const.h"
+#include "internal-fn.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 66298ec54a4..45a1155d03f 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -23,16 +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 "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "toplev.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
-#include "stringpool.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -44,18 +42,9 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "params.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-dfa.h"
#include "tree-ssa.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 254d7ba50b7..a58c54ef5ba 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -23,16 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "stringpool.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -44,17 +42,8 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "params.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "diagnostic-core.h"
#include "except.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index 3fbbe9ac480..57e6ea55ccd 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -23,22 +23,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
#include "toplev.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "bitmap.h"
#include "diagnostic-core.h"
#include "cgraph.h"
#include "tree-streamer.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 6bc10bf84e7..2390de63d5c 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * lto-lang.c: Adjust includes.
+ * lto-object.c: Likewise.
+ * lto-partition.c: Likewise.
+ * lto-symtab.c: Likewise.
+ * lto.c: Likewise.
+
2015-06-25 Andrew MacLeod <amacleod@redhat.com>
* lto-lang.c: Remove ipa-ref.h and plugin-api.h from include list.
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 0e5bd76844d..3e878527fb2 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -23,9 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "flags.h"
#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "function.h"
+#include "predict.h"
+#include "basic-block.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
@@ -36,14 +40,7 @@ along with GCC; see the file COPYING3. If not see
#include "lto-tree.h"
#include "lto.h"
#include "tree-inline.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "diagnostic-core.h"
#include "toplev.h"
#include "cgraph.h"
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index e102e799d7f..3f3ee954e92 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.c
@@ -22,19 +22,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
-#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
#include "tm.h"
-#include "hard-reg-set.h"
#include "function.h"
+#include "predict.h"
#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
-#include "gimple-expr.h"
+#include "tree.h"
#include "gimple.h"
+#include "hard-reg-set.h"
+#include "options.h"
+#include "fold-const.h"
+#include "internal-fn.h"
#include "diagnostic-core.h"
#include "lto.h"
#include "cgraph.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index db830fd0863..1f25702035f 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -22,19 +22,16 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "toplev.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
-#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
#include "tm.h"
-#include "hard-reg-set.h"
#include "function.h"
+#include "predict.h"
#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
-#include "gimple-expr.h"
+#include "tree.h"
#include "gimple.h"
+#include "hard-reg-set.h"
+#include "options.h"
+#include "fold-const.h"
+#include "internal-fn.h"
#include "cgraph.h"
#include "lto-streamer.h"
#include "timevar.h"
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index df3cc44d2a9..87c81dd1795 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -23,19 +23,16 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
-#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
#include "tm.h"
-#include "hard-reg-set.h"
#include "function.h"
+#include "predict.h"
#include "basic-block.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
-#include "gimple-expr.h"
+#include "tree.h"
#include "gimple.h"
+#include "hard-reg-set.h"
+#include "options.h"
+#include "fold-const.h"
+#include "internal-fn.h"
#include "cgraph.h"
#include "lto-streamer.h"
#include "ipa-utils.h"
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 0972ff607c8..d1a1e6d812e 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -24,31 +24,28 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "toplev.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
-#include "tree.h"
-#include "fold-const.h"
-#include "stor-layout.h"
-#include "diagnostic-core.h"
#include "tm.h"
+#include "function.h"
+#include "bitmap.h"
#include "predict.h"
#include "basic-block.h"
+#include "tree.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
+#include "options.h"
+#include "fold-const.h"
+#include "stor-layout.h"
+#include "diagnostic-core.h"
#include "cgraph.h"
#include "tree-ssa-operands.h"
#include "tree-pass.h"
#include "langhooks.h"
-#include "bitmap.h"
#include "alloc-pool.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
#include "common.h"
#include "debug.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "lto.h"
#include "lto-tree.h"
#include "lto-streamer.h"
diff --git a/gcc/mcf.c b/gcc/mcf.c
index 6bba0facea5..6c2b87b4e68 100644
--- a/gcc/mcf.c
+++ b/gcc/mcf.c
@@ -45,13 +45,8 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "predict.h"
-#include "tm.h"
+#include "backend.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gcov-io.h"
#include "profile.h"
#include "dumpfile.h"
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 4ffdc7e303b..cbcd7365b59 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -20,26 +20,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "target.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "target.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "tm_p.h"
#include "tree-pass.h"
-#include "df.h"
#include "emit-rtl.h"
/* We want target macros for the mode switching code to be able to refer
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index 193fb07aefd..83220d3081f 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -22,30 +22,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
#include "profile.h"
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
#include "except.h"
#include "recog.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "target.h"
#include "cfgloop.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "insn-codes.h"
#include "optabs.h"
#include "expmed.h"
@@ -58,8 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "params.h"
#include "gcov-io.h"
-#include "sbitmap.h"
-#include "df.h"
#include "ddg.h"
#include "tree-pass.h"
#include "dbgcnt.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 83b423f4bc3..824877b97da 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,14 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * objc-act.c: Adjust includes.
+ * objc-encoding.c: Likewise.
+ * objc-gnu-runtime-abi-01.c: Likewise.
+ * objc-lang.c: Likewise.
+ * objc-map.c: Likewise.
+ * objc-next-runtime-abi-01.c: Likewise.
+ * objc-next-runtime-abi-02.c: Likewise.
+ * objc-runtime-shared-support.c: Likewise.
+
2015-06-25 Andrew MacLeod <amacleod@redhat.com>
* objc-act.c: Remove ipa-ref.h and plugin-api.h from include list.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index f1b56e80766..a1e32fc2795 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/objc/objc-encoding.c b/gcc/objc/objc-encoding.c
index 17c0b217710..48480213534 100644
--- a/gcc/objc/objc-encoding.c
+++ b/gcc/objc/objc-encoding.c
@@ -21,9 +21,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#include "stor-layout.h"
diff --git a/gcc/objc/objc-gnu-runtime-abi-01.c b/gcc/objc/objc-gnu-runtime-abi-01.c
index 55d6ed7964b..d91db2b2e03 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.c
+++ b/gcc/objc/objc-gnu-runtime-abi-01.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index d74655bac78..530f2725575 100644
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.c
@@ -24,9 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "c/c-tree.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
diff --git a/gcc/objc/objc-map.c b/gcc/objc/objc-map.c
index fd894126a18..73834a8cb78 100644
--- a/gcc/objc/objc-map.c
+++ b/gcc/objc/objc-map.c
@@ -21,9 +21,8 @@ Boston, MA 02110-1301, USA. */
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "objc-map.h"
#define OUT_OF_MEMORY { fprintf (stderr, "Out of memory\n"); abort (); }
diff --git a/gcc/objc/objc-next-runtime-abi-01.c b/gcc/objc/objc-next-runtime-abi-01.c
index 27978031e47..337771f6a6c 100644
--- a/gcc/objc/objc-next-runtime-abi-01.c
+++ b/gcc/objc/objc-next-runtime-abi-01.c
@@ -27,9 +27,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index 3bf951c3a64..4f4aff92b48 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -30,9 +30,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/objc/objc-runtime-shared-support.c b/gcc/objc/objc-runtime-shared-support.c
index a6ad2301f39..56013b15ab3 100644
--- a/gcc/objc/objc-runtime-shared-support.c
+++ b/gcc/objc/objc-runtime-shared-support.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "stringpool.h"
#ifdef OBJCPLUS
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index 4deea7b4bc8..b422f76d7bb 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-07 Andrew MacLeod <amacleod@redhat.com>
+
+ * objcp-decl.c: Adjust includes.
+ * objcp-lang.c: Likewise.
+
2015-06-17 Andrew MacLeod <amacleod@redhat.com>
* objcp-decl.c: Do not include input.h, line-map.h or is-a.h.
diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c
index c1357a6f777..b94562c5e24 100644
--- a/gcc/objcp/objcp-decl.c
+++ b/gcc/objcp/objcp-decl.c
@@ -25,10 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
+#include "tree.h"
#include "options.h"
#include "inchash.h"
-#include "tree.h"
#include "cp-tree.h"
#include "c-family/c-objc.h"
diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c
index 4e5ede22ceb..abcd559ae98 100644
--- a/gcc/objcp/objcp-lang.c
+++ b/gcc/objcp/objcp-lang.c
@@ -24,10 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
+#include "tree.h"
#include "options.h"
#include "inchash.h"
-#include "tree.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
diff --git a/gcc/omega.c b/gcc/omega.c
index 829520a338a..55ed77d6b89 100644
--- a/gcc/omega.c
+++ b/gcc/omega.c
@@ -34,9 +34,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "omega.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 2e2070a7397..2517f1873cd 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -25,26 +25,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "stor-layout.h"
-#include "rtl.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
@@ -53,12 +44,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "langhooks.h"
#include "diagnostic-core.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 6818458a23d..92ed2b9b4ce 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "diagnostic-core.h"
/* Include insn-config.h before expr.h so that HAVE_conditional_move
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stor-layout.h"
@@ -37,8 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "tm_p.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "except.h"
#include "expmed.h"
#include "dojump.h"
@@ -52,10 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "libfuncs.h"
#include "recog.h"
#include "reload.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "target.h"
struct target_optabs default_target_optabs;
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 2fc62503f03..30563019e29 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -25,20 +25,13 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h" /* Required by langhooks.h. */
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "langhooks.h"
-#include "rtl.h"
#include "dbgcnt.h"
#include "debug.h"
#include "cgraph.h"
diff --git a/gcc/passes.c b/gcc/passes.c
index 4966334206e..6292fd263c4 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -25,23 +25,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "df.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
-#include "rtl.h"
#include "tm_p.h"
#include "flags.h"
#include "insn-attr.h"
#include "insn-config.h"
#include "insn-flags.h"
-#include "hard-reg-set.h"
#include "recog.h"
#include "output.h"
#include "except.h"
-#include "function.h"
#include "toplev.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,8 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "emit-rtl.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "basic-block.h"
#include "intl.h"
#include "graph.h"
#include "regs.h"
@@ -67,21 +65,14 @@ along with GCC; see the file COPYING3. If not see
#include "coverage.h"
#include "value-prof.h"
#include "tree-inline.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-into-ssa.h"
#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
#include "tree-dump.h"
-#include "df.h"
#include "cgraph.h"
#include "lto-streamer.h"
#include "plugin.h"
@@ -89,8 +80,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h" /* for dump_function_header */
#include "context.h"
#include "pass_manager.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "tree-ssa-live.h" /* For remove_unused_locals. */
#include "tree-cfgcleanup.h"
diff --git a/gcc/plugin.c b/gcc/plugin.c
index 93e2e3a6a09..43d97fefa76 100644
--- a/gcc/plugin.c
+++ b/gcc/plugin.c
@@ -25,10 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
+#include "tree.h"
#include "options.h"
#include "flags.h"
-#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
#include "plugin.h"
diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c
index a1ffdb4d632..46b14b24617 100644
--- a/gcc/postreload-gcse.c
+++ b/gcc/postreload-gcse.c
@@ -20,25 +20,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "diagnostic-core.h"
-#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "profile.h"
#include "expmed.h"
#include "dojump.h"
@@ -55,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "tree-pass.h"
#include "dbgcnt.h"
-#include "df.h"
#include "gcse-common.h"
/* The following code implements gcse after reload, the purpose of this
diff --git a/gcc/postreload.c b/gcc/postreload.c
index 704428a6796..4e08b7c2bb4 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -20,18 +20,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+
#include "tm_p.h"
#include "obstack.h"
#include "insn-config.h"
#include "flags.h"
-#include "function.h"
-#include "symtab.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -43,13 +41,9 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "regs.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "reload.h"
#include "recog.h"
#include "alloc-pool.h"
@@ -58,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "target.h"
#include "tree-pass.h"
-#include "df.h"
#include "dbgcnt.h"
static int reload_cse_noop_set_p (rtx);
diff --git a/gcc/predict.c b/gcc/predict.c
index 9a69c6f4e39..6a3ff4241c2 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -30,21 +30,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "calls.h"
-#include "rtl.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "regs.h"
#include "flags.h"
@@ -64,16 +59,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "target.h"
#include "cfgloop.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#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-pass.h"
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 36182d349ce..aacadbb9b44 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -34,11 +34,9 @@ along with GCC; see the file COPYING3. If not see
generator programs. */
#ifndef GENERATOR_FILE
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "print-tree.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "predict.h"
#include "function.h"
#include "basic-block.h"
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 1841d77f893..6e0d4a9f02c 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "varasm.h"
#include "print-rtl.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index 754326b3a36..eb9e028d804 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -50,15 +50,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "flags.h"
#include "regs.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -68,19 +66,12 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "diagnostic-core.h"
#include "coverage.h"
#include "value-prof.h"
#include "fold-const.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "cfgloop.h"
diff --git a/gcc/real.c b/gcc/real.c
index 2d34b620279..c1ff78d903f 100644
--- a/gcc/real.c
+++ b/gcc/real.c
@@ -24,7 +24,6 @@
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "diagnostic-core.h"
#include "realmpfr.h"
diff --git a/gcc/realmpfr.c b/gcc/realmpfr.c
index d86f23aeead..8c5e99af178 100644
--- a/gcc/realmpfr.c
+++ b/gcc/realmpfr.c
@@ -22,9 +22,8 @@
#include "coretypes.h"
#include "realmpfr.h"
#include "alias.h"
-#include "symtab.h"
+#include "tree.h"
#include "options.h"
-#include "tree.h" /* For TYPE_MODE in real_from_mpfr. */
#include "stor-layout.h"
/* Convert from REAL_VALUE_TYPE to MPFR. The caller is responsible
diff --git a/gcc/recog.c b/gcc/recog.c
index d96e2932098..2a21c66b9b4 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -21,20 +21,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "rtl-error.h"
#include "tm_p.h"
#include "insn-config.h"
#include "insn-attr.h"
-#include "hard-reg-set.h"
#include "recog.h"
#include "regs.h"
#include "addresses.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "expmed.h"
#include "dojump.h"
@@ -44,17 +42,12 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "reload.h"
#include "target.h"
#include "tree-pass.h"
-#include "df.h"
#include "insn-codes.h"
#ifndef STACK_POP_CODE
diff --git a/gcc/ree.c b/gcc/ree.c
index 9e3dd7b222f..016659c6cb1 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -218,21 +218,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "tm_p.h"
#include "flags.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -251,7 +245,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtlhooks-def.h"
#include "params.h"
#include "tree-pass.h"
-#include "df.h"
#include "cgraph.h"
/* This structure represents a candidate for elimination. */
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 997851c3798..67ecfd45399 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -152,31 +152,25 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "varasm.h"
#include "rtl-error.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "insn-config.h"
#include "regs.h"
#include "flags.h"
#include "recog.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "reload.h"
#include "tree-pass.h"
#include "target.h"
-#include "df.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
#include "rtl-iter.h"
diff --git a/gcc/regcprop.c b/gcc/regcprop.c
index cca495e0952..093ebdc72a2 100644
--- a/gcc/regcprop.c
+++ b/gcc/regcprop.c
@@ -20,25 +20,19 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "insn-config.h"
#include "regs.h"
#include "addresses.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "reload.h"
#include "recog.h"
#include "flags.h"
#include "diagnostic-core.h"
#include "obstack.h"
#include "tree-pass.h"
-#include "df.h"
#include "rtl-iter.h"
#include "emit-rtl.h"
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index 09c2f33f1c0..9e855c2c1f7 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -28,13 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
#include "rtl.h"
-#include "function.h"
+#include "df.h"
+#include "alias.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -46,10 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tm_p.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "regs.h"
#include "addresses.h"
#include "recog.h"
@@ -58,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "target.h"
#include "tree-pass.h"
-#include "df.h"
#include "ira.h"
/* Maximum register number used in this function, plus one. */
diff --git a/gcc/regrename.c b/gcc/regrename.c
index 6c7d650ea83..174d3b57368 100644
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -20,26 +20,21 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "rtl.h"
+#include "df.h"
#include "rtl-error.h"
#include "tm_p.h"
#include "insn-config.h"
#include "regs.h"
#include "addresses.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "reload.h"
#include "output.h"
#include "recog.h"
#include "flags.h"
#include "obstack.h"
#include "tree-pass.h"
-#include "df.h"
#include "target.h"
#include "emit-rtl.h"
#include "regrename.h"
diff --git a/gcc/regs.h b/gcc/regs.h
index 8088d681f1a..e182f76eb98 100644
--- a/gcc/regs.h
+++ b/gcc/regs.h
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_REGS_H
#define GCC_REGS_H
-#include "hard-reg-set.h"
-#include "rtl.h"
-
#define REG_BYTES(R) mode_size[(int) GET_MODE (R)]
/* When you only have the mode of a pseudo register before it has a hard
diff --git a/gcc/regset.h b/gcc/regset.h
index 8a542ed6182..d0955991930 100644
--- a/gcc/regset.h
+++ b/gcc/regset.h
@@ -30,8 +30,6 @@ along with GCC; see the file COPYING3. If not see
the latter option, a good start would be to change everything allocated
on the reg_obstack to regset. */
-#include "bitmap.h" /* For bitmap_iterator. */
-#include "hard-reg-set.h"
/* Head of register set linked list. */
typedef bitmap_head regset_head;
diff --git a/gcc/regstat.c b/gcc/regstat.c
index 0ae78e9b00d..d7307b3a870 100644
--- a/gcc/regstat.c
+++ b/gcc/regstat.c
@@ -22,20 +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 "backend.h"
#include "rtl.h"
+#include "df.h"
#include "tm_p.h"
#include "flags.h"
#include "regs.h"
#include "except.h"
-#include "hard-reg-set.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "timevar.h"
-#include "df.h"
struct regstat_n_sets_and_refs_t *regstat_n_sets_and_refs;
diff --git a/gcc/reload.c b/gcc/reload.c
index 1dc04bf0eb9..bf57707f60d 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -91,17 +91,15 @@ a register with any other reload. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "rtl-error.h"
#include "tm_p.h"
#include "insn-config.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -113,11 +111,6 @@ a register with any other reload. */
#include "insn-codes.h"
#include "optabs.h"
#include "recog.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
#include "reload.h"
#include "regs.h"
#include "addresses.h"
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 57837a1fc90..d4444fdad90 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -20,19 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
-#include "hard-reg-set.h"
#include "rtl-error.h"
#include "tm_p.h"
#include "obstack.h"
#include "insn-config.h"
#include "flags.h"
-#include "function.h"
-#include "symtab.h"
-#include "rtl.h"
#include "alias.h"
-#include "tree.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -45,13 +43,8 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "regs.h"
#include "addresses.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
-#include "basic-block.h"
-#include "df.h"
#include "reload.h"
#include "recog.h"
#include "except.h"
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 6de8a544df5..dd1cdfd61fe 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -103,16 +103,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -123,10 +121,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "conditions.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "regs.h"
#include "recog.h"
#include "obstack.h"
diff --git a/gcc/resource.c b/gcc/resource.c
index 37b53a2daa3..a8b449fd304 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -20,24 +20,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "regs.h"
#include "flags.h"
#include "output.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "predict.h"
-#include "basic-block.h"
#include "resource.h"
#include "except.h"
#include "insn-attr.h"
#include "params.h"
-#include "df.h"
#include "emit-rtl.h"
/* This structure is used to record liveness information at the targets or
diff --git a/gcc/resource.h b/gcc/resource.h
index 1930124e423..4eb652c3e09 100644
--- a/gcc/resource.h
+++ b/gcc/resource.h
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_RESOURCE_H
#define GCC_RESOURCE_H
-#include "hard-reg-set.h"
-#include "df.h"
-
/* Macro to clear all resources. */
#define CLEAR_RESOURCE(RES) \
do { (RES)->memory = (RES)->volatil = (RES)->cc = 0; \
diff --git a/gcc/rtl-chkp.c b/gcc/rtl-chkp.c
index 0ad832386c0..91b60c4cbc4 100644
--- a/gcc/rtl-chkp.c
+++ b/gcc/rtl-chkp.c
@@ -21,14 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "symtab.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -39,14 +37,8 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "target.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "predict.h"
-#include "basic-block.h"
#include "fold-const.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "bitmap.h"
#include "rtl-chkp.h"
#include "tree-chkp.h"
diff --git a/gcc/rtl.h b/gcc/rtl.h
index d74c20fbed1..d711ddb9c87 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -38,7 +38,7 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#endif /* GENERATOR_FILE */
-#include "flags.h"
+#include "hard-reg-set.h"
/* Value used by some passes to "recognize" noop moves as valid
instructions. */
@@ -2880,9 +2880,7 @@ extern bool val_signbit_known_clear_p (machine_mode,
/* In reginfo.c */
extern machine_mode choose_hard_reg_mode (unsigned int, unsigned int,
bool);
-#ifdef HARD_CONST
extern const HARD_REG_SET &simplifiable_subregs (const subreg_shape &);
-#endif
/* In emit-rtl.c */
extern rtx set_for_reg_notes (rtx);
@@ -2939,10 +2937,8 @@ extern int reg_overlap_mentioned_p (const_rtx, const_rtx);
extern const_rtx set_of (const_rtx, const_rtx);
extern void record_hard_reg_sets (rtx, const_rtx, void *);
extern void record_hard_reg_uses (rtx *, void *);
-#ifdef HARD_CONST
extern void find_all_hard_regs (const_rtx, HARD_REG_SET *);
extern void find_all_hard_reg_sets (const rtx_insn *, HARD_REG_SET *, bool);
-#endif
extern void note_stores (const_rtx, void (*) (rtx, const_rtx, void *), void *);
extern void note_uses (rtx *, void (*) (rtx *, void *), void *);
extern int dead_or_set_p (const_rtx, const_rtx);
@@ -3572,9 +3568,7 @@ extern bool can_assign_to_reg_without_clobbers_p (rtx);
extern rtx fis_get_condition (rtx_insn *);
/* In ira.c */
-#ifdef HARD_CONST
extern HARD_REG_SET eliminable_regset;
-#endif
extern void mark_elimination (int, int);
/* In reginfo.c */
@@ -3590,9 +3584,7 @@ extern void init_reg_sets (void);
extern void regclass (rtx, int);
extern void reg_scan (rtx_insn *, unsigned int);
extern void fix_register (const char *, int, int);
-#ifdef HARD_CONST
extern const HARD_REG_SET *valid_mode_changes_for_regno (unsigned int);
-#endif
/* In reload1.c */
extern int function_invariant_p (const_rtx);
@@ -3709,7 +3701,6 @@ extern void _fatal_insn (const char *, const_rtx, const char *, int, const char
/* reginfo.c */
extern tree GTY(()) global_regs_decl[FIRST_PSEUDO_REGISTER];
-#ifdef HARD_CONST
/* Information about the function that is propagated by the RTL backend.
Available only for functions that has been already assembled. */
@@ -3723,7 +3714,6 @@ struct GTY(()) cgraph_rtl_info {
/* Set if function_used_regs is valid. */
unsigned function_used_regs_valid: 1;
};
-#endif
#endif /* ! GCC_RTL_H */
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 65962e8e331..b8a6cf3c52a 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -21,10 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
-#include "hard-reg-set.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "insn-config.h"
#include "recog.h"
#include "target.h"
@@ -32,12 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "flags.h"
#include "regs.h"
-#include "function.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "df.h"
-#include "symtab.h"
-#include "tree.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
#include "addresses.h"
#include "rtl-iter.h"
diff --git a/gcc/rtlhooks.c b/gcc/rtlhooks.c
index 8202f291b81..0c6998124e8 100644
--- a/gcc/rtlhooks.c
+++ b/gcc/rtlhooks.c
@@ -23,12 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "rtlhooks-def.h"
-#include "symtab.h"
-#include "hard-reg-set.h"
+#include "tree.h"
#include "function.h"
#include "flags.h"
#include "alias.h"
-#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/sanopt.c b/gcc/sanopt.c
index b3e8ae9ff73..269c11d31a7 100644
--- a/gcc/sanopt.c
+++ b/gcc/sanopt.c
@@ -22,21 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "tree-pass.h"
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index b62dc00a583..fa4bf5a87bc 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -23,27 +23,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h" /* FIXME: Used by call_may_noreturn_p. */
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
#include "except.h"
#include "recog.h"
#include "emit-rtl.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgbuild.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "params.h"
#include "alloc-pool.h"
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index 03767e6c841..b6109eac212 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -22,13 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
#include "profile.h"
#include "flags.h"
#include "insn-config.h"
@@ -36,12 +35,8 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "recog.h"
#include "params.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfgbuild.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "target.h"
diff --git a/gcc/sched-int.h b/gcc/sched-int.h
index 216cd58603f..61825ce5689 100644
--- a/gcc/sched-int.h
+++ b/gcc/sched-int.h
@@ -21,12 +21,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_SCHED_INT_H
#define GCC_SCHED_INT_H
-#include "insn-attr.h"
-
#ifdef INSN_SCHEDULING
-#include "df.h"
-
/* Identificator of a scheduler pass. */
enum sched_pass_id_t { SCHED_PASS_UNKNOWN, SCHED_RGN_PASS, SCHED_EBB_PASS,
SCHED_SMS_PASS, SCHED_SEL_PASS };
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index ccdde706ea7..ce2c1724fff 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -46,13 +46,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
#include "profile.h"
#include "flags.h"
#include "insn-config.h"
@@ -60,11 +59,7 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "recog.h"
#include "params.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "predict.h"
-#include "basic-block.h"
#include "sched-int.h"
#include "sel-sched.h"
#include "target.h"
diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index 8b77238e9d8..f115e0a061e 100644
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -26,17 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h" /* FIXME: To dump INSN_VAR_LOCATION_DECL. */
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
+#include "tree.h"
#include "dumpfile.h" /* for the TDF_* flags */
#include "pretty-print.h"
diff --git a/gcc/sdbout.c b/gcc/sdbout.c
index 84823d6598b..ba7e9f998ee 100644
--- a/gcc/sdbout.c
+++ b/gcc/sdbout.c
@@ -45,7 +45,6 @@ AT&T C compiler. From the example below I would conclude the following:
#include "tm.h"
#include "debug.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
diff --git a/gcc/sel-sched-dump.c b/gcc/sel-sched-dump.c
index 87d4dc5727d..bc1cdadaf5e 100644
--- a/gcc/sel-sched-dump.c
+++ b/gcc/sel-sched-dump.c
@@ -20,17 +20,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
@@ -40,6 +35,9 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#ifdef INSN_SCHEDULING
+#include "regset.h"
+#include "sched-int.h"
+#include "cfgloop.h"
#include "sel-sched-ir.h"
#include "sel-sched-dump.h"
diff --git a/gcc/sel-sched-dump.h b/gcc/sel-sched-dump.h
index 8239f27894d..5f77a087d17 100644
--- a/gcc/sel-sched-dump.h
+++ b/gcc/sel-sched-dump.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_SEL_SCHED_DUMP_H
#define GCC_SEL_SCHED_DUMP_H
-#include "sel-sched-ir.h"
/* These values control the dumping of control flow graph to the .dot file. */
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index f9b7655af12..2926b67afcc 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -20,20 +20,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "diagnostic-core.h"
+#include "backend.h"
+#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "diagnostic-core.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "cfgbuild.h"
-#include "basic-block.h"
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
@@ -42,13 +38,13 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "target.h"
#include "sched-int.h"
-#include "symtab.h"
-#include "tree.h"
#include "langhooks.h"
#include "rtlhooks-def.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
#ifdef INSN_SCHEDULING
+#include "regset.h"
+#include "cfgloop.h"
#include "sel-sched-ir.h"
/* We don't have to use it except for sel_print_insn. */
#include "sel-sched-dump.h"
diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h
index 30d3fd878dc..0e7f5aa5d19 100644
--- a/gcc/sel-sched-ir.h
+++ b/gcc/sel-sched-ir.h
@@ -22,13 +22,7 @@ along with GCC; see the file COPYING3. If not see
#define GCC_SEL_SCHED_IR_H
/* For state_t. */
-#include "insn-attr.h"
-#include "regset.h"
/* For reg_note. */
-#include "rtl.h"
-#include "bitmap.h"
-#include "sched-int.h"
-#include "cfgloop.h"
/* tc_t is a short for target context. This is a state of the target
backend. */
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index be5d1d12e89..40dd503dae1 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -20,17 +20,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "rtl-error.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
#include "regs.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgbuild.h"
-#include "basic-block.h"
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
@@ -40,8 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "output.h"
#include "sched-int.h"
-#include "symtab.h"
-#include "tree.h"
#include "langhooks.h"
#include "rtlhooks-def.h"
#include "emit-rtl.h"
@@ -49,6 +44,8 @@ along with GCC; see the file COPYING3. If not see
#include "rtl-iter.h"
#ifdef INSN_SCHEDULING
+#include "regset.h"
+#include "cfgloop.h"
#include "sel-sched-ir.h"
#include "sel-sched-dump.h"
#include "sel-sched.h"
diff --git a/gcc/sese.c b/gcc/sese.c
index 2ba2f980ca0..8e5b9064d13 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -23,33 +23,21 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "tree-pretty-print.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop.h"
#include "tree-into-ssa.h"
#include "cfgloop.h"
diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index 51c0e7bfd71..a357aa3b776 100644
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -22,20 +22,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "rtl-error.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "stringpool.h"
#include "flags.h"
#include "except.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -57,12 +55,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "gimplify.h"
#include "tree-pass.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
-#include "basic-block.h"
-#include "df.h"
#include "params.h"
#include "bb-reorder.h"
#include "shrink-wrap.h"
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index ca8310d1556..9e5e307338a 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -21,20 +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 "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "function.h"
#include "insn-codes.h"
#include "optabs.h"
#include "expmed.h"
@@ -46,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "diagnostic-core.h"
#include "target.h"
-#include "predict.h"
/* Simplification and canonicalization of RTL. */
diff --git a/gcc/ssa.h b/gcc/ssa.h
new file mode 100644
index 00000000000..dcb40f1919d
--- /dev/null
+++ b/gcc/ssa.h
@@ -0,0 +1,32 @@
+/* Common SSA files
+ Copyright (C) 2015 Free Software Foundation, Inc.
+
+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_SSA_H
+#define GCC_SSA_H
+
+/* This is an aggregation header file. This means it should contain only
+ other include files. */
+
+#include "stringpool.h"
+#include "gimple-ssa.h"
+#include "tree-ssanames.h"
+#include "tree-phinodes.h"
+#include "ssa-iterators.h"
+
+#endif /* GCC_SSA_H */
diff --git a/gcc/stack-ptr-mod.c b/gcc/stack-ptr-mod.c
index 469722ea204..4c849122d28 100644
--- a/gcc/stack-ptr-mod.c
+++ b/gcc/stack-ptr-mod.c
@@ -20,14 +20,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
#include "rtl.h"
+#include "df.h"
+#include "alias.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -39,12 +37,7 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tree-pass.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "output.h"
-#include "df.h"
/* Determine if the stack pointer is constant over the life of the function.
Only useful before prologues have been emitted. */
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 053ffb0c2a0..6fb72337d18 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -25,20 +25,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
-#include "hard-reg-set.h"
+
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
#include "tm_p.h"
#include "flags.h"
#include "except.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -52,16 +50,11 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "output.h"
#include "langhooks.h"
-#include "predict.h"
#include "insn-codes.h"
#include "optabs.h"
#include "target.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "regs.h"
#include "alloc-pool.h"
#include "pretty-print.h"
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 4674f5ddda6..0d4f4a41355 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -33,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index 802c6004d4e..a990c03f191 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -20,29 +20,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "rtl.h"
+#include "df.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "tm_p.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
#include "lcm.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -54,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "intl.h"
#include "tree-pass.h"
-#include "df.h"
#include "dbgcnt.h"
#include "rtl-iter.h"
diff --git a/gcc/stringpool.c b/gcc/stringpool.c
index 393834afcd5..291d355992a 100644
--- a/gcc/stringpool.c
+++ b/gcc/stringpool.c
@@ -30,9 +30,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "ggc-internal.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "cpplib.h"
/* The "" allocated string. */
diff --git a/gcc/symtab.c b/gcc/symtab.c
index b427827b446..8abe0608c29 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -21,23 +21,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
#include "varasm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "emit-rtl.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "tree-inline.h"
#include "langhooks.h"
#include "cgraph.h"
diff --git a/gcc/target-globals.c b/gcc/target-globals.c
index 608601edb44..e174815fc2b 100644
--- a/gcc/target-globals.c
+++ b/gcc/target-globals.c
@@ -20,20 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "insn-config.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "toplev.h"
#include "target-globals.h"
#include "flags.h"
-#include "regs.h"
#include "rtl.h"
-#include "hard-reg-set.h"
+#include "regs.h"
#include "reload.h"
#include "expmed.h"
-#include "function.h"
#include "dojump.h"
#include "explow.h"
#include "calls.h"
@@ -45,6 +42,8 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "libfuncs.h"
#include "cfgloop.h"
+#include "ira.h"
+#include "alloc-pool.h"
#include "ira-int.h"
#include "builtins.h"
#include "gcse.h"
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 80f31767b2d..3eca47e9888 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -52,12 +52,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 3d943a07816..d7c50c203ea 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -25,26 +25,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
#include "tree-inline.h"
#include "realmpfr.h" /* For GMP/MPFR/MPC versions, in print_version. */
#include "version.h"
-#include "rtl.h"
#include "tm_p.h"
#include "flags.h"
#include "insn-attr.h"
#include "insn-config.h"
#include "insn-flags.h"
-#include "hard-reg-set.h"
#include "recog.h"
#include "output.h"
#include "except.h"
-#include "function.h"
#include "toplev.h"
#include "expmed.h"
#include "dojump.h"
@@ -70,8 +68,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "cfgloop.h" /* for init_set_costs */
#include "hosthooks.h"
-#include "predict.h"
-#include "basic-block.h"
#include "cgraph.h"
#include "opts.h"
#include "opts-diagnostic.h"
@@ -80,16 +76,12 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "asan.h"
#include "tsan.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "plugin.h"
#include "context.h"
#include "pass_manager.h"
#include "auto-profile.h"
#include "dwarf2out.h"
-#include "bitmap.h"
#include "ipa-reference.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
diff --git a/gcc/tracer.c b/gcc/tracer.c
index 79cfd8d4dcf..f7947635b62 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -36,28 +36,19 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
+#include "gimple.h"
#include "rtl.h"
-#include "hard-reg-set.h"
+#include "alias.h"
+#include "fold-const.h"
#include "profile.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "flags.h"
#include "params.h"
#include "coverage.h"
#include "tree-pass.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-cfg.h"
#include "tree-ssa.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index c809a2ee499..287283f1362 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -21,34 +21,23 @@
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "calls.h"
-#include "rtl.h"
#include "emit-rtl.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "tree-inline.h"
diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index 4ec801218ab..3ce22b64670 100644
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.c
@@ -21,14 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "gimple.h"
#include "rtl.h"
+#include "options.h"
+#include "fold-const.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -41,12 +39,7 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tree-pretty-print.h"
#include "tree-affine.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "dumpfile.h"
#include "cfgexpand.h"
diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
index 6a1a9f33be9..a73131d6b6d 100644
--- a/gcc/tree-browser.c
+++ b/gcc/tree-browser.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "tree-pretty-print.h"
#include "print-tree.h"
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index 03a8b1e2277..8c37143f8e8 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -21,28 +21,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "predict.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "symtab.h"
+#include "ssa.h"
#include "alias.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "flags.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index b7c4026b684..e90ca3d81c8 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -21,44 +21,31 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "trans-mem.h"
#include "stor-layout.h"
#include "print-tree.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "flags.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
#include "tree-into-ssa.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 07e2d7465b0..123e34c63db 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -20,38 +20,25 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "diagnostic-core.h"
#include "flags.h"
#include "langhooks.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-chkp-opt.c b/gcc/tree-chkp-opt.c
index 4f9d8803e3a..0ec2b8a3c5b 100644
--- a/gcc/tree-chkp-opt.c
+++ b/gcc/tree-chkp-opt.c
@@ -22,38 +22,24 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "target.h"
#include "tree-cfg.h"
#include "tree-pass.h"
#include "cfgloop.h"
-#include "stringpool.h"
-#include "tree-ssa-alias.h"
-#include "tree-ssanames.h"
-#include "tree-ssa-operands.h"
#include "tree-ssa-address.h"
#include "tree-ssa.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "tree-ssa-loop-niter.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "tree-phinodes.h"
-#include "gimple-ssa.h"
-#include "ssa-iterators.h"
#include "gimple-pretty-print.h"
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimplify-me.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c
index 2d5249579f9..731947ae5af 100644
--- a/gcc/tree-chkp.c
+++ b/gcc/tree-chkp.c
@@ -22,9 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -35,31 +38,14 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "diagnostic.h"
#include "cfgloop.h"
-#include "stringpool.h"
-#include "tree-ssa-alias.h"
-#include "tree-ssanames.h"
-#include "tree-ssa-operands.h"
#include "tree-ssa-address.h"
#include "tree-ssa.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "tree-ssa-loop-niter.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "tree-phinodes.h"
-#include "gimple-ssa.h"
-#include "ssa-iterators.h"
#include "gimple-pretty-print.h"
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimplify-me.h"
#include "print-tree.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -73,7 +59,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-fold.h"
#include "tree-chkp.h"
#include "gimple-walk.h"
-#include "rtl.h" /* For MEM_P, assign_temp. */
#include "tree-dfa.h"
#include "lto-streamer.h"
#include "cgraph.h"
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index b179e522468..a87da689262 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -27,19 +27,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "fold-const.h"
#include "tree-pretty-print.h"
+#include "backend.h"
#include "cfgloop.h"
-#include "predict.h"
-#include "tm.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-expr.h"
#include "tree-ssa-loop-ivopts.h"
#include "tree-ssa-loop-niter.h"
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index a2bacc6bda9..fae85b6d98e 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.c
@@ -20,34 +20,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-core.h b/gcc/tree-core.h
index f23abe2bb43..ecefdb97998 100644
--- a/gcc/tree-core.h
+++ b/gcc/tree-core.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_CORE_H
#define GCC_TREE_CORE_H
+#include "symtab.h"
+
/* This file contains all the data structures that define the 'tree' type.
There are no accessor macros nor functions in this file. Only the
basic data structures, extern declarations and type definitions. */
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index cc79a7f6fb5..e6ff4efae34 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -77,14 +77,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "gimple.h"
#include "rtl.h"
+#include "options.h"
+#include "fold-const.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -96,14 +94,7 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "gimple-pretty-print.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 8bc968a073f..9fcc450f896 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -21,34 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "langhooks.h"
#include "flags.h"
#include "tree-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-diagnostic.c b/gcc/tree-diagnostic.c
index 09ffe0c4221..79048c5efda 100644
--- a/gcc/tree-diagnostic.c
+++ b/gcc/tree-diagnostic.c
@@ -23,9 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "diagnostic.h"
#include "tree-pretty-print.h"
#include "tree-diagnostic.h"
diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c
index 9b3494f7ba8..3b8046292d4 100644
--- a/gcc/tree-dump.c
+++ b/gcc/tree-dump.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "splay-tree.h"
#include "filenames.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index d3d46bc16ba..f62fb067cf3 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -20,14 +20,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
+#include "fold-const.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -39,25 +38,13 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "except.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-inline.h"
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index 8308643ef8b..5415e77ef9f 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -21,32 +21,20 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "tree-pass.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "langhooks.h"
#include "target.h"
#include "targhooks.h"
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 003f1ddecd2..93d30ef8a09 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -83,34 +83,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "cfgloop.h"
@@ -121,7 +109,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-address.h"
#include "tree-pass.h"
#include "dbgcnt.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 6f138edc7f7..012e536ffe6 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -21,11 +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 "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "diagnostic-core.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
@@ -34,33 +36,18 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "insn-config.h"
#include "langhooks.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "tree-iterator.h"
#include "intl.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "rtl.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -84,7 +71,6 @@ along with GCC; see the file COPYING3. If not see
#include "builtins.h"
#include "tree-chkp.h"
-#include "rtl.h" /* FIXME: For asm_str_count. */
/* I'm not real happy about this, but we need to handle gimple and
non-gimple trees. */
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 24cca2cf9b1..cc77618e73a 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -21,35 +21,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "flags.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-iterator.c b/gcc/tree-iterator.c
index d42ae440752..4dfbd177f44 100644
--- a/gcc/tree-iterator.c
+++ b/gcc/tree-iterator.c
@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
#include "tree.h"
+#include "options.h"
#include "tree-iterator.h"
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 19523b941d2..95a39f48ea2 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -45,31 +45,19 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "stor-layout.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop.h"
#include "tree-into-ssa.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 6b9d753ee52..6b750208dfd 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -20,32 +20,24 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "tree-dump.h"
#include "tree-inline.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "tree-iterator.h"
-#include "bitmap.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index a75e22f788e..3d316a53a7d 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -20,27 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
+#include "ssa.h"
+#include "alias.h"
+#include "fold-const.h"
#include "tree-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "flags.h" /* For "optimize" in gate_pass_return_slot.
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index e48ee644579..ebfb9694d65 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -21,34 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tree-object-size.h"
#include "diagnostic-core.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "builtins.h"
struct object_size_info
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index f985f4d1c24..a253bb9bb2a 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -21,35 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "sbitmap.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "dumpfile.h"
#include "diagnostic-core.h"
#include "tree-ssa-live.h"
@@ -59,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
/* FIXME: A lot of code here deals with expanding to RTL. All that code
should be in cfgexpand.c. */
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index aecee69c473..846077a2080 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -23,33 +23,21 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "stor-layout.h"
#include "tree-nested.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-ivopts.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index a2eba221bf4..ef3feb23389 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -20,25 +20,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "ssa.h"
+#include "alias.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa.h"
#include "diagnostic-core.h"
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index eadad7e0ad2..7751c5f9368 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -187,38 +187,25 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
#include "cfgloop.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.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 "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index eb361c0ac24..781e475c511 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "stor-layout.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
@@ -41,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tree-pretty-print.h"
#include "gimple-expr.h"
-#include "predict.h"
#include "cgraph.h"
#include "langhooks.h"
#include "tree-iterator.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index bcb5cb9953f..b6f7a3968e7 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -27,34 +27,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "flags.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
+#include "ssa.h"
+#include "flags.h"
#include "diagnostic-core.h"
#include "coverage.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "varasm.h"
#include "tree-nested.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-pass.h"
#include "value-prof.h"
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 676fbe8c863..321916028bb 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -257,14 +257,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -276,22 +275,11 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "gimple-pretty-print.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-ivopts.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index e648061b2dc..3d26c1e7154 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -75,35 +75,21 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alloc-pool.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "stor-layout.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-walk.h"
-#include "bitmap.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index 367c9f4265d..910ee3c9889 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -23,28 +23,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
#include "tree-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "stringpool.h"
#include "tree-ssanames.h"
#include "tree-ssa-loop-ivopts.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 8376e3bd0fc..e103220d807 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -21,33 +21,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
#include "target.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "dominance.h"
-#include "basic-block.h"
#include "timevar.h" /* for TV_ALIAS_STMT_WALK */
#include "langhooks.h"
#include "flags.h"
#include "tree-pretty-print.h"
#include "dumpfile.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -61,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "params.h"
#include "alloc-pool.h"
-#include "bitmap.h"
#include "cgraph.h"
#include "ipa-reference.h"
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 05a3e57333e..a18caa1bf3c 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -121,35 +121,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
#include "value-prof.h"
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index ee30c5ca9e8..bd2b97e42d4 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -21,31 +21,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "flags.h"
#include "tree-pretty-print.h"
-#include "bitmap.h"
#include "dumpfile.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-live.h"
#include "tree-ssa-coalesce.h"
#include "diagnostic-core.h"
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index 68fd5d64ee3..f5d10ae5d2e 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -20,31 +20,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
#include "langhooks.h"
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index ef11f687054..aeb7f28f03b 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -21,29 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "flags.h"
#include "tree-pretty-print.h"
-#include "bitmap.h"
-#include "gimple-ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index 181626cf979..6c29d90c192 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -45,36 +45,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "calls.h"
#include "gimple-pretty-print.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-into-ssa.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 698f78a5239..c138d52c4ef 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -21,36 +21,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "cfgloop.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "domwalk.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index 35fd16ae199..4ad19b3bc60 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -20,32 +20,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index bd7c9fa8f12..1d596f3cf08 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -20,36 +20,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index f55a4528d49..3f0bc6e2739 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -21,35 +21,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
/* rtl is needed only because arm back-end requires it for
BRANCH_COST. */
-#include "rtl.h"
#include "tm_p.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "tree-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-pass.h"
#ifndef LOGICAL_OP_NON_SHORT_CIRCUIT
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 450cf90d2ef..fc7f34e2089 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -21,31 +21,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "sbitmap.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index 121e3d80bd3..dafa40d80eb 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -20,22 +20,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "tree-cfg.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 477f373e89d..8959b143771 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -20,33 +20,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop.h"
#include "tree-into-ssa.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 4b90196fdf7..7c11827e6b2 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -38,34 +38,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
#include "profile.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index a35ddabb275..ab5ca91c876 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -64,40 +64,27 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.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 "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 3fbb4563670..be58ae2e4fc 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -20,32 +20,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-ivopts.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index c5adb1c2d82..633e3d1f430 100644
--- a/gcc/tree-ssa-loop-niter.c
+++ b/gcc/tree-ssa-loop-niter.c
@@ -20,16 +20,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "stor-layout.h"
#include "fold-const.h"
#include "calls.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -40,22 +39,12 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tm_p.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "intl.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#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"
@@ -68,8 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "tree-inline.h"
#include "tree-pass.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "wide-int-print.h"
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index 441e4a9d1f0..a4e5b80afba 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.c
@@ -20,24 +20,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "tree-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
@@ -62,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
/* FIXME: Needed for optabs, but this should all be moved to a TBD interface
between the GIMPLE and RTL worlds. */
-#include "rtl.h"
#include "flags.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index 0be9142561e..596593bc623 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -20,27 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
-#include "gimple-ssa.h"
#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"
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index f2a3460eaa0..609aff9793b 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -20,22 +20,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "tree-ssa-loop-ivopts.h"
#include "tree-ssa-loop-manip.h"
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index 96361a6f196..bb3c2ef01a3 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -87,34 +87,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimplify-me.h"
#include "stor-layout.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -134,7 +121,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
/* FIXME: RTL headers have to be included here for optabs. */
-#include "rtl.h" /* Because optabs.h wants enum rtx_code. */
#include "expr.h" /* Because optabs.h wants sepops. */
#include "insn-codes.h"
#include "optabs.h"
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index f3abe54aba8..a132679a9c2 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -20,29 +20,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stmt.h"
#include "print-tree.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-inline.h"
#include "timevar.h"
#include "dumpfile.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 92b4ab00fb4..9014891e49f 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -20,35 +20,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index ba2c05f85bb..d5d1f2457bd 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -21,31 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index b4e34774f18..644fa267319 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -22,38 +22,25 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop.h"
#include "tree-into-ssa.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index 2f6736f5724..3f3a694702e 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -21,37 +21,23 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "dumpfile.h"
-#include "bitmap.h"
-#include "sbitmap.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa.h"
#include "tree-ssa-propagate.h"
#include "langhooks.h"
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index f243df51034..fac28a600e4 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -21,37 +21,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
#include "tm_p.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index e2b36a63930..637368b54f3 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -21,34 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-scopedtables.c b/gcc/tree-ssa-scopedtables.c
index 4c3e0436064..41bf8879448 100644
--- a/gcc/tree-ssa-scopedtables.c
+++ b/gcc/tree-ssa-scopedtables.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "tree-pretty-print.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index 069fae4ffa5..8108a163b58 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -21,30 +21,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-iterator.h"
#include "alloc-pool.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 1cbcb011cb0..0f6750a8a53 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -22,34 +22,20 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 5d72d875483..1cc6d55721e 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -21,34 +21,21 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "obstack.h"
-#include "bitmap.h"
-#include "sbitmap.h"
#include "flags.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stmt.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -64,8 +51,6 @@
#include "alloc-pool.h"
#include "splay-tree.h"
#include "params.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-pretty-print.h"
#include "gimple-walk.h"
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index 3c660f9f0bd..018a9660b75 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -188,33 +188,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "trans-mem.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
#include "cfgcleanup.h"
-#include "basic-block.h"
#include "flags.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-into-ssa.h"
#include "params.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index ed8d4bfd941..c6ff620846b 100644
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.c
@@ -22,29 +22,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "dumpfile.h"
#include "tree-ssa-live.h"
#include "tree-ssa-ter.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index f2e70cfe0b3..4ab161a7b45 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -21,32 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "basic-block.h"
#include "cfgloop.h"
#include "timevar.h"
#include "dumpfile.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-propagate.h"
#include "tree-ssa-threadupdate.h"
#include "langhooks.h"
@@ -55,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-threadedge.h"
#include "tree-ssa-loop.h"
#include "builtins.h"
-#include "cfg.h"
#include "cfganal.h"
/* To avoid code explosion due to jump threading, we limit the
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 4b190221097..8e86ee4d8ac 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -21,29 +21,19 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "flags.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
#include "tree-ssa.h"
#include "tree-ssa-threadupdate.h"
-#include "ssa-iterators.h"
#include "dumpfile.h"
#include "cfgloop.h"
#include "dbgcnt.h"
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index cf03a54ae54..437f69d36c3 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.c
@@ -20,30 +20,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "domwalk.h"
#include "tree-pass.h"
#include "tree-ssa-propagate.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index 405da31f9c2..46006f362d1 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -21,29 +21,18 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "flags.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "bitmap.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-ssa.h"
#include "tree-inline.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index cab627daa15..24989ad889f 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -20,36 +20,24 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
#include "tm_p.h"
#include "target.h"
#include "langhooks.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-into-ssa.h"
#include "tree-ssa.h"
diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index 98f7375b30b..b549b62a869 100644
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -20,25 +20,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index f3f41349f84..cd595a94f68 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -21,35 +21,21 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
+#include "ssa.h"
+#include "alias.h"
+#include "fold-const.h"
#include "langhooks.h"
#include "gimple-pretty-print.h"
#include "target.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
#include "gimplify.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "sbitmap.h"
#include "tree-cfg.h"
#include "tree-pass.h"
#include "tree-stdarg.h"
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 8d8818e5f3d..4ebfeaec008 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -24,20 +24,14 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "options.h"
#include "fold-const.h"
#include "stringpool.h"
-#include "predict.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "cgraph.h"
#include "tree-streamer.h"
#include "data-streamer.h"
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 28adfb0d850..dd910b47508 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -22,21 +22,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
#include "diagnostic.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "cgraph.h"
#include "tree-streamer.h"
#include "data-streamer.h"
diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c
index 7a7ea039e1a..c66e1743106 100644
--- a/gcc/tree-streamer.c
+++ b/gcc/tree-streamer.c
@@ -24,19 +24,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "streamer-hooks.h"
#include "cgraph.h"
#include "tree-streamer.h"
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 2f9ad27d31a..7305efc2ccc 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -25,35 +25,24 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "params.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "gimple-pretty-print.h"
#include "cfgloop.h"
@@ -63,7 +52,6 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "langhooks.h"
/* Need to include expr.h and optabs.h for lshift_cheap_p. */
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 476917e75d0..25936bb73db 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -20,32 +20,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 4f4cf4ead5b..26d7d8faa44 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -23,34 +23,22 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "dumpfile.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
#include "target.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-ivopts.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop.h"
@@ -61,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "cgraph.h"
/* Need to include rtl.h, expr.h, etc. for optabs. */
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index 1d20842827c..be3d27fbdf3 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.c
@@ -21,30 +21,20 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "tm.h"
#include "langhooks.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-iterator.h"
#include "tree-pass.h"
#include "flags.h"
@@ -52,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
/* Need to include rtl.h, expr.h, etc. for optabs. */
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 56314ed0773..cd7fb91032b 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -23,32 +23,20 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "dumpfile.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
+#include "ssa.h"
+#include "alias.h"
+#include "fold-const.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-into-ssa.h"
#include "tree-ssa.h"
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 1256fe2acf3..83a993f2690 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -23,38 +23,25 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "dumpfile.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.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 "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 1b6043cad33..f034635da86 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -21,33 +21,22 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "target.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "dominance.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "cfgloop.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index e85e80dbbd1..a2402276072 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -23,31 +23,20 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "dumpfile.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "target.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "cfgloop.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 5ac70231f3e..8504b4de25c 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -23,39 +23,26 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "dumpfile.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "target.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "cfgloop.h"
#include "tree-ssa-loop.h"
#include "tree-scalar-evolution.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index e49929ab888..7b524cb9f0e 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -58,29 +58,19 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "dumpfile.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tree-pretty-print.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
#include "tree-ssa-loop-manip.h"
#include "tree-cfg.h"
#include "cfgloop.h"
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index db1df37d471..db824c435bf 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -21,35 +21,23 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-walk.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
@@ -65,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-propagate.h"
#include "tree-chrec.h"
#include "tree-ssa-threadupdate.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index c0e2b0a2f13..8e6c465ac31 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -30,19 +30,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
#include "flags.h"
#include "alias.h"
-#include "symtab.h"
-#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "calls.h"
#include "attribs.h"
#include "varasm.h"
#include "tm_p.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "obstack.h"
#include "toplev.h" /* get_random_seed */
#include "filenames.h"
@@ -52,23 +52,10 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "tree-inline.h"
#include "tree-iterator.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "bitmap.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
#include "gimplify.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
-#include "tree-phinodes.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
-#include "rtl.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index c214310fd1d..56fb7b247f1 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -23,14 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
+#include "gimple.h"
#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -42,22 +41,12 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "intl.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimplify-me.h"
-#include "gimple-ssa.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "tree-iterator.h"
#include "langhooks.h"
diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 19eafabe8d9..1e3210428c2 100644
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -22,29 +22,20 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "options.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "stringpool.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfganal.h"
-#include "basic-block.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cgraph.h"
#include "tree-pass.h"
-#include "tree-ssa-alias.h"
#include "tree-pretty-print.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "gimple-walk.h"
#include "output.h"
#include "tm_p.h"
@@ -52,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "ubsan.h"
#include "c-family/c-common.h"
-#include "rtl.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -63,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "tree-ssanames.h"
#include "asan.h"
#include "gimplify-me.h"
#include "intl.h"
diff --git a/gcc/valtrack.c b/gcc/valtrack.c
index 80a00431969..dca4ffbafb6 100644
--- a/gcc/valtrack.c
+++ b/gcc/valtrack.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
-#include "predict.h"
-#include "basic-block.h"
+#include "df.h"
#include "valtrack.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "regs.h"
#include "emit-rtl.h"
diff --git a/gcc/valtrack.h b/gcc/valtrack.h
index 7223a431989..703d6ed03f2 100644
--- a/gcc/valtrack.h
+++ b/gcc/valtrack.h
@@ -22,10 +22,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_VALTRACK_H
#define GCC_VALTRACK_H
-#include "bitmap.h"
-#include "df.h"
-#include "rtl.h"
-
/* Debug uses of dead regs. */
/* Entry that maps a dead pseudo (REG) used in a debug insns that dies
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 0424149471b..20299183ec7 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -20,16 +20,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "rtl.h"
+#include "ssa.h"
+#include "alias.h"
#include "fold-const.h"
#include "tree-nested.h"
#include "calls.h"
-#include "rtl.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "expmed.h"
@@ -39,28 +38,16 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "value-prof.h"
#include "recog.h"
#include "insn-codes.h"
#include "optabs.h"
#include "regs.h"
-#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
#include "tree-cfg.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
#include "coverage.h"
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index ebd0cfa7a7c..b7ecea8092a 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -88,26 +88,18 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
-#include "basic-block.h"
#include "tm_p.h"
#include "flags.h"
#include "insn-config.h"
#include "reload.h"
-#include "sbitmap.h"
#include "alloc-pool.h"
#include "regs.h"
#include "expmed.h"
@@ -118,7 +110,6 @@
#include "stmt.h"
#include "expr.h"
#include "tree-pass.h"
-#include "bitmap.h"
#include "tree-dfa.h"
#include "tree-ssa.h"
#include "cselib.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 3e760322b3b..b69b3a3885f 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -28,18 +28,15 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
#include "rtl.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "varasm.h"
#include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -57,10 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "targhooks.h"
-#include "predict.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
#include "cgraph.h"
#include "asan.h"
#include "rtl-iter.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 58cbbb8826f..10fa93c9ef8 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -21,16 +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 "alias.h"
-#include "symtab.h"
+#include "backend.h"
#include "tree.h"
+#include "gimple.h"
+#include "hard-reg-set.h"
+#include "alias.h"
#include "fold-const.h"
#include "varasm.h"
-#include "predict.h"
-#include "basic-block.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "cgraph.h"
#include "langhooks.h"
#include "diagnostic-core.h"
@@ -38,10 +35,7 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "target.h"
#include "output.h"
-#include "gimple-expr.h"
#include "flags.h"
-#include "tree-ssa-alias.h"
-#include "gimple.h"
#include "lto-streamer.h"
#include "context.h"
#include "omp-low.h"
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index bd2ccf1da4d..f3ebd757a40 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#ifdef VMS_DEBUGGING_INFO
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "varasm.h"
#include "version.h"
@@ -36,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "vmsdbg.h"
#include "debug.h"
#include "langhooks.h"
-#include "hard-reg-set.h"
#include "function.h"
#include "target.h"
diff --git a/gcc/vtable-verify.c b/gcc/vtable-verify.c
index 8e24c924cc2..46506af36d2 100644
--- a/gcc/vtable-verify.c
+++ b/gcc/vtable-verify.c
@@ -136,27 +136,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "backend.h"
#include "tree.h"
-#include "fold-const.h"
-#include "predict.h"
-#include "tm.h"
+#include "gimple.h"
#include "hard-reg-set.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
+#include "ssa.h"
+#include "options.h"
+#include "fold-const.h"
#include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
#include "gimple-iterator.h"
-#include "gimple-ssa.h"
-#include "tree-phinodes.h"
-#include "ssa-iterators.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "tree-pass.h"
#include "cfgloop.h"
diff --git a/gcc/web.c b/gcc/web.c
index 7ffe63399ce..0ea2752b22c 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -36,19 +36,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "rtl.h"
+#include "df.h"
#include "diagnostic-core.h"
-#include "rtl.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "obstack.h"
-#include "predict.h"
-#include "function.h"
-#include "dominance.h"
-#include "cfg.h"
-#include "basic-block.h"
-#include "df.h"
#include "insn-config.h"
#include "recog.h"
#include "tree-pass.h"
diff --git a/gcc/wide-int.cc b/gcc/wide-int.cc
index 199206f41e0..13ba10c866f 100644
--- a/gcc/wide-int.cc
+++ b/gcc/wide-int.cc
@@ -25,9 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "hwint.h"
#include "vec.h"
#include "alias.h"
-#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
+#include "inchash.h"
#include "dumpfile.h"
diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c
index 73e3d23827d..0f11115c579 100644
--- a/gcc/xcoffout.c
+++ b/gcc/xcoffout.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "alias.h"
-#include "symtab.h"
#include "tree.h"
#include "varasm.h"
#include "rtl.h"