aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog476
-rw-r--r--gcc/ada/ChangeLog10
-rw-r--r--gcc/ada/gcc-interface/cuintp.c1
-rw-r--r--gcc/ada/gcc-interface/decl.c1
-rw-r--r--gcc/ada/gcc-interface/misc.c2
-rw-r--r--gcc/ada/gcc-interface/targtyps.c1
-rw-r--r--gcc/ada/gcc-interface/trans.c1
-rw-r--r--gcc/ada/gcc-interface/utils.c1
-rw-r--r--gcc/ada/gcc-interface/utils2.c1
-rw-r--r--gcc/alias.c6
-rw-r--r--gcc/alloc-pool.c2
-rw-r--r--gcc/alloc-pool.h1
-rw-r--r--gcc/asan.c7
-rw-r--r--gcc/attribs.c5
-rw-r--r--gcc/auto-inc-dec.c5
-rw-r--r--gcc/auto-profile.c7
-rw-r--r--gcc/bb-reorder.c6
-rw-r--r--gcc/bitmap.c6
-rw-r--r--gcc/bitmap.h3
-rw-r--r--gcc/bt-load.c5
-rw-r--r--gcc/builtins.c5
-rw-r--r--gcc/c-family/ChangeLog24
-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.c4
-rw-r--r--gcc/c-family/c-common.h6
-rw-r--r--gcc/c-family/c-cppbuiltin.c3
-rw-r--r--gcc/c-family/c-dump.c3
-rw-r--r--gcc/c-family/c-format.c3
-rw-r--r--gcc/c-family/c-gimplify.c7
-rw-r--r--gcc/c-family/c-indentation.c3
-rw-r--r--gcc/c-family/c-lex.c3
-rw-r--r--gcc/c-family/c-omp.c3
-rw-r--r--gcc/c-family/c-opts.c3
-rw-r--r--gcc/c-family/c-pch.c4
-rw-r--r--gcc/c-family/c-ppoutput.c3
-rw-r--r--gcc/c-family/c-pragma.c7
-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.c7
-rw-r--r--gcc/c-family/cilk.c8
-rw-r--r--gcc/c-family/stub-objc.c3
-rw-r--r--gcc/c/ChangeLog13
-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.c8
-rw-r--r--gcc/c/c-errors.c3
-rw-r--r--gcc/c/c-lang.c3
-rw-r--r--gcc/c/c-lang.h1
-rw-r--r--gcc/c/c-objc-common.c3
-rw-r--r--gcc/c/c-parser.c8
-rw-r--r--gcc/c/c-typeck.c6
-rw-r--r--gcc/caller-save.c6
-rw-r--r--gcc/calls.c6
-rw-r--r--gcc/ccmp.c5
-rw-r--r--gcc/cfg.c8
-rw-r--r--gcc/cfganal.c3
-rw-r--r--gcc/cfgbuild.c5
-rw-r--r--gcc/cfgcleanup.c5
-rw-r--r--gcc/cfgexpand.c6
-rw-r--r--gcc/cfghooks.c6
-rw-r--r--gcc/cfgloop.c4
-rw-r--r--gcc/cfgloop.h3
-rw-r--r--gcc/cfgloopanal.c5
-rw-r--r--gcc/cfgloopmanip.c4
-rw-r--r--gcc/cfgrtl.c6
-rw-r--r--gcc/cgraph.c6
-rw-r--r--gcc/cgraphbuild.c4
-rw-r--r--gcc/cgraphclones.c4
-rw-r--r--gcc/cgraphunit.c4
-rw-r--r--gcc/cilk-common.c5
-rw-r--r--gcc/combine-stack-adj.c5
-rw-r--r--gcc/combine.c6
-rw-r--r--gcc/compare-elim.c3
-rw-r--r--gcc/config/aarch64/aarch64-builtins.c7
-rw-r--r--gcc/config/aarch64/aarch64.c7
-rw-r--r--gcc/config/aarch64/cortex-a57-fma-steering.c2
-rw-r--r--gcc/config/alpha/alpha.c8
-rw-r--r--gcc/config/arc/arc.c6
-rw-r--r--gcc/config/arm/aarch-common.c3
-rw-r--r--gcc/config/arm/arm-builtins.c6
-rw-r--r--gcc/config/arm/arm-c.c3
-rw-r--r--gcc/config/arm/arm.c8
-rw-r--r--gcc/config/avr/avr-c.c3
-rw-r--r--gcc/config/avr/avr-log.c3
-rw-r--r--gcc/config/avr/avr.c6
-rw-r--r--gcc/config/bfin/bfin.c7
-rw-r--r--gcc/config/c6x/c6x.c7
-rw-r--r--gcc/config/cr16/cr16.c5
-rw-r--r--gcc/config/cris/cris.c7
-rw-r--r--gcc/config/darwin-c.c7
-rw-r--r--gcc/config/darwin.c8
-rw-r--r--gcc/config/default-c.c3
-rw-r--r--gcc/config/epiphany/epiphany.c6
-rw-r--r--gcc/config/epiphany/mode-switch-use.c3
-rw-r--r--gcc/config/epiphany/resolve-sw-modes.c3
-rw-r--r--gcc/config/fr30/fr30.c5
-rw-r--r--gcc/config/frv/frv.c6
-rw-r--r--gcc/config/ft32/ft32.c4
-rw-r--r--gcc/config/glibc-c.c3
-rw-r--r--gcc/config/h8300/h8300.c6
-rw-r--r--gcc/config/i386/i386-c.c4
-rw-r--r--gcc/config/i386/i386.c8
-rw-r--r--gcc/config/i386/msformat-c.c3
-rw-r--r--gcc/config/i386/winnt-cxx.c4
-rw-r--r--gcc/config/i386/winnt-stubs.c4
-rw-r--r--gcc/config/i386/winnt.c8
-rw-r--r--gcc/config/ia64/ia64-c.c3
-rw-r--r--gcc/config/ia64/ia64.c7
-rw-r--r--gcc/config/iq2000/iq2000.c6
-rw-r--r--gcc/config/lm32/lm32.c6
-rw-r--r--gcc/config/m32c/m32c-pragma.c3
-rw-r--r--gcc/config/m32c/m32c.c7
-rw-r--r--gcc/config/m32r/m32r.c6
-rw-r--r--gcc/config/m68k/m68k.c6
-rw-r--r--gcc/config/mcore/mcore.c6
-rw-r--r--gcc/config/mep/mep-pragma.c3
-rw-r--r--gcc/config/mep/mep.c7
-rw-r--r--gcc/config/microblaze/microblaze-c.c3
-rw-r--r--gcc/config/microblaze/microblaze.c7
-rw-r--r--gcc/config/mips/mips.c8
-rw-r--r--gcc/config/mmix/mmix.c6
-rw-r--r--gcc/config/mn10300/mn10300.c5
-rw-r--r--gcc/config/moxie/moxie.c6
-rw-r--r--gcc/config/msp430/msp430-c.c3
-rw-r--r--gcc/config/msp430/msp430.c6
-rw-r--r--gcc/config/nds32/nds32-cost.c6
-rw-r--r--gcc/config/nds32/nds32-fp-as-gp.c6
-rw-r--r--gcc/config/nds32/nds32-intrinsic.c6
-rw-r--r--gcc/config/nds32/nds32-isr.c6
-rw-r--r--gcc/config/nds32/nds32-md-auxiliary.c6
-rw-r--r--gcc/config/nds32/nds32-memory-manipulation.c6
-rw-r--r--gcc/config/nds32/nds32-pipelines-auxiliary.c6
-rw-r--r--gcc/config/nds32/nds32-predicates.c6
-rw-r--r--gcc/config/nds32/nds32.c6
-rw-r--r--gcc/config/nios2/nios2.c6
-rw-r--r--gcc/config/nvptx/nvptx.c6
-rw-r--r--gcc/config/pa/pa.c6
-rw-r--r--gcc/config/pdp11/pdp11.c5
-rw-r--r--gcc/config/rl78/rl78-c.c3
-rw-r--r--gcc/config/rl78/rl78.c6
-rw-r--r--gcc/config/rs6000/rs6000-c.c3
-rw-r--r--gcc/config/rs6000/rs6000.c8
-rw-r--r--gcc/config/rx/rx.c7
-rw-r--r--gcc/config/s390/s390-c.c3
-rw-r--r--gcc/config/s390/s390.c7
-rw-r--r--gcc/config/sh/sh-c.c3
-rw-r--r--gcc/config/sh/sh-mem.cc5
-rw-r--r--gcc/config/sh/sh.c7
-rw-r--r--gcc/config/sh/sh_optimize_sett_clrt.cc3
-rw-r--r--gcc/config/sh/sh_treg_combine.cc5
-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.c5
-rw-r--r--gcc/config/sparc/sparc-c.c3
-rw-r--r--gcc/config/sparc/sparc.c7
-rw-r--r--gcc/config/spu/spu-c.c3
-rw-r--r--gcc/config/spu/spu.c7
-rw-r--r--gcc/config/stormy16/stormy16.c7
-rw-r--r--gcc/config/tilegx/mul-tables.c5
-rw-r--r--gcc/config/tilegx/tilegx-c.c3
-rw-r--r--gcc/config/tilegx/tilegx.c7
-rw-r--r--gcc/config/tilepro/mul-tables.c5
-rw-r--r--gcc/config/tilepro/tilepro-c.c3
-rw-r--r--gcc/config/tilepro/tilepro.c7
-rw-r--r--gcc/config/v850/v850-c.c4
-rw-r--r--gcc/config/v850/v850.c6
-rw-r--r--gcc/config/vax/vax.c5
-rw-r--r--gcc/config/visium/visium.c6
-rw-r--r--gcc/config/vms/vms-c.c4
-rw-r--r--gcc/config/vms/vms.c4
-rw-r--r--gcc/config/vxworks.c3
-rw-r--r--gcc/config/winnt-c.c3
-rw-r--r--gcc/config/xtensa/xtensa.c7
-rw-r--r--gcc/context.c1
-rw-r--r--gcc/convert.c3
-rw-r--r--gcc/coretypes.h4
-rw-r--r--gcc/coverage.c8
-rw-r--r--gcc/cp/ChangeLog39
-rw-r--r--gcc/cp/call.c4
-rw-r--r--gcc/cp/class.c5
-rw-r--r--gcc/cp/constexpr.c3
-rw-r--r--gcc/cp/cp-array-notation.c4
-rw-r--r--gcc/cp/cp-cilkplus.c1
-rw-r--r--gcc/cp/cp-gimplify.c3
-rw-r--r--gcc/cp/cp-lang.c4
-rw-r--r--gcc/cp/cp-objcp-common.c3
-rw-r--r--gcc/cp/cp-tree.h5
-rw-r--r--gcc/cp/cp-ubsan.c3
-rw-r--r--gcc/cp/cvt.c3
-rw-r--r--gcc/cp/decl.c5
-rw-r--r--gcc/cp/decl2.c4
-rw-r--r--gcc/cp/dump.c3
-rw-r--r--gcc/cp/error.c3
-rw-r--r--gcc/cp/except.c3
-rw-r--r--gcc/cp/expr.c3
-rw-r--r--gcc/cp/friend.c3
-rw-r--r--gcc/cp/init.c3
-rw-r--r--gcc/cp/lambda.c4
-rw-r--r--gcc/cp/lex.c3
-rw-r--r--gcc/cp/mangle.c4
-rw-r--r--gcc/cp/method.c4
-rw-r--r--gcc/cp/name-lookup.c3
-rw-r--r--gcc/cp/optimize.c5
-rw-r--r--gcc/cp/parser.c4
-rw-r--r--gcc/cp/pt.c3
-rw-r--r--gcc/cp/ptree.c3
-rw-r--r--gcc/cp/repo.c3
-rw-r--r--gcc/cp/rtti.c3
-rw-r--r--gcc/cp/search.c3
-rw-r--r--gcc/cp/semantics.c5
-rw-r--r--gcc/cp/tree.c5
-rw-r--r--gcc/cp/typeck.c3
-rw-r--r--gcc/cp/typeck2.c3
-rw-r--r--gcc/cp/vtable-class-hierarchy.c4
-rw-r--r--gcc/cppbuiltin.c3
-rw-r--r--gcc/cprop.c5
-rw-r--r--gcc/cse.c6
-rw-r--r--gcc/cselib.c6
-rw-r--r--gcc/data-streamer-in.c5
-rw-r--r--gcc/data-streamer-out.c4
-rw-r--r--gcc/data-streamer.c4
-rw-r--r--gcc/data-streamer.h1
-rw-r--r--gcc/dbxout.c7
-rw-r--r--gcc/dce.c4
-rw-r--r--gcc/ddg.c5
-rw-r--r--gcc/debug.c3
-rw-r--r--gcc/df-core.c3
-rw-r--r--gcc/df-problems.c3
-rw-r--r--gcc/df-scan.c4
-rw-r--r--gcc/df.h3
-rw-r--r--gcc/dfp.c3
-rw-r--r--gcc/dojump.c6
-rw-r--r--gcc/dominance.c4
-rw-r--r--gcc/domwalk.c3
-rw-r--r--gcc/double-int.c3
-rw-r--r--gcc/dse.c6
-rw-r--r--gcc/dumpfile.c3
-rw-r--r--gcc/dwarf2asm.c5
-rw-r--r--gcc/dwarf2cfi.c7
-rw-r--r--gcc/dwarf2out.c7
-rw-r--r--gcc/emit-rtl.c5
-rw-r--r--gcc/et-forest.c3
-rw-r--r--gcc/except.c7
-rw-r--r--gcc/except.h2
-rw-r--r--gcc/explow.c6
-rw-r--r--gcc/expmed.c5
-rw-r--r--gcc/expr.c6
-rw-r--r--gcc/final.c7
-rw-r--r--gcc/fixed-value.c3
-rw-r--r--gcc/fold-const.c7
-rw-r--r--gcc/fortran/ChangeLog25
-rw-r--r--gcc/fortran/convert.c3
-rw-r--r--gcc/fortran/cpp.c3
-rw-r--r--gcc/fortran/decl.c3
-rw-r--r--gcc/fortran/f95-lang.c5
-rw-r--r--gcc/fortran/gfortran.h1
-rw-r--r--gcc/fortran/iresolve.c3
-rw-r--r--gcc/fortran/match.c3
-rw-r--r--gcc/fortran/module.c3
-rw-r--r--gcc/fortran/openmp.c1
-rw-r--r--gcc/fortran/options.c3
-rw-r--r--gcc/fortran/target-memory.c3
-rw-r--r--gcc/fortran/trans-array.c3
-rw-r--r--gcc/fortran/trans-common.c3
-rw-r--r--gcc/fortran/trans-const.c3
-rw-r--r--gcc/fortran/trans-decl.c5
-rw-r--r--gcc/fortran/trans-expr.c3
-rw-r--r--gcc/fortran/trans-intrinsic.c4
-rw-r--r--gcc/fortran/trans-io.c4
-rw-r--r--gcc/fortran/trans-openmp.c3
-rw-r--r--gcc/fortran/trans-stmt.c4
-rw-r--r--gcc/fortran/trans-types.c4
-rw-r--r--gcc/fortran/trans.c3
-rw-r--r--gcc/function.c5
-rw-r--r--gcc/fwprop.c3
-rw-r--r--gcc/gcc-plugin.h7
-rw-r--r--gcc/gcc.c1
-rw-r--r--gcc/gcse-common.c1
-rw-r--r--gcc/gcse.c7
-rw-r--r--gcc/genattrtab.c6
-rw-r--r--gcc/genautomata.c8
-rw-r--r--gcc/genconditions.c4
-rw-r--r--gcc/genemit.c10
-rw-r--r--gcc/generic-match-head.c5
-rw-r--r--gcc/genextract.c1
-rw-r--r--gcc/gengtype-state.c1
-rw-r--r--gcc/gengtype.c15
-rw-r--r--gcc/genhooks.c1
-rw-r--r--gcc/genmatch.c5
-rw-r--r--gcc/genmodes.c1
-rw-r--r--gcc/genrecog.c2
-rw-r--r--gcc/gensupport.c1
-rw-r--r--gcc/ggc-common.c4
-rw-r--r--gcc/ggc-internal.h1
-rw-r--r--gcc/ggc-none.c2
-rw-r--r--gcc/ggc-page.c8
-rw-r--r--gcc/ggc.h1
-rw-r--r--gcc/gimple-builder.c3
-rw-r--r--gcc/gimple-expr.c3
-rw-r--r--gcc/gimple-fold.c6
-rw-r--r--gcc/gimple-iterator.c4
-rw-r--r--gcc/gimple-low.c3
-rw-r--r--gcc/gimple-match-head.c5
-rw-r--r--gcc/gimple-pretty-print.c4
-rw-r--r--gcc/gimple-ssa-isolate-paths.c3
-rw-r--r--gcc/gimple-ssa-strength-reduction.c5
-rw-r--r--gcc/gimple-ssa.h1
-rw-r--r--gcc/gimple-streamer-in.c3
-rw-r--r--gcc/gimple-streamer-out.c3
-rw-r--r--gcc/gimple-streamer.h3
-rw-r--r--gcc/gimple-walk.c3
-rw-r--r--gcc/gimple.c3
-rw-r--r--gcc/gimplify-me.c3
-rw-r--r--gcc/gimplify.c6
-rw-r--r--gcc/go/ChangeLog6
-rw-r--r--gcc/go/go-backend.c3
-rw-r--r--gcc/go/go-gcc.cc1
-rw-r--r--gcc/go/go-lang.c3
-rw-r--r--gcc/godump.c5
-rw-r--r--gcc/graph.c3
-rw-r--r--gcc/graphds.c1
-rw-r--r--gcc/graphite-blocking.c3
-rw-r--r--gcc/graphite-dependences.c3
-rw-r--r--gcc/graphite-interchange.c3
-rw-r--r--gcc/graphite-isl-ast-to-gimple.c3
-rw-r--r--gcc/graphite-optimize-isl.c3
-rw-r--r--gcc/graphite-poly.c3
-rw-r--r--gcc/graphite-scop-detection.c3
-rw-r--r--gcc/graphite-sese-to-poly.c5
-rw-r--r--gcc/graphite.c3
-rw-r--r--gcc/haifa-sched.c4
-rw-r--r--gcc/hard-reg-set.h2
-rw-r--r--gcc/hash-map.h7
-rw-r--r--gcc/hash-set.h2
-rw-r--r--gcc/hash-table.h6
-rw-r--r--gcc/hw-doloop.c5
-rw-r--r--gcc/ifcvt.c5
-rw-r--r--gcc/inchash.c2
-rw-r--r--gcc/inchash.h1
-rw-r--r--gcc/incpath.c1
-rw-r--r--gcc/init-regs.c5
-rw-r--r--gcc/input.c1
-rw-r--r--gcc/internal-fn.c5
-rw-r--r--gcc/ipa-chkp.c3
-rw-r--r--gcc/ipa-comdats.c5
-rw-r--r--gcc/ipa-cp.c4
-rw-r--r--gcc/ipa-devirt.c7
-rw-r--r--gcc/ipa-icf-gimple.c6
-rw-r--r--gcc/ipa-icf.c7
-rw-r--r--gcc/ipa-inline-analysis.c4
-rw-r--r--gcc/ipa-inline-transform.c5
-rw-r--r--gcc/ipa-inline.c4
-rw-r--r--gcc/ipa-polymorphic-call.c6
-rw-r--r--gcc/ipa-profile.c4
-rw-r--r--gcc/ipa-prop.c6
-rw-r--r--gcc/ipa-pure-const.c4
-rw-r--r--gcc/ipa-ref.c5
-rw-r--r--gcc/ipa-reference.c4
-rw-r--r--gcc/ipa-split.c6
-rw-r--r--gcc/ipa-utils.c4
-rw-r--r--gcc/ipa-visibility.c4
-rw-r--r--gcc/ipa.c4
-rw-r--r--gcc/ira-build.c3
-rw-r--r--gcc/ira-color.c6
-rw-r--r--gcc/ira-conflicts.c3
-rw-r--r--gcc/ira-costs.c6
-rw-r--r--gcc/ira-emit.c5
-rw-r--r--gcc/ira-lives.c3
-rw-r--r--gcc/ira.c6
-rw-r--r--gcc/java/ChangeLog24
-rw-r--r--gcc/java/boehm.c3
-rw-r--r--gcc/java/builtins.c6
-rw-r--r--gcc/java/class.c5
-rw-r--r--gcc/java/constants.c4
-rw-r--r--gcc/java/decl.c5
-rw-r--r--gcc/java/except.c3
-rw-r--r--gcc/java/expr.c4
-rw-r--r--gcc/java/java-gimplify.c3
-rw-r--r--gcc/java/java-tree.h1
-rw-r--r--gcc/java/jcf-dump.c3
-rw-r--r--gcc/java/jcf-io.c4
-rw-r--r--gcc/java/jcf-parse.c5
-rw-r--r--gcc/java/jcf-reader.c1
-rw-r--r--gcc/java/jvgenmain.c3
-rw-r--r--gcc/java/lang.c4
-rw-r--r--gcc/java/mangle.c4
-rw-r--r--gcc/java/mangle_name.c3
-rw-r--r--gcc/java/resource.c5
-rw-r--r--gcc/java/typeck.c4
-rw-r--r--gcc/java/verify-glue.c3
-rw-r--r--gcc/java/verify-impl.c3
-rw-r--r--gcc/jit/ChangeLog6
-rw-r--r--gcc/jit/dummy-frontend.c1
-rw-r--r--gcc/jit/jit-common.h1
-rw-r--r--gcc/jit/jit-playback.c1
-rw-r--r--gcc/jump.c5
-rw-r--r--gcc/langhooks.c4
-rw-r--r--gcc/lcm.c3
-rw-r--r--gcc/libfuncs.h1
-rw-r--r--gcc/lists.c1
-rw-r--r--gcc/loop-doloop.c5
-rw-r--r--gcc/loop-init.c4
-rw-r--r--gcc/loop-invariant.c6
-rw-r--r--gcc/loop-iv.c6
-rw-r--r--gcc/loop-unroll.c6
-rw-r--r--gcc/lower-subreg.c5
-rw-r--r--gcc/lra-assigns.c5
-rw-r--r--gcc/lra-coalesce.c5
-rw-r--r--gcc/lra-constraints.c5
-rw-r--r--gcc/lra-eliminations.c5
-rw-r--r--gcc/lra-lives.c5
-rw-r--r--gcc/lra-remat.c5
-rw-r--r--gcc/lra-spills.c5
-rw-r--r--gcc/lra.c5
-rw-r--r--gcc/lto-cgraph.c6
-rw-r--r--gcc/lto-compress.c4
-rw-r--r--gcc/lto-opts.c4
-rw-r--r--gcc/lto-section-in.c6
-rw-r--r--gcc/lto-section-out.c6
-rw-r--r--gcc/lto-streamer-in.c6
-rw-r--r--gcc/lto-streamer-out.c6
-rw-r--r--gcc/lto-streamer.c4
-rw-r--r--gcc/lto-streamer.h3
-rw-r--r--gcc/lto/ChangeLog10
-rw-r--r--gcc/lto/lto-lang.c4
-rw-r--r--gcc/lto/lto-object.c4
-rw-r--r--gcc/lto/lto-partition.c4
-rw-r--r--gcc/lto/lto-partition.h1
-rw-r--r--gcc/lto/lto-symtab.c4
-rw-r--r--gcc/lto/lto.c5
-rw-r--r--gcc/lto/lto.h2
-rw-r--r--gcc/mcf.c3
-rw-r--r--gcc/mem-stats.h6
-rw-r--r--gcc/mode-switching.c3
-rw-r--r--gcc/modulo-sched.c5
-rw-r--r--gcc/objc/ChangeLog11
-rw-r--r--gcc/objc/objc-act.c5
-rw-r--r--gcc/objc/objc-encoding.c3
-rw-r--r--gcc/objc/objc-gnu-runtime-abi-01.c4
-rw-r--r--gcc/objc/objc-lang.c4
-rw-r--r--gcc/objc/objc-map.c4
-rw-r--r--gcc/objc/objc-next-runtime-abi-01.c4
-rw-r--r--gcc/objc/objc-next-runtime-abi-02.c4
-rw-r--r--gcc/objc/objc-runtime-shared-support.c3
-rw-r--r--gcc/objcp/ChangeLog5
-rw-r--r--gcc/objcp/objcp-decl.c1
-rw-r--r--gcc/objcp/objcp-lang.c1
-rw-r--r--gcc/omega.c3
-rw-r--r--gcc/omp-low.c6
-rw-r--r--gcc/optabs.c6
-rw-r--r--gcc/opts-global.c4
-rw-r--r--gcc/opts.h1
-rw-r--r--gcc/passes.c6
-rw-r--r--gcc/plugin.c5
-rw-r--r--gcc/postreload-gcse.c6
-rw-r--r--gcc/postreload.c5
-rw-r--r--gcc/predict.c6
-rw-r--r--gcc/print-rtl.c3
-rw-r--r--gcc/print-tree.c5
-rw-r--r--gcc/profile.c6
-rw-r--r--gcc/read-md.c1
-rw-r--r--gcc/read-md.h1
-rw-r--r--gcc/read-rtl.c1
-rw-r--r--gcc/real.c3
-rw-r--r--gcc/realmpfr.c3
-rw-r--r--gcc/recog.c5
-rw-r--r--gcc/ree.c6
-rw-r--r--gcc/reg-stack.c4
-rw-r--r--gcc/regcprop.c3
-rw-r--r--gcc/reginfo.c5
-rw-r--r--gcc/regrename.c3
-rw-r--r--gcc/regstat.c3
-rw-r--r--gcc/reload.c5
-rw-r--r--gcc/reload1.c6
-rw-r--r--gcc/reorg.c5
-rw-r--r--gcc/resource.c3
-rw-r--r--gcc/rtl-chkp.c6
-rw-r--r--gcc/rtl.c1
-rw-r--r--gcc/rtl.h7
-rw-r--r--gcc/rtlanal.c4
-rw-r--r--gcc/rtlhash.c1
-rw-r--r--gcc/rtlhash.h1
-rw-r--r--gcc/rtlhooks.c5
-rw-r--r--gcc/sanopt.c5
-rw-r--r--gcc/sched-deps.c3
-rw-r--r--gcc/sched-ebb.c3
-rw-r--r--gcc/sched-rgn.c3
-rw-r--r--gcc/sched-vis.c6
-rw-r--r--gcc/sdbout.c5
-rw-r--r--gcc/sel-sched-dump.c3
-rw-r--r--gcc/sel-sched-ir.c5
-rw-r--r--gcc/sel-sched-ir.h1
-rw-r--r--gcc/sel-sched.c5
-rw-r--r--gcc/sese.c5
-rw-r--r--gcc/shrink-wrap.c5
-rw-r--r--gcc/shrink-wrap.h2
-rw-r--r--gcc/simplify-rtx.c6
-rw-r--r--gcc/stack-ptr-mod.c5
-rw-r--r--gcc/statistics.c5
-rw-r--r--gcc/stmt.c5
-rw-r--r--gcc/stor-layout.c6
-rw-r--r--gcc/store-motion.c7
-rw-r--r--gcc/stringpool.c4
-rw-r--r--gcc/symtab.c5
-rw-r--r--gcc/target-globals.c6
-rw-r--r--gcc/targhooks.c5
-rw-r--r--gcc/tlink.c2
-rw-r--r--gcc/toplev.c6
-rw-r--r--gcc/tracer.c3
-rw-r--r--gcc/trans-mem.c5
-rw-r--r--gcc/tree-affine.c5
-rw-r--r--gcc/tree-affine.h1
-rw-r--r--gcc/tree-browser.c4
-rw-r--r--gcc/tree-call-cdce.c4
-rw-r--r--gcc/tree-cfg.c7
-rw-r--r--gcc/tree-cfgcleanup.c5
-rw-r--r--gcc/tree-chkp-opt.c5
-rw-r--r--gcc/tree-chkp.c6
-rw-r--r--gcc/tree-chrec.c3
-rw-r--r--gcc/tree-complex.c5
-rw-r--r--gcc/tree-data-ref.c5
-rw-r--r--gcc/tree-dfa.c5
-rw-r--r--gcc/tree-diagnostic.c4
-rw-r--r--gcc/tree-dump.c3
-rw-r--r--gcc/tree-eh.c7
-rw-r--r--gcc/tree-eh.h1
-rw-r--r--gcc/tree-emutls.c4
-rw-r--r--gcc/tree-hasher.h2
-rw-r--r--gcc/tree-if-conv.c6
-rw-r--r--gcc/tree-inline.c6
-rw-r--r--gcc/tree-inline.h2
-rw-r--r--gcc/tree-into-ssa.c6
-rw-r--r--gcc/tree-iterator.c4
-rw-r--r--gcc/tree-loop-distribution.c3
-rw-r--r--gcc/tree-nested.c6
-rw-r--r--gcc/tree-nrv.c3
-rw-r--r--gcc/tree-object-size.c3
-rw-r--r--gcc/tree-outof-ssa.c5
-rw-r--r--gcc/tree-parloops.c3
-rw-r--r--gcc/tree-phinodes.c3
-rw-r--r--gcc/tree-predcom.c5
-rw-r--r--gcc/tree-pretty-print.c6
-rw-r--r--gcc/tree-profile.c5
-rw-r--r--gcc/tree-scalar-evolution.c5
-rw-r--r--gcc/tree-sra.c8
-rw-r--r--gcc/tree-ssa-address.c5
-rw-r--r--gcc/tree-ssa-alias.c6
-rw-r--r--gcc/tree-ssa-ccp.c4
-rw-r--r--gcc/tree-ssa-coalesce.c4
-rw-r--r--gcc/tree-ssa-copy.c3
-rw-r--r--gcc/tree-ssa-copyrename.c5
-rw-r--r--gcc/tree-ssa-dce.c5
-rw-r--r--gcc/tree-ssa-dom.c6
-rw-r--r--gcc/tree-ssa-dse.c5
-rw-r--r--gcc/tree-ssa-forwprop.c5
-rw-r--r--gcc/tree-ssa-ifcombine.c3
-rw-r--r--gcc/tree-ssa-live.c6
-rw-r--r--gcc/tree-ssa-loop-ch.c3
-rw-r--r--gcc/tree-ssa-loop-im.c5
-rw-r--r--gcc/tree-ssa-loop-ivcanon.c4
-rw-r--r--gcc/tree-ssa-loop-ivopts.c7
-rw-r--r--gcc/tree-ssa-loop-manip.c3
-rw-r--r--gcc/tree-ssa-loop-niter.c5
-rw-r--r--gcc/tree-ssa-loop-prefetch.c5
-rw-r--r--gcc/tree-ssa-loop-unswitch.c3
-rw-r--r--gcc/tree-ssa-loop.c3
-rw-r--r--gcc/tree-ssa-math-opts.c5
-rw-r--r--gcc/tree-ssa-operands.c3
-rw-r--r--gcc/tree-ssa-phiopt.c6
-rw-r--r--gcc/tree-ssa-phiprop.c3
-rw-r--r--gcc/tree-ssa-pre.c7
-rw-r--r--gcc/tree-ssa-propagate.c3
-rw-r--r--gcc/tree-ssa-reassoc.c7
-rw-r--r--gcc/tree-ssa-sccvn.c6
-rw-r--r--gcc/tree-ssa-scopedtables.c4
-rw-r--r--gcc/tree-ssa-sink.c3
-rw-r--r--gcc/tree-ssa-strlen.c7
-rw-r--r--gcc/tree-ssa-structalias.c7
-rw-r--r--gcc/tree-ssa-tail-merge.c5
-rw-r--r--gcc/tree-ssa-ter.c6
-rw-r--r--gcc/tree-ssa-threadedge.c3
-rw-r--r--gcc/tree-ssa-threadupdate.c4
-rw-r--r--gcc/tree-ssa-uncprop.c5
-rw-r--r--gcc/tree-ssa-uninit.c3
-rw-r--r--gcc/tree-ssa.c4
-rw-r--r--gcc/tree-ssanames.c3
-rw-r--r--gcc/tree-stdarg.c3
-rw-r--r--gcc/tree-streamer-in.c4
-rw-r--r--gcc/tree-streamer-out.c4
-rw-r--r--gcc/tree-streamer.c4
-rw-r--r--gcc/tree-streamer.h1
-rw-r--r--gcc/tree-switch-conversion.c6
-rw-r--r--gcc/tree-tailcall.c6
-rw-r--r--gcc/tree-vect-data-refs.c6
-rw-r--r--gcc/tree-vect-generic.c5
-rw-r--r--gcc/tree-vect-loop-manip.c3
-rw-r--r--gcc/tree-vect-loop.c5
-rw-r--r--gcc/tree-vect-patterns.c5
-rw-r--r--gcc/tree-vect-slp.c5
-rw-r--r--gcc/tree-vect-stmts.c6
-rw-r--r--gcc/tree-vectorizer.c4
-rw-r--r--gcc/tree-vectorizer.h1
-rw-r--r--gcc/tree-vrp.c5
-rw-r--r--gcc/tree.c6
-rw-r--r--gcc/tsan.c6
-rw-r--r--gcc/ubsan.c6
-rw-r--r--gcc/valtrack.c3
-rw-r--r--gcc/valtrack.h1
-rw-r--r--gcc/value-prof.c6
-rw-r--r--gcc/var-tracking.c7
-rw-r--r--gcc/varasm.c7
-rw-r--r--gcc/varpool.c4
-rw-r--r--gcc/vec.c7
-rw-r--r--gcc/vec.h40
-rw-r--r--gcc/vmsdbgout.c3
-rw-r--r--gcc/vtable-verify.c3
-rw-r--r--gcc/vtable-verify.h1
-rw-r--r--gcc/web.c3
-rw-r--r--gcc/wide-int.cc1
-rw-r--r--gcc/xcoffout.c4
624 files changed, 676 insertions, 2628 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d7f6a84..38fe369 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,479 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * coretypes.h: Include hash-table.h and hash-set.h for host files.
+ * ggc.h: Don't include statistics.h>
+ * hash-map.h: Remove all includes.
+ * hash-set.h: Likewise.
+ * hash-table.h: Add statistics.h, inchash.h and hash-map-traits.h to
+ the include list. Remove <new>.
+ * inchash.h: Remove all includes.
+ * mem-stats.h: Likewise.
+ * vec.h: No special processing for generators or ggc.
+ * alias.c : Adjust include files.
+ * alloc-pool.c : Likewise.
+ * alloc-pool.h : Likewise.
+ * asan.c : Likewise.
+ * attribs.c : Likewise.
+ * auto-inc-dec.c : Likewise.
+ * auto-profile.c : Likewise.
+ * bb-reorder.c : Likewise.
+ * bitmap.c : Likewise.
+ * bitmap.h : 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.
+ * cfgloop.h : 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.
+ * context.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.
+ * data-streamer.h : 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.
+ * df.h : 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.
+ * except.h : 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.
+ * gcc.c : Likewise.
+ * gcse-common.c : Likewise.
+ * gcse.c : Likewise.
+ * genattrtab.c : Likewise.
+ * genautomata.c : Likewise.
+ * genconditions.c : Likewise.
+ * genemit.c : Likewise.
+ * generic-match-head.c : Likewise.
+ * genextract.c : Likewise.
+ * gengtype-state.c : Likewise.
+ * gengtype.c : Likewise.
+ * genhooks.c : Likewise.
+ * genmatch.c : Likewise.
+ * genmodes.c : Likewise.
+ * genrecog.c : Likewise.
+ * gensupport.c : Likewise.
+ * ggc-common.c : Likewise.
+ * ggc-internal.h : Likewise.
+ * ggc-none.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-ssa.h : Likewise.
+ * gimple-streamer-in.c : Likewise.
+ * gimple-streamer-out.c : Likewise.
+ * gimple-streamer.h : Likewise.
+ * gimple-walk.c : Likewise.
+ * gimple.c : Likewise.
+ * gimplify-me.c : Likewise.
+ * gimplify.c : Likewise.
+ * godump.c : Likewise.
+ * graph.c : Likewise.
+ * graphds.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.
+ * hard-reg-set.h : Likewise.
+ * hw-doloop.c : Likewise.
+ * ifcvt.c : Likewise.
+ * inchash.c : Likewise.
+ * incpath.c : Likewise.
+ * init-regs.c : Likewise.
+ * input.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.
+ * libfuncs.h : Likewise.
+ * lists.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.
+ * lto-streamer.h : 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.
+ * opts.h : 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.
+ * read-md.c : Likewise.
+ * read-md.h : Likewise.
+ * read-rtl.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.
+ * rtl.c : Likewise.
+ * rtl.h : Likewise.
+ * rtlanal.c : Likewise.
+ * rtlhash.c : Likewise.
+ * rtlhash.h : 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-ir.h : Likewise.
+ * sel-sched.c : Likewise.
+ * sese.c : Likewise.
+ * shrink-wrap.c : Likewise.
+ * shrink-wrap.h : Likewise.
+ * simplify-rtx.c : Likewise.
+ * stack-ptr-mod.c : Likewise.
+ * statistics.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.
+ * tlink.c : Likewise.
+ * toplev.c : Likewise.
+ * tracer.c : Likewise.
+ * trans-mem.c : Likewise.
+ * tree-affine.c : Likewise.
+ * tree-affine.h : 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-eh.h : Likewise.
+ * tree-emutls.c : Likewise.
+ * tree-hasher.h : Likewise.
+ * tree-if-conv.c : Likewise.
+ * tree-inline.c : Likewise.
+ * tree-inline.h : 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-streamer.h : 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-vectorizer.h : Likewise.
+ * tree-vrp.c : Likewise.
+ * tree.c : Likewise.
+ * tsan.c : Likewise.
+ * ubsan.c : Likewise.
+ * valtrack.c : Likewise.
+ * valtrack.h : Likewise.
+ * value-prof.c : Likewise.
+ * var-tracking.c : Likewise.
+ * varasm.c : Likewise.
+ * varpool.c : Likewise.
+ * vec.c: Likewise.
+ * vmsdbgout.c : Likewise.
+ * vtable-verify.c : Likewise.
+ * vtable-verify.h : 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/default-c.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/glibc-c.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/winnt-c.c : Likewise.
+ * config/xtensa/xtensa.c : Likewise.
+
2015-06-08 Jan Hubicka <hubicka@ucw.cz>
PR lto/65378
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 61509aa..20fcf9a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * gcc-interface/cuintp.c : Adjust include files.
+ * 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-06-08 John Marino <gnugcc@marino.st>
* a-intnam-dragonfly.ads: New.
diff --git a/gcc/ada/gcc-interface/cuintp.c b/gcc/ada/gcc-interface/cuintp.c
index 5245cd5..4eb569d 100644
--- a/gcc/ada/gcc-interface/cuintp.c
+++ b/gcc/ada/gcc-interface/cuintp.c
@@ -30,7 +30,6 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 3c243a2..2e722e0 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -27,7 +27,6 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index 2eef7df..d990c3d 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -29,7 +29,6 @@
#include "opts.h"
#include "options.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
@@ -49,7 +48,6 @@
#include "langhooks-def.h"
#include "plugin.h"
#include "hashtab.h"
-#include "hash-set.h"
#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/ada/gcc-interface/targtyps.c b/gcc/ada/gcc-interface/targtyps.c
index 1c74015..f172847 100644
--- a/gcc/ada/gcc-interface/targtyps.c
+++ b/gcc/ada/gcc-interface/targtyps.c
@@ -28,7 +28,6 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 538aba3..1164192 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -27,7 +27,6 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index e24a295..181651a 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -27,7 +27,6 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c
index 63ef1f2..6812666 100644
--- a/gcc/ada/gcc-interface/utils2.c
+++ b/gcc/ada/gcc-interface/utils2.c
@@ -27,7 +27,6 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/alias.c b/gcc/alias.c
index 6cc3aa2..bc6a0ee 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -23,20 +23,15 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -50,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "alloc-pool.h"
#include "cselib.h"
-#include "hash-map.h"
#include "langhooks.h"
#include "timevar.h"
#include "dumpfile.h"
diff --git a/gcc/alloc-pool.c b/gcc/alloc-pool.c
index 601c2b7..bdf184a 100644
--- a/gcc/alloc-pool.c
+++ b/gcc/alloc-pool.c
@@ -22,8 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "alloc-pool.h"
-#include "hash-table.h"
-#include "hash-map.h"
ALLOC_POOL_ID_TYPE last_id;
mem_alloc_description<pool_usage> pool_allocator_usage;
diff --git a/gcc/alloc-pool.h b/gcc/alloc-pool.h
index ed0cb6d..af3adde 100644
--- a/gcc/alloc-pool.h
+++ b/gcc/alloc-pool.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef ALLOC_POOL_H
#define ALLOC_POOL_H
-#include "hash-map.h"
extern void dump_alloc_pool_statistics (void);
diff --git a/gcc/asan.c b/gcc/asan.c
index 38d6c56..599c822 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -22,16 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hash-table.h"
#include "predict.h"
#include "tm.h"
#include "hard-reg-set.h"
@@ -51,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stor-layout.h"
#include "tree-iterator.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
@@ -61,10 +56,8 @@ along with GCC; see the file COPYING3. If not see
#include "asan.h"
#include "gimple-pretty-print.h"
#include "target.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/attribs.c b/gcc/attribs.c
index 8cf99dc..b50c733 100644
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -21,24 +21,19 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
#include "stor-layout.h"
#include "flags.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "tm_p.h"
#include "cpplib.h"
#include "target.h"
#include "langhooks.h"
-#include "hash-table.h"
#include "plugin.h"
/* Table of the tables of attributes (common, language, format, machine)
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index c760358..0bdf91a 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.c
@@ -22,18 +22,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "tm_p.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "hashtab.h"
#include "function.h"
#include "dominance.h"
#include "cfg.h"
@@ -45,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "diagnostic-core.h"
#include "recog.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index a16ef0b..9246ead 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -26,21 +26,15 @@ along with GCC; see the file COPYING3. If not see
#include <set>
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-pass.h"
#include "flags.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
@@ -66,7 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 318e357..522d944 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -82,24 +82,19 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "regs.h"
#include "flags.h"
#include "output.h"
#include "target.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "tm_p.h"
#include "obstack.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -124,7 +119,6 @@
#include "basic-block.h"
#include "df.h"
#include "bb-reorder.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index 5fc4654..d600ace 100644
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -21,13 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "obstack.h"
-#include "ggc.h"
#include "bitmap.h"
-#include "hash-table.h"
-#include "vec.h"
-#include "inchash.h"
-#include "mem-stats.h"
-#include "hash-map.h"
/* Memory allocation statistics purpose instance. */
mem_alloc_description<bitmap_usage> bitmap_mem_desc;
diff --git a/gcc/bitmap.h b/gcc/bitmap.h
index 1d37bca..00d5573 100644
--- a/gcc/bitmap.h
+++ b/gcc/bitmap.h
@@ -127,10 +127,7 @@ along with GCC; see the file COPYING3. If not see
bad for persistent sets, so persistent sets should be allocated on an
obstack whenever possible. */
-#include "hashtab.h"
-#include "statistics.h"
#include "obstack.h"
-#include "mem-stats.h"
/* Bitmap memory usage. */
struct bitmap_usage: public mem_usage
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index 166ba03..f48edf2 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -27,15 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "target.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index b3bc350..e8fe3db 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -37,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-object-size.h"
#include "realmpfr.h"
#include "predict.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "cfgrtl.h"
@@ -51,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "except.h"
#include "insn-config.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 17816a3..a2324a4 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,27 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * array-notation-common.c : Adjust include files.
+ * c-ada-spec.c : Likewise.
+ * c-cilkplus.c : Likewise.
+ * c-common.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-06-08 Marek Polacek <polacek@redhat.com>
PR c/66415
diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c
index c79ccb4..1cdcb19 100644
--- a/gcc/c-family/array-notation-common.c
+++ b/gcc/c-family/array-notation-common.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
#include "tree-iterator.h"
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index 561a0a6..b79eca8 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "dumpfile.h"
diff --git a/gcc/c-family/c-cilkplus.c b/gcc/c-family/c-cilkplus.c
index d2aa2e8..d615bd9 100644
--- a/gcc/c-family/c-cilkplus.c
+++ b/gcc/c-family/c-cilkplus.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "c-common.h"
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 6f4393b..5b76567 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -47,13 +47,9 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "diagnostic.h"
#include "tree-iterator.h"
-#include "hashtab.h"
#include "opts.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index af86e26..7ba81c4 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -22,16 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "splay-tree.h"
#include "cpplib.h"
-#include "ggc.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
-#include "statistics.h"
-#include "vec.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
-#include "inchash.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 c44a149..918f51b 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 b2dd77a..3c5d9ab 100644
--- a/gcc/c-family/c-dump.c
+++ b/gcc/c-family/c-dump.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 564e47b..397091b 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 dfa5587..8a799b9 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -27,19 +27,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "c-common.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -57,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "dumpfile.h"
#include "c-pretty-print.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/c-family/c-indentation.c b/gcc/c-family/c-indentation.c
index 5c78e18..f8c28cf 100644
--- a/gcc/c-family/c-indentation.c
+++ b/gcc/c-family/c-indentation.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 52a8ecc..94ee59d 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 4d181dc..e0658f9 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 971f5eb..b90e0f4 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "options.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 693444c..4db9c24 100644
--- a/gcc/c-family/c-pch.c
+++ b/gcc/c-family/c-pch.c
@@ -23,18 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "version.h"
#include "cpplib.h"
#include "options.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "flags.h"
#include "c-common.h"
#include "debug.h"
#include "c-pragma.h"
-#include "ggc.h"
#include "langhooks.h"
#include "hosthooks.h"
#include "target.h"
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index b7feea6..d404c85 100644
--- a/gcc/c-family/c-ppoutput.c
+++ b/gcc/c-family/c-ppoutput.c
@@ -21,13 +21,10 @@
#include "coretypes.h"
#include "cpplib.h"
#include "../libcpp/internal.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.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 fafde83..5d8300e 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -21,20 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
#include "varasm.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h" /* For cfun. FIXME: Does the parser know
@@ -50,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "opts.h"
#include "plugin.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c
index 34b98a1..2115d76 100644
--- a/gcc/c-family/c-pretty-print.c
+++ b/gcc/c-family/c-pretty-print.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "attribs.h"
diff --git a/gcc/c-family/c-semantics.c b/gcc/c-family/c-semantics.c
index 1d6bb54..1b3c277 100644
--- a/gcc/c-family/c-semantics.c
+++ b/gcc/c-family/c-semantics.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
#include "function.h"
diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index 99abc4a..19e9bf1 100644
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -21,21 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "alloc-pool.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 6cf68d2..4957ade 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -41,12 +38,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "c-family/c-common.h"
#include "toplev.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
@@ -54,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
-#include "vec.h"
#include "cilk.h"
enum add_variable_type {
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index 782344f..835ebac 100644
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.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 "vec.h"
-#include "hash-set.h"
#include "alias.h"
#include "input.h"
#include "symtab.h"
#include "flags.h"
-#include "inchash.h"
#include "tree.h"
#include "c-common.h"
#include "c-objc.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index d37a3ab..e5759a4 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,16 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-array-notation.c : Adjust include files.
+ * c-aux-info.c : Likewise.
+ * c-convert.c : Likewise.
+ * c-decl.c : Likewise.
+ * c-errors.c : Likewise.
+ * c-lang.c : Likewise.
+ * c-lang.h : Likewise.
+ * c-objc-common.c : Likewise.
+ * c-parser.c : Likewise.
+ * c-typeck.c : Likewise.
+
2015-06-05 Aldy Hernandez <aldyh@redhat.com>
* c-decl.c (finish_struct): Save C_TYPE_INCOMPLETE_VARS and
diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index 766252b..682d412 100644
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -68,13 +68,10 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
#include "flags.h"
-#include "inchash.h"
#include "tree.h"
#include "c-tree.h"
#include "gimple-expr.h"
diff --git a/gcc/c/c-aux-info.c b/gcc/c/c-aux-info.c
index 93814d5..2cc8d09 100644
--- a/gcc/c/c-aux-info.c
+++ b/gcc/c/c-aux-info.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "c-tree.h"
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index ef87303..e6cba96 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -27,12 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "flags.h"
#include "convert.h"
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 77d1de9..7fd662d 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -30,12 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "tm.h"
#include "intl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
@@ -45,9 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-inline.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "function.h"
#include "c-tree.h"
@@ -67,12 +61,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "hash-table.h"
#include "langhooks-def.h"
#include "plugin.h"
#include "c-family/c-ada-spec.h"
diff --git a/gcc/c/c-errors.c b/gcc/c/c-errors.c
index c640bb2..b3e7ee9 100644
--- a/gcc/c/c-errors.c
+++ b/gcc/c/c-errors.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "c-tree.h"
#include "tm_p.h"
diff --git a/gcc/c/c-lang.c b/gcc/c/c-lang.c
index e4b283d..fae024f 100644
--- a/gcc/c/c-lang.c
+++ b/gcc/c/c-lang.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "c-tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/c/c-lang.h b/gcc/c/c-lang.h
index 18c3770..9b45c87 100644
--- a/gcc/c/c-lang.h
+++ b/gcc/c/c-lang.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#define GCC_C_LANG_H
#include "c-family/c-common.h"
-#include "ggc.h"
struct GTY(()) lang_type {
/* In a RECORD_TYPE, a sorted array of the fields of the type. */
diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c
index 68ba65f..514cc55 100644
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
#include "flags.h"
-#include "inchash.h"
#include "tree.h"
#include "c-tree.h"
#include "intl.h"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index c691e76..0f6d1c9 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -39,13 +39,10 @@ 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 "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
#include "flags.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -61,16 +58,11 @@ along with GCC; see the file COPYING3. If not see
#include "c-tree.h"
#include "c-lang.h"
#include "flags.h"
-#include "ggc.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
-#include "vec.h"
#include "target.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "function.h"
#include "ipa-ref.h"
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index d473e6a..636e0bb 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -27,12 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -48,9 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "bitmap.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 82ad533..c64daf9 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -28,9 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "recog.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -39,9 +36,7 @@ along with GCC; see the file COPYING3. If not see
#include "df.h"
#include "reload.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
@@ -54,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "tm_p.h"
#include "addresses.h"
-#include "ggc.h"
#include "dumpfile.h"
#include "rtl-iter.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index da2c8f6..3da5212 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -35,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "attribs.h"
#include "predict.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "basic-block.h"
@@ -45,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -66,7 +61,6 @@ along with GCC; see the file COPYING3. If not see
#include "bitmap.h"
#include "langhooks.h"
#include "target.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ccmp.c b/gcc/ccmp.c
index d51b03a..375fe9d 100644
--- a/gcc/ccmp.c
+++ b/gcc/ccmp.c
@@ -23,22 +23,17 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "tm_p.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "regs.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cfg.c b/gcc/cfg.c
index a28b0a7..9ca8987 100644
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -50,21 +50,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "obstack.h"
-#include "ggc.h"
-#include "hash-table.h"
#include "alloc-pool.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index 5856e88..10e699e 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -23,9 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 45de528..806dcec 100644
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.c
@@ -22,17 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "hashtab.h"
#include "function.h"
#include "dominance.h"
#include "cfg.h"
@@ -43,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "flags.h"
#include "except.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 1b5c5c5..59071ca 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -34,12 +34,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
#include "regs.h"
@@ -52,13 +49,11 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "tm_p.h"
#include "target.h"
-#include "hashtab.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 "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index e9840b1..b23e325 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hard-reg-set.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -38,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "print-tree.h"
#include "tm_p.h"
#include "predict.h"
-#include "hashtab.h"
#include "function.h"
#include "dominance.h"
#include "cfg.h"
@@ -50,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -69,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index b9e94cf..a8a4199 100644
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -23,18 +23,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index a279046..1a119ef 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -22,11 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "symtab.h"
-#include "inchash.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index d811c56..c73ad7f 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -22,9 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "bitmap.h"
#include "sbitmap.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index 21ba9f4..62fbd76a 100644
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -25,9 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "obstack.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -36,9 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c
index a4f13c2..8b07534 100644
--- a/gcc/cfgloopmanip.c
+++ b/gcc/cfgloopmanip.c
@@ -23,11 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "symtab.h"
-#include "inchash.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 13f8372..31787a9 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -41,16 +41,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "hashtab.h"
#include "function.h"
#include "dominance.h"
#include "cfg.h"
@@ -69,7 +65,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "insn-config.h"
#include "rtl.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -81,7 +76,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "cfgloop.h"
-#include "ggc.h"
#include "tree-pass.h"
#include "df.h"
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 22b71d9..95907fb 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -27,12 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "print-tree.h"
#include "tree-inline.h"
#include "langhooks.h"
-#include "hashtab.h"
#include "toplev.h"
#include "flags.h"
#include "debug.h"
@@ -49,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
@@ -80,7 +75,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-inline.h"
#include "cfgloop.h"
#include "gimple-pretty-print.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index 7bab872..5282bdc 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -48,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "intl.h"
#include "tree-pass.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index 7d8271d..9d951ed 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -69,12 +69,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -101,7 +98,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "params.h"
#include "intl.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index c1da988..8126161 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -161,12 +161,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -201,7 +198,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "params.h"
#include "intl.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/cilk-common.c b/gcc/cilk-common.c
index 8b35837..594ab5c 100644
--- a/gcc/cilk-common.c
+++ b/gcc/cilk-common.c
@@ -23,25 +23,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "langhooks.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index ec10f48..ff45da9 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -49,15 +49,10 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index 8a9ab7a..bce8430 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -80,12 +80,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "tm_p.h"
@@ -101,8 +98,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "insn-config.h"
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -122,7 +117,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "df.h"
#include "valtrack.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c
index 7acc19c..1d1a165 100644
--- a/gcc/compare-elim.c
+++ b/gcc/compare-elim.c
@@ -64,9 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "flags.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index 5c324b8..f7a39ec 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -23,22 +23,17 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "calls.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -53,8 +48,6 @@
#include "diagnostic-core.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "hash-table.h"
-#include "ggc.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index bef6877..c3c2795 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -25,12 +25,9 @@
#include "insn-codes.h"
#include "rtl.h"
#include "insn-attr.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -50,10 +47,8 @@
#include "df.h"
#include "hard-reg-set.h"
#include "output.h"
-#include "hashtab.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -66,12 +61,10 @@
#include "target.h"
#include "target-def.h"
#include "targhooks.h"
-#include "ggc.h"
#include "tm_p.h"
#include "recog.h"
#include "langhooks.h"
#include "diagnostic-core.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/aarch64/cortex-a57-fma-steering.c b/gcc/config/aarch64/cortex-a57-fma-steering.c
index e55ffce..12d44f7 100644
--- a/gcc/config/aarch64/cortex-a57-fma-steering.c
+++ b/gcc/config/aarch64/cortex-a57-fma-steering.c
@@ -33,8 +33,6 @@
#include "insn-attr.h"
#include "recog.h"
#include "output.h"
-#include "vec.h"
-#include "hash-map.h"
#include "bitmap.h"
#include "obstack.h"
#include "df.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index f6ce9eb..4536aba 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -43,9 +40,7 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -58,15 +53,12 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "except.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "tm_p.h"
#include "target.h"
#include "target-def.h"
#include "common/common-target.h"
#include "debug.h"
#include "langhooks.h"
-#include "hash-map.h"
-#include "hash-table.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index c3a50c7..12a3448 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -32,12 +32,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -50,16 +47,13 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
-#include "hashtab.h"
#include "function.h"
#include "toplev.h"
-#include "ggc.h"
#include "tm_p.h"
#include "target.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/arm/aarch-common.c b/gcc/config/arm/aarch-common.c
index 0b39d17..cde6485 100644
--- a/gcc/config/arm/aarch-common.c
+++ b/gcc/config/arm/aarch-common.c
@@ -27,12 +27,9 @@
#include "tm.h"
#include "tm_p.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 36c90ea..1ceb898 100644
--- a/gcc/config/arm/arm-builtins.c
+++ b/gcc/config/arm/arm-builtins.c
@@ -22,20 +22,15 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -52,7 +47,6 @@
#include "optabs.h"
#include "gimple-expr.h"
#include "target.h"
-#include "ggc.h"
#include "arm-protos.h"
#define SIMD_MAX_BUILTIN_ARGS 5
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
index c2a75b5..fde0966 100644
--- a/gcc/config/arm/arm-c.c
+++ b/gcc/config/arm/arm-c.c
@@ -21,12 +21,9 @@
#include "coretypes.h"
#include "tm.h"
#include "tm_p.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index ee55616..a959b9c 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -23,15 +23,11 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -48,8 +44,6 @@
#include "flags.h"
#include "reload.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -69,12 +63,10 @@
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "ggc.h"
#include "except.h"
#include "tm_p.h"
#include "target.h"
diff --git a/gcc/config/avr/avr-c.c b/gcc/config/avr/avr-c.c
index ad41e29..4836a96 100644
--- a/gcc/config/avr/avr-c.c
+++ b/gcc/config/avr/avr-c.c
@@ -25,12 +25,9 @@
#include "tm.h"
#include "tm_p.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 8c163b9..1bf8e8c 100644
--- a/gcc/config/avr/avr-log.c
+++ b/gcc/config/avr/avr-log.c
@@ -23,12 +23,9 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
#include "output.h"
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index c22a093..ef65d22 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -31,12 +31,9 @@
#include "insn-codes.h"
#include "flags.h"
#include "reload.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -45,9 +42,7 @@
#include "stor-layout.h"
#include "stringpool.h"
#include "output.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -59,7 +54,6 @@
#include "obstack.h"
#include "recog.h"
#include "optabs.h"
-#include "ggc.h"
#include "langhooks.h"
#include "tm_p.h"
#include "target.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 7b570cd..dc24ed5 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -31,12 +31,9 @@
#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -46,8 +43,6 @@
#include "function.h"
#include "target.h"
#include "target-def.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -57,7 +52,6 @@
#include "diagnostic-core.h"
#include "recog.h"
#include "optabs.h"
-#include "ggc.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
@@ -67,7 +61,6 @@
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index 3c0c5b1..ef449e4 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -24,12 +24,9 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -40,11 +37,9 @@
#include "output.h"
#include "insn-attr.h"
#include "insn-codes.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -55,7 +50,6 @@
#include "regs.h"
#include "optabs.h"
#include "recog.h"
-#include "ggc.h"
#include "dominance.h"
#include "cfg.h"
#include "cfgrtl.h"
@@ -72,7 +66,6 @@
#include "tm-constrs.h"
#include "df.h"
#include "diagnostic-core.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index 64ede05..0112179 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -23,12 +23,9 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -45,8 +42,6 @@
#include "except.h"
#include "function.h"
#include "recog.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 8a30be1..5f44a96 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -29,21 +29,16 @@ along with GCC; see the file COPYING3. If not see
#include "conditions.h"
#include "insn-attr.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
#include "stmt.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -59,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm-constrs.h"
#include "target.h"
#include "target-def.h"
-#include "ggc.h"
#include "insn-codes.h"
#include "optabs.h"
#include "dominance.h"
@@ -73,7 +67,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "df.h"
#include "opts.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 953b3d0..a33f594 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "target.h"
#include "incpath.h"
@@ -51,12 +48,8 @@ along with GCC; see the file COPYING3. If not see
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 2ffac7e..839fbc8 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -31,20 +31,15 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "varasm.h"
#include "stor-layout.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -53,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "reload.h"
-#include "ggc.h"
#include "langhooks.h"
#include "target.h"
#include "tm_p.h"
@@ -71,7 +65,6 @@ along with GCC; see the file COPYING3. If not see
#include "df.h"
#include "debug.h"
#include "obstack.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
@@ -80,7 +73,6 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimplify.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/config/default-c.c b/gcc/config/default-c.c
index 305fe68..6eaa8e4 100644
--- a/gcc/config/default-c.c
+++ b/gcc/config/default-c.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "c-family/c-target.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "c-family/c-target-def.h"
/* Do not include tm.h or tm_p.h here; if it is useful for a target to
diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
index c655e32..ffd687c 100644
--- a/gcc/config/epiphany/epiphany.c
+++ b/gcc/config/epiphany/epiphany.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -45,8 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -69,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "df.h"
#include "langhooks.h"
-#include "ggc.h"
#include "tm-constrs.h"
#include "tree-pass.h" /* for current_pass */
#include "context.h"
diff --git a/gcc/config/epiphany/mode-switch-use.c b/gcc/config/epiphany/mode-switch-use.c
index abc9971..4104464 100644
--- a/gcc/config/epiphany/mode-switch-use.c
+++ b/gcc/config/epiphany/mode-switch-use.c
@@ -24,9 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/config/epiphany/resolve-sw-modes.c b/gcc/config/epiphany/resolve-sw-modes.c
index 0534627..c61e6bd 100644
--- a/gcc/config/epiphany/resolve-sw-modes.c
+++ b/gcc/config/epiphany/resolve-sw-modes.c
@@ -24,11 +24,8 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "hard-reg-set.h"
#include "tm_p.h"
-#include "vec.h"
#include "sbitmap.h"
#include "predict.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index 7134f67..2ce9660 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -32,20 +32,15 @@
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "output.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index d90986a..667c08d 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -43,9 +40,7 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "recog.h"
#include "reload.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -68,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgcleanup.h"
#include "basic-block.h"
#include "tm_p.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "targhooks.h"
diff --git a/gcc/config/ft32/ft32.c b/gcc/config/ft32/ft32.c
index 85c4cba..ff844d3 100644
--- a/gcc/config/ft32/ft32.c
+++ b/gcc/config/ft32/ft32.c
@@ -35,12 +35,9 @@
#include "reload.h"
#include "diagnostic-core.h"
#include "obstack.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "calls.h"
@@ -48,7 +45,6 @@
#include "optabs.h"
#include "except.h"
#include "function.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "tm_p.h"
diff --git a/gcc/config/glibc-c.c b/gcc/config/glibc-c.c
index 1bd9d39..9ac1501 100644
--- a/gcc/config/glibc-c.c
+++ b/gcc/config/glibc-c.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "c-family/c-target.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "c-family/c-target-def.h"
/* Implement TARGET_C_PREINCLUDE for glibc targets. */
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index f5fccc6..b517f48 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -43,9 +40,7 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -58,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-pragma.h" /* ??? */
#include "tm_p.h"
#include "tm-constrs.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "dominance.h"
diff --git a/gcc/config/i386/i386-c.c b/gcc/config/i386/i386-c.c
index 4cd56e6..fc6d30c 100644
--- a/gcc/config/i386/i386-c.c
+++ b/gcc/config/i386/i386-c.c
@@ -21,18 +21,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "flags.h"
#include "c-family/c-common.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "cpplib.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 153dd85..622c5f5 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -47,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "function.h"
#include "recog.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -67,18 +62,15 @@ along with GCC; see the file COPYING3. If not see
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "common/common-target.h"
#include "langhooks.h"
#include "reload.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/i386/msformat-c.c b/gcc/config/i386/msformat-c.c
index 64cb86e..9d05537 100644
--- a/gcc/config/i386/msformat-c.c
+++ b/gcc/config/i386/msformat-c.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 8b60bb3..6afdcb9 100644
--- a/gcc/config/i386/winnt-cxx.c
+++ b/gcc/config/i386/winnt-cxx.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
@@ -35,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm_p.h"
#include "diagnostic-core.h"
-#include "hashtab.h"
bool
i386_pe_type_dllimport_p (tree decl)
diff --git a/gcc/config/i386/winnt-stubs.c b/gcc/config/i386/winnt-stubs.c
index 7d17ccb..203d84c 100644
--- a/gcc/config/i386/winnt-stubs.c
+++ b/gcc/config/i386/winnt-stubs.c
@@ -26,17 +26,13 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "output.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "flags.h"
#include "tm_p.h"
#include "diagnostic-core.h"
-#include "hashtab.h"
bool
i386_pe_type_dllimport_p (tree)
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index dfcc5b0..88859db 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "output.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -39,13 +36,9 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm_p.h"
#include "diagnostic-core.h"
-#include "hash-table.h"
#include "langhooks.h"
-#include "ggc.h"
#include "target.h"
#include "except.h"
-#include "hash-table.h"
-#include "vec.h"
#include "predict.h"
#include "input.h"
#include "function.h"
@@ -64,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/config/ia64/ia64-c.c b/gcc/config/ia64/ia64-c.c
index 162e00c..35e459e 100644
--- a/gcc/config/ia64/ia64-c.c
+++ b/gcc/config/ia64/ia64-c.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 8b4a02a..459edd7 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -44,9 +41,7 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -56,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "except.h"
-#include "ggc.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
@@ -74,7 +68,6 @@ along with GCC; see the file COPYING3. If not see
#include "target-def.h"
#include "common/common-target.h"
#include "tm_p.h"
-#include "hash-table.h"
#include "langhooks.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index 3bdcfad..cf37f80 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -41,8 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -55,7 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "diagnostic-core.h"
#include "reload.h"
-#include "ggc.h"
#include "tm_p.h"
#include "debug.h"
#include "target.h"
diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c
index 06f0724..92eaa36 100644
--- a/gcc/config/lm32/lm32.c
+++ b/gcc/config/lm32/lm32.c
@@ -27,9 +27,6 @@
#include "regs.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -48,12 +45,10 @@
#include "recog.h"
#include "output.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
@@ -67,7 +62,6 @@
#include "diagnostic-core.h"
#include "optabs.h"
#include "libfuncs.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "langhooks.h"
diff --git a/gcc/config/m32c/m32c-pragma.c b/gcc/config/m32c/m32c-pragma.c
index f37365a..93bf150 100644
--- a/gcc/config/m32c/m32c-pragma.c
+++ b/gcc/config/m32c/m32c-pragma.c
@@ -22,12 +22,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 efef08c..a4c47bf 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -35,20 +35,15 @@
#include "reload.h"
#include "diagnostic-core.h"
#include "obstack.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -58,12 +53,10 @@
#include "insn-codes.h"
#include "optabs.h"
#include "except.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "hash-table.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 075227d..8082874 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -21,12 +21,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -41,9 +38,7 @@
#include "dbxout.h"
#include "insn-attr.h"
#include "flags.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -52,7 +47,6 @@
#include "expr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "dominance.h"
#include "cfg.h"
#include "cfgrtl.h"
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 94cac2b..c0fb325 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
@@ -42,9 +39,7 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -69,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
/* ??? Need to add a dependency between m68k.o and sched-int.h. */
#include "sched-int.h"
#include "insn-codes.h"
-#include "ggc.h"
#include "opts.h"
#include "optabs.h"
#include "builtins.h"
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index 529e672..412ef05 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -22,12 +22,9 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -44,9 +41,7 @@
#include "insn-attr.h"
#include "flags.h"
#include "obstack.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -55,7 +50,6 @@
#include "expr.h"
#include "reload.h"
#include "recog.h"
-#include "ggc.h"
#include "diagnostic-core.h"
#include "target.h"
#include "target-def.h"
diff --git a/gcc/config/mep/mep-pragma.c b/gcc/config/mep/mep-pragma.c
index 90cc444..b32cc8a 100644
--- a/gcc/config/mep/mep-pragma.c
+++ b/gcc/config/mep/mep-pragma.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 724d84d..23d02bb 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -45,9 +42,7 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "recog.h"
#include "obstack.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -59,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "reload.h"
#include "tm_p.h"
-#include "ggc.h"
#include "diagnostic-core.h"
#include "target.h"
#include "target-def.h"
@@ -74,7 +68,6 @@ along with GCC; see the file COPYING3. If not see
#include "predict.h"
#include "basic-block.h"
#include "df.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/microblaze/microblaze-c.c b/gcc/config/microblaze/microblaze-c.c
index ac2ffe4..f5ae551 100644
--- a/gcc/config/microblaze/microblaze-c.c
+++ b/gcc/config/microblaze/microblaze-c.c
@@ -24,12 +24,9 @@
#include "coretypes.h"
#include "tm.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 3cd1302..9c0d303 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -31,20 +31,15 @@
#include "insn-flags.h"
#include "insn-attr.h"
#include "recog.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
#include "function.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -53,7 +48,6 @@
#include "expr.h"
#include "reload.h"
#include "output.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "tm_p.h"
@@ -71,7 +65,6 @@
#include "insn-codes.h"
#include "optabs.h"
#include "diagnostic-core.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 9e0e8fd..e81134e 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -33,12 +33,9 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "recog.h"
#include "output.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -46,9 +43,7 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "calls.h"
#include "function.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -60,9 +55,7 @@ along with GCC; see the file COPYING3. If not see
#include "libfuncs.h"
#include "reload.h"
#include "tm_p.h"
-#include "ggc.h"
#include "gstab.h"
-#include "hash-table.h"
#include "debug.h"
#include "target.h"
#include "target-def.h"
@@ -92,7 +85,6 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "tree-pass.h"
#include "context.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index 6706bbe..b76529a 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "regs.h"
#include "hard-reg-set.h"
-#include "hashtab.h"
#include "insn-config.h"
#include "output.h"
#include "predict.h"
-#include "vec.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -43,12 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "flags.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
-#include "statistics.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
@@ -58,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "diagnostic-core.h"
#include "recog.h"
-#include "ggc.h"
#include "dwarf2.h"
#include "debug.h"
#include "tm_p.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 7f38555..0d46b7e 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -23,12 +23,9 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -42,9 +39,7 @@
#include "flags.h"
#include "recog.h"
#include "reload.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c
index e19daff..7402db3 100644
--- a/gcc/config/moxie/moxie.c
+++ b/gcc/config/moxie/moxie.c
@@ -35,19 +35,14 @@
#include "reload.h"
#include "diagnostic-core.h"
#include "obstack.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -57,7 +52,6 @@
#include "insn-codes.h"
#include "optabs.h"
#include "except.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "tm_p.h"
diff --git a/gcc/config/msp430/msp430-c.c b/gcc/config/msp430/msp430-c.c
index 2bb9c45..8f87ff6 100644
--- a/gcc/config/msp430/msp430-c.c
+++ b/gcc/config/msp430/msp430-c.c
@@ -22,12 +22,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 0fc7d50..e1c0c96 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -22,12 +22,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -41,8 +38,6 @@
#include "insn-attr.h"
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -67,7 +62,6 @@
#include "predict.h"
#include "basic-block.h"
#include "df.h"
-#include "ggc.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 02d0292..f283f19 100644
--- a/gcc/config/nds32/nds32-cost.c
+++ b/gcc/config/nds32/nds32-cost.c
@@ -24,12 +24,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -45,8 +42,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -72,7 +67,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32-fp-as-gp.c b/gcc/config/nds32/nds32-fp-as-gp.c
index ab8e217..f3304ed 100644
--- a/gcc/config/nds32/nds32-fp-as-gp.c
+++ b/gcc/config/nds32/nds32-fp-as-gp.c
@@ -24,12 +24,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -45,8 +42,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -72,7 +67,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32-intrinsic.c b/gcc/config/nds32/nds32-intrinsic.c
index 5ce3370..6668a40 100644
--- a/gcc/config/nds32/nds32-intrinsic.c
+++ b/gcc/config/nds32/nds32-intrinsic.c
@@ -24,12 +24,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -45,8 +42,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -72,7 +67,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32-isr.c b/gcc/config/nds32/nds32-isr.c
index e27907d..8b4c072 100644
--- a/gcc/config/nds32/nds32-isr.c
+++ b/gcc/config/nds32/nds32-isr.c
@@ -24,12 +24,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -45,8 +42,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -72,7 +67,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32-md-auxiliary.c b/gcc/config/nds32/nds32-md-auxiliary.c
index 321ccf3..f231563 100644
--- a/gcc/config/nds32/nds32-md-auxiliary.c
+++ b/gcc/config/nds32/nds32-md-auxiliary.c
@@ -25,12 +25,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -46,8 +43,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -73,7 +68,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32-memory-manipulation.c b/gcc/config/nds32/nds32-memory-manipulation.c
index 1256b31..27438bc 100644
--- a/gcc/config/nds32/nds32-memory-manipulation.c
+++ b/gcc/config/nds32/nds32-memory-manipulation.c
@@ -25,12 +25,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -46,8 +43,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -73,7 +68,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32-pipelines-auxiliary.c b/gcc/config/nds32/nds32-pipelines-auxiliary.c
index 3cf400c..e6f07ff 100644
--- a/gcc/config/nds32/nds32-pipelines-auxiliary.c
+++ b/gcc/config/nds32/nds32-pipelines-auxiliary.c
@@ -25,12 +25,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -46,8 +43,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -73,7 +68,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32-predicates.c b/gcc/config/nds32/nds32-predicates.c
index 516e48d..0682164 100644
--- a/gcc/config/nds32/nds32-predicates.c
+++ b/gcc/config/nds32/nds32-predicates.c
@@ -24,12 +24,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -45,8 +42,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -72,7 +67,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 1ef76a9..18c7adf 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -24,12 +24,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
@@ -45,8 +42,6 @@
#include "reload.h" /* For push_reload(). */
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -72,7 +67,6 @@
#include "target.h"
#include "target-def.h"
#include "langhooks.h" /* For add_builtin_function(). */
-#include "ggc.h"
#include "builtins.h"
/* ------------------------------------------------------------------------ */
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 597a046..2987862 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -25,12 +25,9 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "regs.h"
@@ -41,9 +38,7 @@
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -54,7 +49,6 @@
#include "expr.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "ggc.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index daf6a21..964c3cd 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -24,22 +24,17 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "insn-codes.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -52,7 +47,6 @@
#include "regs.h"
#include "optabs.h"
#include "recog.h"
-#include "ggc.h"
#include "timevar.h"
#include "tm_p.h"
#include "tm-preds.h"
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 34d02a9..a6ef23c 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -29,12 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "conditions.h"
#include "insn-attr.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -44,9 +41,7 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "dbxout.h"
#include "except.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -57,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "reload.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "recog.h"
#include "predict.h"
#include "tm_p.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index 831f1a3..fbf24f6 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -27,9 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "output.h"
@@ -37,12 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "recog.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "statistics.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/rl78/rl78-c.c b/gcc/config/rl78/rl78-c.c
index 02c3ece..cfce5a4 100644
--- a/gcc/config/rl78/rl78-c.c
+++ b/gcc/config/rl78/rl78-c.c
@@ -22,12 +22,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 bde03aa..1ab2705 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -22,12 +22,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -42,8 +39,6 @@
#include "insn-attr.h"
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -67,7 +62,6 @@
#include "predict.h"
#include "basic-block.h"
#include "df.h"
-#include "ggc.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 494aa46..f0413ac 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -25,12 +25,9 @@
#include "coretypes.h"
#include "tm.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 66caa47..26c84fe 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -31,12 +31,9 @@
#include "flags.h"
#include "recog.h"
#include "obstack.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -44,9 +41,7 @@
#include "calls.h"
#include "print-tree.h"
#include "varasm.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -69,7 +64,6 @@
#include "basic-block.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "ggc.h"
#include "tm_p.h"
#include "target.h"
#include "target-def.h"
@@ -78,7 +72,6 @@
#include "reload.h"
#include "cfgloop.h"
#include "sched-int.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
@@ -96,7 +89,6 @@
#include "opts.h"
#include "tree-vectorizer.h"
#include "dumpfile.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index 5bf38df..f4f6808 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -26,12 +26,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
@@ -45,8 +42,6 @@
#include "insn-attr.h"
#include "flags.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -70,14 +65,12 @@
#include "predict.h"
#include "basic-block.h"
#include "df.h"
-#include "ggc.h"
#include "tm_p.h"
#include "debug.h"
#include "target.h"
#include "target-def.h"
#include "langhooks.h"
#include "opts.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index 8ad42f1..75fde80 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -32,12 +32,9 @@
#include "coretypes.h"
#include "tm.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 d6ed179..2469e2b 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "function.h"
#include "recog.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -68,14 +63,12 @@ along with GCC; see the file COPYING3. If not see
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "debug.h"
#include "langhooks.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/sh/sh-c.c b/gcc/config/sh/sh-c.c
index b3ea87f..8b7c4c7 100644
--- a/gcc/config/sh/sh-c.c
+++ b/gcc/config/sh/sh-c.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 860189f..5d5b2d9 100644
--- a/gcc/config/sh/sh-mem.cc
+++ b/gcc/config/sh/sh-mem.cc
@@ -22,18 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 3b63014..8fc8197 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "insn-config.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -41,10 +38,8 @@ along with GCC; see the file COPYING3. If not see
#include "calls.h"
#include "varasm.h"
#include "flags.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -77,8 +72,6 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "sched-int.h"
#include "params.h"
-#include "ggc.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index f403d63..a546ef9 100644
--- a/gcc/config/sh/sh_optimize_sett_clrt.cc
+++ b/gcc/config/sh/sh_optimize_sett_clrt.cc
@@ -21,9 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index c09a4c3..90e0023 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -22,9 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
@@ -46,11 +43,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "target.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "optabs.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c
index 0275ade..06ed2f4 100644
--- a/gcc/config/sol2-c.c
+++ b/gcc/config/sol2-c.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
diff --git a/gcc/config/sol2-cxx.c b/gcc/config/sol2-cxx.c
index d2f5ea0..0274324 100644
--- a/gcc/config/sol2-cxx.c
+++ b/gcc/config/sol2-cxx.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp/cp-tree.h"
diff --git a/gcc/config/sol2-stubs.c b/gcc/config/sol2-stubs.c
index 8d9a980..d037722 100644
--- a/gcc/config/sol2-stubs.c
+++ b/gcc/config/sol2-stubs.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "tm.h"
#include "tm_p.h"
diff --git a/gcc/config/sol2.c b/gcc/config/sol2.c
index faaf17f..9eb889a 100644
--- a/gcc/config/sol2.c
+++ b/gcc/config/sol2.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
@@ -37,8 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "tm_p.h"
#include "diagnostic-core.h"
-#include "ggc.h"
-#include "hash-table.h"
tree solaris_pending_aligns, solaris_pending_inits, solaris_pending_finis;
diff --git a/gcc/config/sparc/sparc-c.c b/gcc/config/sparc/sparc-c.c
index a614328..67e28c1 100644
--- a/gcc/config/sparc/sparc-c.c
+++ b/gcc/config/sparc/sparc-c.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 3939b1a..15a8e5b 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -47,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "function.h"
#include "except.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -58,13 +53,11 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "recog.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "tm_p.h"
#include "debug.h"
#include "target.h"
#include "target-def.h"
#include "common/common-target.h"
-#include "hash-table.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index b68dbf4..6b4f406 100644
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -19,12 +19,9 @@
#include "coretypes.h"
#include "tm.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 a6bf782..00472d0 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -27,21 +27,16 @@
#include "flags.h"
#include "recog.h"
#include "obstack.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
#include "varasm.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -62,7 +57,6 @@
#include "cfgcleanup.h"
#include "basic-block.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "tm_p.h"
#include "target.h"
#include "target-def.h"
@@ -70,7 +64,6 @@
#include "reload.h"
#include "sched-int.h"
#include "params.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 3de727f..beb5a13 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -34,21 +34,16 @@
#include "recog.h"
#include "diagnostic-core.h"
#include "obstack.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -62,8 +57,6 @@
#include "target-def.h"
#include "tm_p.h"
#include "langhooks.h"
-#include "hash-table.h"
-#include "ggc.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
diff --git a/gcc/config/tilegx/mul-tables.c b/gcc/config/tilegx/mul-tables.c
index cd78c23..86a5c4c 100644
--- a/gcc/config/tilegx/mul-tables.c
+++ b/gcc/config/tilegx/mul-tables.c
@@ -25,18 +25,13 @@
#include "system.h"
#include "coretypes.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/config/tilegx/tilegx-c.c b/gcc/config/tilegx/tilegx-c.c
index 2850f2b..6963321 100644
--- a/gcc/config/tilegx/tilegx-c.c
+++ b/gcc/config/tilegx/tilegx-c.c
@@ -24,12 +24,9 @@
#include "tm.h"
#include "tm_p.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 5832eff..ab250eb 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -28,17 +28,12 @@
#include "output.h"
#include "insn-attr.h"
#include "recog.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
@@ -68,8 +63,6 @@
#include "dwarf2.h"
#include "timevar.h"
#include "fold-const.h"
-#include "hash-table.h"
-#include "ggc.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/tilepro/mul-tables.c b/gcc/config/tilepro/mul-tables.c
index 680f3b0..21ac465 100644
--- a/gcc/config/tilepro/mul-tables.c
+++ b/gcc/config/tilepro/mul-tables.c
@@ -25,18 +25,13 @@
#include "system.h"
#include "coretypes.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/config/tilepro/tilepro-c.c b/gcc/config/tilepro/tilepro-c.c
index f47c6ca..f5f8bcd 100644
--- a/gcc/config/tilepro/tilepro-c.c
+++ b/gcc/config/tilepro/tilepro-c.c
@@ -24,12 +24,9 @@
#include "tm.h"
#include "tm_p.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 ac07519..72a65e5 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -28,17 +28,12 @@
#include "output.h"
#include "insn-attr.h"
#include "recog.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
@@ -69,8 +64,6 @@
#include "dwarf2.h"
#include "timevar.h"
#include "fold-const.h"
-#include "hash-table.h"
-#include "ggc.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/config/v850/v850-c.c b/gcc/config/v850/v850-c.c
index 8af245d..25fcf3b 100644
--- a/gcc/config/v850/v850-c.c
+++ b/gcc/config/v850/v850-c.c
@@ -23,18 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
#include "c-family/c-pragma.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "tm_p.h"
#ifndef streq
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 53dbf45..7156721 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -22,12 +22,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "stor-layout.h"
@@ -42,9 +39,7 @@
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -52,7 +47,6 @@
#include "stmt.h"
#include "expr.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "tm_p.h"
#include "target.h"
#include "target-def.h"
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 9ea214d..5038de9 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -32,12 +32,9 @@ along with GCC; see the file COPYING3. If not see
#include "predict.h"
#include "basic-block.h"
#include "df.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "calls.h"
#include "varasm.h"
@@ -49,9 +46,7 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "insn-attr.h"
#include "recog.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c
index 7a023b5..55f2486 100644
--- a/gcc/config/visium/visium.c
+++ b/gcc/config/visium/visium.c
@@ -22,16 +22,11 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
-#include "statistics.h"
-#include "vec.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
#include "tree-core.h"
-#include "inchash.h"
#include "fold-const.h"
#include "tree-check.h"
#include "tree.h"
@@ -56,7 +51,6 @@
#include "recog.h"
#include "diagnostic-core.h"
#include "tm_p.h"
-#include "ggc.h"
#include "optabs.h"
#include "target.h"
#include "target-def.h"
diff --git a/gcc/config/vms/vms-c.c b/gcc/config/vms/vms-c.c
index b56a7e6..6e9ae83 100644
--- a/gcc/config/vms/vms-c.c
+++ b/gcc/config/vms/vms-c.c
@@ -23,18 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "c-family/c-pragma.h"
#include "c-family/c-common.h"
#include "c/c-tree.h"
#include "toplev.h"
-#include "ggc.h"
#include "tm_p.h"
#include "incpath.h"
#include "diagnostic.h"
diff --git a/gcc/config/vms/vms.c b/gcc/config/vms/vms.c
index e16a330..cdad95f 100644
--- a/gcc/config/vms/vms.c
+++ b/gcc/config/vms/vms.c
@@ -21,17 +21,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "vms-protos.h"
-#include "ggc.h"
#include "target.h"
#include "output.h"
#include "tm.h"
diff --git a/gcc/config/vxworks.c b/gcc/config/vxworks.c
index fd38576..db4cb14 100644
--- a/gcc/config/vxworks.c
+++ b/gcc/config/vxworks.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 "vec.h"
#include "target.h"
#include "diagnostic-core.h"
#include "output.h"
#include "tm.h"
-#include "hash-set.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/config/winnt-c.c b/gcc/config/winnt-c.c
index 8c69061..19941d4 100644
--- a/gcc/config/winnt-c.c
+++ b/gcc/config/winnt-c.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "c-family/c-target.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "options.h"
#include "symtab.h"
-#include "inchash.h"
#include "c-family/c-target-def.h"
static bool
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index db39f3f..d8c5b41 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -26,9 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -47,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -55,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "calls.h"
#include "varasm.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
@@ -68,11 +63,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "optabs.h"
#include "libfuncs.h"
-#include "ggc.h"
#include "target.h"
#include "target-def.h"
#include "langhooks.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/context.c b/gcc/context.c
index 1c001f1..0f4b5e9 100644
--- a/gcc/context.c
+++ b/gcc/context.c
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "ggc.h"
#include "context.h"
#include "pass_manager.h"
#include "dumpfile.h"
diff --git a/gcc/convert.c b/gcc/convert.c
index 79e3a7e..d456351 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index 447edd7..9bb541d 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -307,6 +307,8 @@ typedef unsigned char uchar;
#include "double-int.h"
#include "real.h"
#include "fixed-value.h"
-#endif
+#include "hash-table.h"
+#include "hash-set.h"
+#endif /* GENERATOR_FILE && !USED_FOR_TARGET */
#endif /* coretypes.h */
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 3fd54c4..e656609 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -29,12 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -42,10 +39,8 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "output.h"
#include "regs.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -61,15 +56,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "toplev.h"
#include "tm_p.h"
-#include "ggc.h"
#include "coverage.h"
#include "langhooks.h"
-#include "hash-table.h"
#include "tree-iterator.h"
#include "context.h"
#include "pass_manager.h"
#include "tree-pass.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 99988ef..5160324 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,42 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * call.c : Adjust include files.
+ * class.c : Likewise.
+ * constexpr.c : Likewise.
+ * cp-array-notation.c : Likewise.
+ * cp-cilkplus.c : Likewise.
+ * cp-gimplify.c : Likewise.
+ * cp-lang.c : Likewise.
+ * cp-objcp-common.c : Likewise.
+ * cp-tree.h : 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.
+ * vtable-class-hierarchy.c : Likewise.
+
2015-06-05 Jason Merrill <jason@redhat.com>
PR c++/66405
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index da5cfbb..2d90ed9 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "trans-mem.h"
@@ -46,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "c-family/c-objc.h"
#include "timevar.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 09de9cf..5b9bba8 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -24,25 +24,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tm.h"
#include "tree.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "attribs.h"
-#include "hash-table.h"
#include "cp-tree.h"
#include "flags.h"
#include "toplev.h"
#include "target.h"
#include "convert.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 49d0fe4..8fa2eb3 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "cp-tree.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index e8cf337..a3656d3 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -53,19 +53,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
#include "diagnostic.h"
#include "tree-iterator.h"
-#include "vec.h"
/* Creates a FOR_STMT with INIT, COND, INCR and BODY as the initializer,
condition, increment expression and the loop-body, respectively. */
diff --git a/gcc/cp/cp-cilkplus.c b/gcc/cp/cp-cilkplus.c
index f946770..74662b1 100644
--- a/gcc/cp/cp-cilkplus.c
+++ b/gcc/cp/cp-cilkplus.c
@@ -27,7 +27,6 @@
#include "diagnostic-core.h"
#include "tree-iterator.h"
#include "tree-inline.h" /* for copy_tree_body_r. */
-#include "ggc.h"
#include "cilk.h"
/* Callback for cp_walk_tree to validate the body of a pragma simd loop
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index d8dc1c7..05a0091 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "cp-tree.h"
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index c4e80e6..6eb7741 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "cp-tree.h"
@@ -36,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks-def.h"
#include "debug.h"
#include "cp-objcp-common.h"
-#include "hashtab.h"
#include "target.h"
#include "parser.h"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index 4c193a1..13e2e22 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index fb1702c..603a871 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -21,15 +21,10 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CP_TREE_H
#define GCC_CP_TREE_H
-#include "ggc.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "hash-map.h"
/* In order for the format checking to accept the C++ front end
diagnostic framework extensions, you must include this file before
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index 1cdee86..ac9e38c 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "alloc-pool.h"
#include "output.h"
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 2ab7b41..9f93c68 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "flags.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2bddce2..3bed538 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -30,12 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stringpool.h"
@@ -50,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "decl.h"
#include "intl.h"
#include "toplev.h"
-#include "hashtab.h"
#include "tm_p.h"
#include "target.h"
#include "c-family/c-common.h"
@@ -64,7 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "splay-tree.h"
#include "plugin.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index c1b568b..9df3139e 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -30,12 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
@@ -51,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index 21a27e0..465fadc 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 83efad5..3287786 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 67eb5a2..894cc28 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "trans-mem.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 1ea873a..5d90039 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "flags.h"
#include "cp-tree.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 564ced6..4f7e808 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "flags.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 3f177b6..aad3b44 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 3a4824b..c423830 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -24,16 +24,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "tm.h"
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 3e8ce35..e04600b 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "input.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index f6ec65e..d1bb765 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -48,12 +48,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stor-layout.h"
@@ -63,7 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "flags.h"
#include "target.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 9187eeb1..e279458 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
@@ -41,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "diagnostic.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index e4baac3..cafc31f 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "print-tree.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index d902871..cc54508 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -22,18 +22,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
#include "input.h"
#include "params.h"
-#include "hashtab.h"
#include "target.h"
#include "debug.h"
#include "tree-inline.h"
@@ -42,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "tree-iterator.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2ea61c0..15b920a 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "timevar.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
#include "stringpool.h"
@@ -42,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "diagnostic-core.h"
#include "target.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4a9fff0..2ebeb65 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index d105be3..91438ac 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 e98dace..850b256 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index d01de92..5acef1b 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "stringpool.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index fff3619..26d58e8 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "intl.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index dd53758..650ef4c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -27,12 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stmt.h"
#include "varasm.h"
@@ -47,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "timevar.h"
#include "diagnostic.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
@@ -57,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "tree-iterator.h"
#include "target.h"
-#include "hash-table.h"
#include "gimplify.h"
#include "bitmap.h"
#include "omp-low.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 9d9956b..3c4b527 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-hasher.h"
@@ -39,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "debug.h"
#include "convert.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
@@ -48,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-ref.h"
#include "cgraph.h"
#include "splay-tree.h"
-#include "hash-table.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "attribs.h"
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 96371a4..6c4b038 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 5d90806..affa265 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -29,12 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index 1a94ce2..dfd8af8 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -115,12 +115,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "cp-tree.h"
#include "output.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c
index 7c5163a..2166126 100644
--- a/gcc/cppbuiltin.c
+++ b/gcc/cppbuiltin.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "version.h"
#include "flags.h"
diff --git a/gcc/cprop.c b/gcc/cprop.c
index a0e7989..6d83e22 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "toplev.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "regs.h"
@@ -38,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "predict.h"
-#include "hashtab.h"
#include "function.h"
#include "dominance.h"
#include "cfg.h"
@@ -47,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "lcm.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/cse.c b/gcc/cse.c
index 0453acc..6af1cf3 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -26,9 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "regs.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -41,9 +38,7 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
@@ -55,7 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "ggc.h"
#include "except.h"
#include "target.h"
#include "params.h"
diff --git a/gcc/cselib.c b/gcc/cselib.c
index e611d94..7ccaab4 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"/* FIXME: For hashing DEBUG_EXPR & friends. */
#include "tm_p.h"
#include "regs.h"
@@ -35,13 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
-#include "hashtab.h"
#include "input.h"
#include "function.h"
#include "emit-rtl.h"
#include "diagnostic-core.h"
-#include "ggc.h"
-#include "hash-table.h"
#include "dumpfile.h"
#include "alloc-pool.h"
#include "cselib.h"
diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index 841831e..c8f6dcb 100644
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -24,17 +24,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "diagnostic.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
@@ -45,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index 65804e3..82c92e3 100644
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/data-streamer.c b/gcc/data-streamer.c
index 634bc9a..7061dd6 100644
--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -42,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/data-streamer.h b/gcc/data-streamer.h
index c26dda0..f1e3507 100644
--- a/gcc/data-streamer.h
+++ b/gcc/data-streamer.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_DATA_STREAMER_H
#define GCC_DATA_STREAMER_H
-#include "vec.h"
#include "lto-streamer.h"
/* Data structures used to pack values and bitflags into a vector of
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 138f5cf..48b5065 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -70,12 +70,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -90,16 +87,13 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "toplev.h"
#include "tm_p.h"
-#include "ggc.h"
#include "debug.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
#include "obstack.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -107,7 +101,6 @@ along with GCC; see the file COPYING3. If not see
#include "emit-rtl.h"
#include "stmt.h"
#include "expr.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/dce.c b/gcc/dce.c
index 4fa52dc..d20906d 100644
--- a/gcc/dce.c
+++ b/gcc/dce.c
@@ -20,15 +20,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hashtab.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "regs.h"
#include "hard-reg-set.h"
diff --git a/gcc/ddg.c b/gcc/ddg.c
index 0e40cdb..eb88922 100644
--- a/gcc/ddg.c
+++ b/gcc/ddg.c
@@ -28,9 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "flags.h"
@@ -45,9 +42,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "sbitmap.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/debug.c b/gcc/debug.c
index ed468f7..9c621f8 100644
--- a/gcc/debug.c
+++ b/gcc/debug.c
@@ -19,12 +19,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "debug.h"
diff --git a/gcc/df-core.c b/gcc/df-core.c
index 68e7163a..702a112 100644
--- a/gcc/df-core.c
+++ b/gcc/df-core.c
@@ -382,9 +382,6 @@ are write-only operations.
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index ac2118d..10dc401 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -29,9 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index 78ebb39..91f6aca 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -29,13 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/df.h b/gcc/df.h
index 4c6856a..3295402 100644
--- a/gcc/df.h
+++ b/gcc/df.h
@@ -29,9 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "regset.h"
#include "sbitmap.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/dfp.c b/gcc/dfp.c
index f483e989..6c8a6c7 100644
--- a/gcc/dfp.c
+++ b/gcc/dfp.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "dfp.h"
diff --git a/gcc/dojump.c b/gcc/dojump.c
index 0fedfff..196d106 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -37,8 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "insn-attr.h"
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -50,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "langhooks.h"
-#include "ggc.h"
#include "predict.h"
#include "basic-block.h"
#include "tm_p.h"
diff --git a/gcc/dominance.c b/gcc/dominance.c
index 173e479..23f107c 100644
--- a/gcc/dominance.c
+++ b/gcc/dominance.c
@@ -40,9 +40,6 @@
#include "hard-reg-set.h"
#include "obstack.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -53,7 +50,6 @@
#include "alloc-pool.h"
#include "et-forest.h"
#include "timevar.h"
-#include "hash-map.h"
#include "graphds.h"
#include "bitmap.h"
diff --git a/gcc/domwalk.c b/gcc/domwalk.c
index 48aa1c4..a600db3 100644
--- a/gcc/domwalk.c
+++ b/gcc/domwalk.c
@@ -23,9 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/double-int.c b/gcc/double-int.c
index 6e457c2..a7d29a0 100644
--- a/gcc/double-int.c
+++ b/gcc/double-int.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h" /* For BITS_PER_UNIT and *_BIG_ENDIAN. */
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 7f489c0..d7d4ba6 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -25,15 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -52,9 +48,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "alloc-pool.h"
#include "insn-config.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 28a195a..faba9d3 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "gimple-pretty-print.h"
#include "context.h"
diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index d4458e3..6b2625f 100644
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
@@ -37,8 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "dwarf2asm.h"
#include "dwarf2.h"
-#include "hash-map.h"
-#include "ggc.h"
#include "tm_p.h"
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 5176f72..1c91d97 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "version.h"
#include "flags.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "hard-reg-set.h"
@@ -38,16 +35,12 @@ along with GCC; see the file COPYING3. If not see
#include "dwarf2.h"
#include "dwarf2out.h"
#include "dwarf2asm.h"
-#include "ggc.h"
-#include "hash-table.h"
#include "tm_p.h"
#include "target.h"
#include "common/common-target.h"
#include "tree-pass.h"
#include "except.h" /* expand_builtin_dwarf_sp_column */
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 23cf120..ee2bcb1 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -60,22 +60,17 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "varasm.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "emit-rtl.h"
-#include "hash-table.h"
#include "version.h"
#include "flags.h"
#include "regs.h"
@@ -83,7 +78,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "reload.h"
#include "output.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -103,7 +97,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index fb8d0bf..7d3feb1 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -37,12 +37,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic-core.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -55,8 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "flags.h"
#include "stringpool.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/et-forest.c b/gcc/et-forest.c
index c0af994..57c9916 100644
--- a/gcc/et-forest.c
+++ b/gcc/et-forest.c
@@ -32,9 +32,6 @@ License along with libiberty; see the file COPYING3. If not see
#undef DEBUG_ET
#ifdef DEBUG_ET
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/except.c b/gcc/except.c
index c946efb..11d95a4 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -114,12 +114,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -129,8 +126,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -147,7 +142,6 @@ along with GCC; see the file COPYING3. If not see
#include "dwarf2out.h"
#include "dwarf2.h"
#include "toplev.h"
-#include "hash-table.h"
#include "intl.h"
#include "tm_p.h"
#include "target.h"
@@ -158,7 +152,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfgrtl.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/except.h b/gcc/except.h
index ca26c4cb..5ec57d9 100644
--- a/gcc/except.h
+++ b/gcc/except.h
@@ -24,8 +24,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_EXCEPT_H
#define GCC_EXCEPT_H
-#include "hash-map.h"
-#include "hashtab.h"
struct function;
struct eh_region_d;
diff --git a/gcc/explow.c b/gcc/explow.c
index 47d1250..bcd9f72 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic-core.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "tm_p.h"
@@ -37,8 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -51,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "optabs.h"
#include "libfuncs.h"
-#include "ggc.h"
#include "recog.h"
#include "langhooks.h"
#include "target.h"
diff --git a/gcc/expmed.c b/gcc/expmed.c
index d381f58..70123bf 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -25,22 +25,17 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic-core.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "tm_p.h"
#include "flags.h"
#include "insn-config.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index dd37ab8..26b54a8 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -41,8 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "insn-config.h"
#include "insn-attr.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -72,7 +67,6 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/final.c b/gcc/final.c
index f1b791a..6134d1b 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -46,12 +46,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "hard-reg-set.h"
@@ -78,8 +75,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "targhooks.h"
#include "debug.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -88,7 +83,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tree-pass.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
@@ -96,7 +90,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "coverage.h"
#include "df.h"
-#include "ggc.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 8f07884..6c15ede 100644
--- a/gcc/fixed-value.c
+++ b/gcc/fixed-value.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "diagnostic-core.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 519c2d1..dffd935 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -45,12 +45,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -58,10 +55,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "realmpfr.h"
#include "rtl.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -86,9 +81,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimplify.h"
#include "tree-dfa.h"
-#include "hash-table.h" /* Required for ENABLE_FOLD_CHECKING. */
#include "builtins.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index cf42e38..d77cc1a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,28 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * convert.c : Adjust include files.
+ * cpp.c : Likewise.
+ * decl.c : Likewise.
+ * f95-lang.c : Likewise.
+ * gfortran.h : Likewise.
+ * iresolve.c : Likewise.
+ * match.c : Likewise.
+ * module.c : Likewise.
+ * openmp.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-06-08 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66245
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index c2ab964..ff2fc3d 100644
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "convert.h"
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index ac1ef6d..9e98d25 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -20,12 +20,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "version.h"
#include "flags.h"
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index d8cc768..9850757 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "parse.h"
#include "flags.h"
#include "constructor.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index f439427..6daac83 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -28,13 +28,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "gfortran.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "flags.h"
#include "langhooks.h"
@@ -44,13 +41,11 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "ggc.h"
#include "toplev.h"
#include "target.h"
#include "debug.h"
#include "diagnostic.h" /* For errorcount/warningcount */
#include "dumpfile.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 905d47c..8e4ca42 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -52,7 +52,6 @@ not after.
#include "intl.h"
#include "input.h"
#include "splay-tree.h"
-#include "vec.h"
/* Major control parameters. */
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index b6b0fc1..784bbe5 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "gfortran.h"
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index c064135..4394d7b 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "gfortran.h"
#include "match.h"
#include "parse.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index e183d90..15ee093 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -73,13 +73,10 @@ along with GCC; see the file COPYING3. If not see
#include "parse.h" /* FIXME */
#include "constructor.h"
#include "cpp.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "scanner.h"
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 21de607..8d10608 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "arith.h"
#include "match.h"
#include "parse.h"
-#include "hash-set.h"
#include "diagnostic.h"
#include "gomp-constants.h"
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index c7833c7..0b53ea9 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "flags.h"
#include "intl.h"
diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index ec18b4a..25d8106 100644
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 f552ff9..5ea9aec 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -79,13 +79,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "gfortran.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "gimple-expr.h"
diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c
index ca01b0b..add37b6 100644
--- a/gcc/fortran/trans-common.c
+++ b/gcc/fortran/trans-common.c
@@ -97,12 +97,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 30c6535..6b855d3 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "gfortran.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 65bd37d..b9c16fb 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "gfortran.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -39,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "attribs.h"
#include "tree-dump.h"
#include "gimple-expr.h" /* For create_tmp_var_raw. */
-#include "ggc.h"
#include "diagnostic-core.h" /* For internal_error. */
#include "toplev.h" /* For announce_function. */
#include "target.h"
@@ -47,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "function.h"
#include "flags.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 5a704cf..1c880bc 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "gfortran.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 2c16357..d27732f 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -25,18 +25,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h" /* For UNITS_PER_WORD. */
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "tree-nested.h"
#include "stor-layout.h"
-#include "ggc.h"
#include "gfortran.h"
#include "diagnostic-core.h" /* For internal_error. */
#include "toplev.h" /* For rest_of_decl_compilation. */
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index cdbd0e6..02bb0f2 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -22,18 +22,14 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
#include "stor-layout.h"
-#include "ggc.h"
#include "gfortran.h"
#include "diagnostic-core.h" /* For internal_error. */
#include "trans.h"
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 7facfb7..3d82447 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "gimple-expr.h"
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index e51cf15..a7f39d0 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -42,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "trans-const.h"
#include "arith.h"
#include "dependency.h"
-#include "ggc.h"
typedef struct iter_info
{
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index fcfe7b1..657afeb 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -33,19 +33,15 @@ along with GCC; see the file COPYING3. If not see
LONG_TYPE_SIZE, LONG_LONG_TYPE_SIZE,
FLOAT_TYPE_SIZE, DOUBLE_TYPE_SIZE and
LONG_DOUBLE_TYPE_SIZE. */
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
#include "langhooks.h" /* For iso-c-bindings.def. */
#include "target.h"
-#include "ggc.h"
#include "gfortran.h"
#include "diagnostic-core.h" /* For fatal_error. */
#include "toplev.h" /* For rest_of_decl_compilation. */
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index def4ffb..e07c6d8 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "gfortran.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "gimple-expr.h" /* For create_tmp_var_raw. */
diff --git a/gcc/function.c b/gcc/function.c
index aec8af6..8baaed7 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -36,12 +36,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl-error.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -49,11 +46,9 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "flags.h"
#include "except.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index 40180d4..75b7d54 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -32,9 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "obstack.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index 5fbc46c..e6205eb 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -29,9 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "highlev-plugin-common.h"
#include "tm.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -43,17 +40,13 @@ along with GCC; see the file COPYING3. If not see
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
-#include "statistics.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
#include "tree-core.h"
-#include "hash-set.h"
-#include "inchash.h"
#include "fold-const.h"
#include "tree-check.h"
diff --git a/gcc/gcc.c b/gcc/gcc.c
index a8e9c8c..9224bd8 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -41,7 +41,6 @@ compilation is specified by a string called a "spec". */
#include "flags.h"
#include "opts.h"
#include "params.h"
-#include "vec.h"
#include "filenames.h"
/* By default there is no special suffix for target executables. */
diff --git a/gcc/gcse-common.c b/gcc/gcse-common.c
index 00a8ba7..c9f7329 100644
--- a/gcc/gcse-common.c
+++ b/gcc/gcse-common.c
@@ -25,7 +25,6 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "vec.h"
#include "predict.h"
#include "bitmap.h"
#include "basic-block.h"
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 2d456b5..e4b8a2f 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -140,12 +140,9 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "hard-reg-set.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "regs.h"
@@ -162,8 +159,6 @@ along with GCC; see the file COPYING3. If not see
#include "lcm.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -173,14 +168,12 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "except.h"
-#include "ggc.h"
#include "params.h"
#include "alloc-pool.h"
#include "cselib.h"
#include "intl.h"
#include "obstack.h"
#include "tree-pass.h"
-#include "hash-table.h"
#include "df.h"
#include "dbgcnt.h"
#include "target.h"
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 424cb88..2beb7ee 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -5108,16 +5108,10 @@ write_header (FILE *outf)
fprintf (outf, "#include \"system.h\"\n");
fprintf (outf, "#include \"coretypes.h\"\n");
fprintf (outf, "#include \"tm.h\"\n");
- fprintf (outf, "#include \"hash-set.h\"\n");
- fprintf (outf, "#include \"machmode.h\"\n");
- fprintf (outf, "#include \"vec.h\"\n");
- fprintf (outf, "#include \"double-int.h\"\n");
fprintf (outf, "#include \"input.h\"\n");
fprintf (outf, "#include \"alias.h\"\n");
fprintf (outf, "#include \"symtab.h\"\n");
fprintf (outf, "#include \"options.h\"\n");
- fprintf (outf, "#include \"wide-int.h\"\n");
- fprintf (outf, "#include \"inchash.h\"\n");
fprintf (outf, "#include \"tree.h\"\n");
fprintf (outf, "#include \"varasm.h\"\n");
fprintf (outf, "#include \"stor-layout.h\"\n");
diff --git a/gcc/genautomata.c b/gcc/genautomata.c
index 896f7af..68933fe 100644
--- a/gcc/genautomata.c
+++ b/gcc/genautomata.c
@@ -114,8 +114,6 @@ along with GCC; see the file COPYING3. If not see
#include "gensupport.h"
#include <math.h>
-#include "hashtab.h"
-#include "vec.h"
#include "fnmatch.h"
#ifndef CHAR_BIT
@@ -9675,15 +9673,9 @@ main (int argc, char **argv)
"#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 \"tree.h\"\n"
"#include \"varasm.h\"\n"
"#include \"stor-layout.h\"\n"
diff --git a/gcc/genconditions.c b/gcc/genconditions.c
index 927c455..c1925fe 100644
--- a/gcc/genconditions.c
+++ b/gcc/genconditions.c
@@ -31,7 +31,6 @@
#include "tm.h"
#include "rtl.h"
#include "errors.h"
-#include "hashtab.h"
#include "read-md.h"
#include "gensupport.h"
@@ -70,11 +69,8 @@ write_header (void)
#include \"coretypes.h\"\n\
#include \"tm.h\"\n\
#include \"insn-constants.h\"\n\
-#include \"ggc.h\"\n\
#include \"rtl.h\"\n\
#include \"tm_p.h\"\n\
-#include \"hashtab.h\"\n\
-#include \"hash-set.h\"\n\
#include \"hard-reg-set.h\"\n\
#include \"function.h\"\n\
\n\
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 3e3dff7..29437b9 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -808,28 +808,18 @@ from the machine description file `md'. */\n\n");
printf ("#include \"system.h\"\n");
printf ("#include \"coretypes.h\"\n");
printf ("#include \"tm.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 \"hashtab.h\"\n");
printf ("#include \"hard-reg-set.h\"\n");
printf ("#include \"function.h\"\n");
printf ("#include \"flags.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");
diff --git a/gcc/generic-match-head.c b/gcc/generic-match-head.c
index eb90986..e2fdf3c 100644
--- a/gcc/generic-match-head.c
+++ b/gcc/generic-match-head.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -46,9 +43,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "gimple-fold.h"
#include "gimple-iterator.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/genextract.c b/gcc/genextract.c
index b4df083..becd8ef 100644
--- a/gcc/genextract.c
+++ b/gcc/genextract.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "errors.h"
#include "read-md.h"
#include "gensupport.h"
-#include "vec.h"
/* This structure contains all the information needed to describe one
set of extractions methods. Each method may be used by more than
diff --git a/gcc/gengtype-state.c b/gcc/gengtype-state.c
index 5588b9e..be4db15 100644
--- a/gcc/gengtype-state.c
+++ b/gcc/gengtype-state.c
@@ -31,7 +31,6 @@
#endif
#include "system.h"
#include "errors.h" /* For fatal. */
-#include "hashtab.h"
#include "version.h" /* For version_string & pkgversion_string. */
#include "obstack.h"
#include "gengtype.h"
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index eda1db7..137e0ffd 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -27,7 +27,6 @@
#include "errors.h" /* for fatal */
#include "getopt.h"
#include "version.h" /* for version_string & pkgversion_string. */
-#include "hashtab.h"
#include "xregex.h"
#include "obstack.h"
#include "gengtype.h"
@@ -1712,19 +1711,17 @@ 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",
- "hashtab.h", "splay-tree.h", "obstack.h", "bitmap.h", "input.h",
- "hash-set.h", "machmode.h", "vec.h", "double-int.h", "input.h",
+ "splay-tree.h", "obstack.h", "bitmap.h", "input.h",
"alias.h", "symtab.h", "options.h",
- "wide-int.h", "inchash.h",
"tree.h", "fold-const.h", "rtl.h",
- "machmode.h", "tm.h", "hard-reg-set.h", "input.h", "predict.h",
- "function.h", "insn-config.h", "flags.h", "statistics.h",
- "real.h", "fixed-value.h", "tree.h", "expmed.h", "dojump.h",
+ "hard-reg-set.h", "predict.h",
+ "function.h", "insn-config.h", "flags.h",
+ "tree.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", "ggc.h",
- "ggc.h", "dominance.h", "cfg.h", "basic-block.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",
diff --git a/gcc/genhooks.c b/gcc/genhooks.c
index 285f85d..b191fb5 100644
--- a/gcc/genhooks.c
+++ b/gcc/genhooks.c
@@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "bconfig.h"
#include "system.h"
-#include "hashtab.h"
#include "errors.h"
struct hook_desc { const char *doc, *type, *name, *param, *init, *docname; };
diff --git a/gcc/genmatch.c b/gcc/genmatch.c
index f271703..0ecb97a 100644
--- a/gcc/genmatch.c
+++ b/gcc/genmatch.c
@@ -25,15 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include <new>
#include "system.h"
#include "coretypes.h"
-#include "ggc.h"
#include <cpplib.h>
#include "errors.h"
-#include "hashtab.h"
#include "hash-table.h"
-#include "inchash.h"
-#include "hash-map.h"
#include "hash-set.h"
-#include "vec.h"
#include "is-a.h"
diff --git a/gcc/genmodes.c b/gcc/genmodes.c
index af1fe4f..8e9337c 100644
--- a/gcc/genmodes.c
+++ b/gcc/genmodes.c
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "bconfig.h"
#include "system.h"
#include "errors.h"
-#include "hashtab.h"
/* enum mode_class is normally defined by machmode.h but we can't
include that header here. */
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 217eb50..88177d5 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -112,8 +112,6 @@
#include "errors.h"
#include "read-md.h"
#include "gensupport.h"
-#include "hash-table.h"
-#include "inchash.h"
#include <algorithm>
#undef GENERATOR_FILE
diff --git a/gcc/gensupport.c b/gcc/gensupport.c
index d828051..2f26f3a 100644
--- a/gcc/gensupport.c
+++ b/gcc/gensupport.c
@@ -24,7 +24,6 @@
#include "rtl.h"
#include "obstack.h"
#include "errors.h"
-#include "hashtab.h"
#include "read-md.h"
#include "gensupport.h"
diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
index cd81770..6021c2a 100644
--- a/gcc/ggc-common.c
+++ b/gcc/ggc-common.c
@@ -23,17 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
-#include "ggc.h"
#include "ggc-internal.h"
#include "diagnostic-core.h"
#include "params.h"
#include "hosthooks.h"
#include "hosthooks-def.h"
#include "plugin.h"
-#include "vec.h"
#include "timevar.h"
-#include "mem-stats.h"
/* When set, ggc_collect will do collection. */
bool ggc_force_collect;
diff --git a/gcc/ggc-internal.h b/gcc/ggc-internal.h
index 8781010..3c37212 100644
--- a/gcc/ggc-internal.h
+++ b/gcc/ggc-internal.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GGC_INTERNAL_H
#define GCC_GGC_INTERNAL_H
-#include "ggc.h"
/* Call ggc_set_mark on all the roots. */
extern void ggc_mark_roots (void);
diff --git a/gcc/ggc-none.c b/gcc/ggc-none.c
index 4d3844b..cea6fad 100644
--- a/gcc/ggc-none.c
+++ b/gcc/ggc-none.c
@@ -29,7 +29,7 @@
#include "system.h"
#include "coretypes.h"
-#include "ggc.h"
+#include "hash-table.h"
/* For a given size of memory requested for allocation, return the
actual size that is going to be allocated. */
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index ce18a7b..42098d8 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -21,27 +21,19 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "tm_p.h"
#include "diagnostic-core.h"
#include "flags.h"
-#include "ggc.h"
#include "ggc-internal.h"
#include "timevar.h"
#include "params.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/ggc.h b/gcc/ggc.h
index 2f73a9b..ebc6a5d 100644
--- a/gcc/ggc.h
+++ b/gcc/ggc.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GGC_H
#define GCC_GGC_H
-#include "statistics.h"
/* Symbols are marked with `ggc' for `gcc gc' so as not to interfere with
an external gc library that might be linked in. */
diff --git a/gcc/gimple-builder.c b/gcc/gimple-builder.c
index dcb22c0..0cf5ea0 100644
--- a/gcc/gimple-builder.c
+++ b/gcc/gimple-builder.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index d2fbe22..7bbbe17 100644
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index db61245..7c17fde 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -22,21 +22,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -67,7 +62,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "tree-ssa-propagate.h"
#include "target.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index bce29fd..84d7f5e 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -45,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index f1ba3d7..ac2a0df 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-nested.h"
diff --git a/gcc/gimple-match-head.c b/gcc/gimple-match-head.c
index a1ef415..8fbb489 100644
--- a/gcc/gimple-match-head.c
+++ b/gcc/gimple-match-head.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -46,9 +43,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "gimple-fold.h"
#include "gimple-iterator.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index 40ea43a..5fa4a0a 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -48,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/gimple-ssa-isolate-paths.c b/gcc/gimple-ssa-isolate-paths.c
index 61879b1..a4626be 100644
--- a/gcc/gimple-ssa-isolate-paths.c
+++ b/gcc/gimple-ssa-isolate-paths.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index adc4565..e5e9b6d 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -36,13 +36,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -60,10 +57,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "stor-layout.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/gimple-ssa.h b/gcc/gimple-ssa.h
index 0b56a61..2bfcc03 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 "hash-map.h"
#include "tree-hasher.h"
#include "tree-ssa-operands.h"
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index 5face58..b2c1433 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "diagnostic.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c
index 0116c24..1b2a5af 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/gimple-streamer.h b/gcc/gimple-streamer.h
index 1fef4d7..b4e52f4 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 "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/gimple-walk.c b/gcc/gimple-walk.c
index cdaf31e..b416ac8 100644
--- a/gcc/gimple-walk.c
+++ b/gcc/gimple-walk.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "predict.h"
#include "hard-reg-set.h"
diff --git a/gcc/gimple.c b/gcc/gimple.c
index 25d0e8a..bc65223 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "target.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
diff --git a/gcc/gimplify-me.c b/gcc/gimplify-me.c
index 89741e1..44b59a5 100644
--- a/gcc/gimplify-me.c
+++ b/gcc/gimplify-me.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stmt.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 6d4618a..39911a1 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -23,22 +23,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -68,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "bitmap.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index f996de2..91c2815 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * go-backend.c : Adjust include files.
+ * go-gcc.cc : Likewise.
+ * go-lang.c : Likewise.
+
2015-06-05 Aldy Hernandez <aldyh@redhat.com>
* go-gcc.cc (write_global_definitions): Remove call to
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index 7f452f5..e8dda31 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "simple-object.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 65f4181..d4e5142 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -24,7 +24,6 @@
// include it here before tree.h includes it later.
#include <gmp.h>
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index 28db40a..ce4dd9b 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "ansidecl.h"
#include "coretypes.h"
#include "opts.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm.h"
diff --git a/gcc/godump.c b/gcc/godump.c
index da39d1f..63bd7dd 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -31,16 +31,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "diagnostic-core.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
-#include "ggc.h"
-#include "hash-set.h"
#include "obstack.h"
#include "debug.h"
#include "wide-int-print.h"
diff --git a/gcc/graph.c b/gcc/graph.c
index 5b36874..f73eab6 100644
--- a/gcc/graph.c
+++ b/gcc/graph.c
@@ -25,9 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h" /* for fatal_error */
#include "sbitmap.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/graphds.c b/gcc/graphds.c
index ca8c1e8..3a87486 100644
--- a/gcc/graphds.c
+++ b/gcc/graphds.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "obstack.h"
#include "bitmap.h"
-#include "vec.h"
#include "graphds.h"
/* Dumps graph G into F. */
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index 9f3f924..a14a474 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -32,13 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index 9fb0c9e..2abf0c9 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index 55cff16..2ff3951 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -43,13 +43,10 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 8ccd87b..2bb7620 100644
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -38,13 +38,10 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index eabb5c0..74602c7 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -32,13 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index 5b5af02..28b696b 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -43,13 +43,10 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
#include "diagnostic-core.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index d6b0797..56548d6 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 356f0a5..ba38e1c 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -40,13 +40,10 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -84,10 +81,8 @@ extern "C" {
#include "tree-ssa-propagate.h"
#ifdef HAVE_isl
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/graphite.c b/gcc/graphite.c
index 245c336..afcc6ad 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -44,13 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "diagnostic-core.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 0d10f8a..fc7e0a1 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -131,9 +131,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "flags.h"
@@ -155,7 +152,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "ira.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
-#include "hash-table.h"
#include "dumpfile.h"
#ifdef INSN_SCHEDULING
diff --git a/gcc/hard-reg-set.h b/gcc/hard-reg-set.h
index 89971d7..8aaf423 100644
--- a/gcc/hard-reg-set.h
+++ b/gcc/hard-reg-set.h
@@ -20,8 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_HARD_REG_SET_H
#define GCC_HARD_REG_SET_H
-#include "hash-table.h"
-
/* Define the type of a set of hard registers. */
/* HARD_REG_ELT_TYPE is a typedef of the unsigned integral type which
diff --git a/gcc/hash-map.h b/gcc/hash-map.h
index fb1a522..f28f74f 100644
--- a/gcc/hash-map.h
+++ b/gcc/hash-map.h
@@ -21,13 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef hash_map_h
#define hash_map_h
-#include <new>
-#include <utility>
-#include "hash-table.h"
-#include "hash-map-traits.h"
-#include "mem-stats.h"
-#include "vec.h"
-
template<typename Key, typename Value,
typename Traits>
class GTY((user)) hash_map
diff --git a/gcc/hash-set.h b/gcc/hash-set.h
index b4db21a..af91e31 100644
--- a/gcc/hash-set.h
+++ b/gcc/hash-set.h
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef hash_set_h
#define hash_set_h
-#include "hash-table.h"
-
/* implement default behavior for traits when types allow it. */
struct default_hashset_traits
diff --git a/gcc/hash-table.h b/gcc/hash-table.h
index 74c3722..512f162 100644
--- a/gcc/hash-table.h
+++ b/gcc/hash-table.h
@@ -196,10 +196,13 @@ along with GCC; see the file COPYING3. If not see
#ifndef TYPED_HASHTAB_H
#define TYPED_HASHTAB_H
+#include "statistics.h"
#include "ggc.h"
+#include "vec.h"
#include "hashtab.h"
-#include <new>
+#include "inchash.h"
#include "mem-stats-traits.h"
+#include "hash-map-traits.h"
template<typename, typename, typename> class hash_map;
template<typename, typename> class hash_set;
@@ -774,7 +777,6 @@ private:
#include "mem-stats.h"
#include "hash-map.h"
-#include "vec.h"
extern mem_alloc_description<mem_usage> hash_table_usage;
diff --git a/gcc/hw-doloop.c b/gcc/hw-doloop.c
index a6ba6b6..27f2220 100644
--- a/gcc/hw-doloop.c
+++ b/gcc/hw-doloop.c
@@ -25,15 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index f3616d7..fd3d258 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -24,9 +24,6 @@
#include "rtl.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -42,9 +39,7 @@
#include "cfgcleanup.h"
#include "basic-block.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/inchash.c b/gcc/inchash.c
index 90c62e8..ddd6763 100644
--- a/gcc/inchash.c
+++ b/gcc/inchash.c
@@ -24,5 +24,3 @@ along with GCC; see the file COPYING3. If not see
#endif
#include "system.h"
#include "coretypes.h"
-#include "hashtab.h"
-#include "inchash.h"
diff --git a/gcc/inchash.h b/gcc/inchash.h
index 03a25b4..e0dfdff 100644
--- a/gcc/inchash.h
+++ b/gcc/inchash.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef INCHASH_H
#define INCHASH_H 1
-#include "hashtab.h"
/* This file implements an incremential hash function ADT, to be used
by code that incrementially hashes a lot of unrelated data
diff --git a/gcc/incpath.c b/gcc/incpath.c
index 6bdc4f1..ffb3a04 100644
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -20,7 +20,6 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "vec.h"
#include "target.h"
#include "tm.h"
#include "cpplib.h"
diff --git a/gcc/init-regs.c b/gcc/init-regs.c
index 9c41574..6d743d5 100644
--- a/gcc/init-regs.c
+++ b/gcc/init-regs.c
@@ -21,20 +21,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "regs.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/input.c b/gcc/input.c
index 01230f2..b501a14 100644
--- a/gcc/input.c
+++ b/gcc/input.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "intl.h"
#include "input.h"
-#include "vec.h"
#include "diagnostic-core.h"
/* This is a cache used by get_next_line to store the content of a
diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c
index a93698e..9ac8827 100644
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.c
@@ -20,24 +20,19 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "internal-fn.h"
#include "stor-layout.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ipa-chkp.c b/gcc/ipa-chkp.c
index 391b0d9..f3d7c73 100644
--- a/gcc/ipa-chkp.c
+++ b/gcc/ipa-chkp.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/ipa-comdats.c b/gcc/ipa-comdats.c
index 659ab6d..a188da0 100644
--- a/gcc/ipa-comdats.c
+++ b/gcc/ipa-comdats.c
@@ -52,17 +52,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 43b7559..44efa19 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -103,14 +103,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
-#include "hash-map.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "gimple-fold.h"
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index aba57e0..d7d97ec 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -109,13 +109,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "hash-map.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
@@ -128,10 +124,8 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -142,7 +136,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tree-pass.h"
#include "target.h"
-#include "hash-table.h"
#include "tree-pretty-print.h"
#include "ipa-utils.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c
index 8f885b0..91e18ae 100644
--- a/gcc/ipa-icf-gimple.c
+++ b/gcc/ipa-icf-gimple.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -41,10 +38,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -63,7 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "cfgloop.h"
#include "except.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 207a00d..d800e1e 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -55,13 +55,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include <list>
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -76,10 +73,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -98,7 +93,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "tree-pass.h"
#include "gimple-pretty-print.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
@@ -108,7 +102,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-inline.h"
#include "cfgloop.h"
#include "except.h"
-#include "hash-table.h"
#include "coverage.h"
#include "attribs.h"
#include "print-tree.h"
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 2363786..bbde855 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -68,12 +68,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -108,7 +105,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 9416fc7..43cc497 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -32,19 +32,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
#include "intl.h"
#include "coverage.h"
-#include "ggc.h"
#include "tree-cfg.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index e976e89..4380f0d 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -93,12 +93,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "trans-mem.h"
@@ -126,7 +123,6 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index 22c90ca..7aa9663 100644
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@@ -22,22 +22,17 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
#include "calls.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -51,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "predict.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c
index a05e053..1bc2ca4 100644
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@@ -48,19 +48,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index d9db13f..9290bfb 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -43,10 +40,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -64,7 +59,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-walk.h"
#include "langhooks.h"
#include "target.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 71bb73d..2150186 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -35,12 +35,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
@@ -66,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-pass.h"
#include "langhooks.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-ref.c b/gcc/ipa-ref.c
index 4a35ebb..1397331 100644
--- a/gcc/ipa-ref.c
+++ b/gcc/ipa-ref.c
@@ -21,18 +21,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "ggc.h"
#include "target.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "tm.h"
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 2c51111..0e5843c 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -40,13 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
@@ -63,7 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-pass.h"
#include "splay-tree.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 9d9aab3..a4ff477 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -77,13 +77,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -100,10 +97,8 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "stringpool.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -118,7 +113,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "target.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index 70ba595..c02657b 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -47,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "langhooks.h"
#include "splay-tree.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index ca81106..08f8bef 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -76,14 +76,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/ipa.c b/gcc/ipa.c
index 8b5a145..e42ad5e 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@@ -21,20 +21,16 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
#include "stringpool.h"
#include "predict.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/ira-build.c b/gcc/ira-build.c
index a4e3116..f0d0ed3 100644
--- a/gcc/ira-build.c
+++ b/gcc/ira-build.c
@@ -29,9 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 2a1eb8b..b9e1bda 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -29,21 +29,15 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "sbitmap.h"
#include "bitmap.h"
-#include "hash-table.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c
index 6e8ded8..52397a7 100644
--- a/gcc/ira-conflicts.c
+++ b/gcc/ira-conflicts.c
@@ -29,9 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "basic-block.h"
diff --git a/gcc/ira-costs.c b/gcc/ira-costs.c
index 4c0a83d..af6c5f0 100644
--- a/gcc/ira-costs.c
+++ b/gcc/ira-costs.c
@@ -22,19 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-table.h"
#include "hard-reg-set.h"
#include "rtl.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/ira-emit.c b/gcc/ira-emit.c
index b8b8d25..54804eb 100644
--- a/gcc/ira-emit.c
+++ b/gcc/ira-emit.c
@@ -78,9 +78,6 @@ along with GCC; see the file COPYING3. If not see
#include "bitmap.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -89,9 +86,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgbuild.h"
#include "basic-block.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index 8c375cc..dd9614c 100644
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -30,9 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "basic-block.h"
diff --git a/gcc/ira.c b/gcc/ira.c
index 0511049..02dc8b2 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -368,12 +368,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "regs.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "tm_p.h"
@@ -391,8 +388,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgcleanup.h"
#include "basic-block.h"
#include "df.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -409,7 +404,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "reload.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "ira-int.h"
#include "lra.h"
#include "dce.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 641c703..22abc32 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,27 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * boehm.c : Adjust include files.
+ * builtins.c : Likewise.
+ * class.c : Likewise.
+ * constants.c : Likewise.
+ * decl.c : Likewise.
+ * except.c : Likewise.
+ * expr.c : Likewise.
+ * java-gimplify.c : Likewise.
+ * java-tree.h : Likewise.
+ * jcf-dump.c : Likewise.
+ * jcf-io.c : Likewise.
+ * jcf-parse.c : Likewise.
+ * jcf-reader.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.
+ * verify-impl.c : Likewise.
+
2015-06-05 Aldy Hernandez <aldyh@redhat.com>
* jcf-parse.c: Include toplev.h.
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c
index 027305a..36f0eb6 100644
--- a/gcc/java/boehm.c
+++ b/gcc/java/boehm.c
@@ -27,13 +27,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
#include "parse.h"
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index fa1e12c..5ec0fee 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -30,18 +30,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
-#include "ggc.h"
#include "flags.h"
#include "langhooks.h"
#include "java-tree.h"
@@ -50,10 +46,8 @@ 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 "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 1d66c72..14d2706 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -26,13 +26,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -50,8 +47,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "ggc.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index 0b5dfcf..d2d67fd 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -25,12 +25,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "jcf.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -38,7 +35,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "java-tree.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "ggc.h"
static void set_constant_entry (CPool *, int, int, jword);
static int find_tree_constant (CPool *, int, tree);
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index de75eb6..3b2df782 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -27,13 +27,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "stringpool.h"
@@ -44,8 +41,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "java-tree.h"
#include "jcf.h"
#include "java-except.h"
-#include "ggc.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "tm.h"
diff --git a/gcc/java/except.c b/gcc/java/except.c
index 5e141e3..bb818ac 100644
--- a/gcc/java/except.c
+++ b/gcc/java/except.c
@@ -25,12 +25,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 16a7884..4563a6f 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -32,12 +32,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
MODIFY_JNI_METHOD_CALL and
PARM_BOUNDARY. */
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -50,7 +47,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "java-except.h"
#include "parse.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "tree-iterator.h"
#include "target.h"
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index b84e115..08981bb 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -24,13 +24,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "java-tree.h"
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index 58a60b8..7c9a519 100644
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -27,7 +27,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#ifndef GCC_JAVA_TREE_H
#define GCC_JAVA_TREE_H
-#include "hashtab.h"
struct JCF;
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index e527a65..4c8ecda 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -54,13 +54,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "diagnostic.h"
#include "jcf.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 0508fc6..2cedf8b 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -28,16 +28,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "jcf.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
-#include "hash-table.h"
#include <dirent.h>
#include "zlib.h"
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 721696b..b9b6e6f 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -26,13 +26,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "obstack.h"
@@ -43,9 +40,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "java-tree.h"
#include "diagnostic-core.h"
#include "parse.h"
-#include "ggc.h"
#include "debug.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "tm.h"
diff --git a/gcc/java/jcf-reader.c b/gcc/java/jcf-reader.c
index 6685146..3e15257 100644
--- a/gcc/java/jcf-reader.c
+++ b/gcc/java/jcf-reader.c
@@ -23,7 +23,6 @@ Java and all Java-based marks are trademarks or registered trademarks
of Sun Microsystems, Inc. in the United States and other countries.
The Free Software Foundation is independent of Sun Microsystems, Inc. */
-#include "ggc.h"
#include "jcf.h"
#include "zipfile.h"
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 9b55aa6..597f6db 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -28,13 +28,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "obstack.h"
#include "jcf.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
#include "intl.h"
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 84b1680..5bd919a 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -27,12 +27,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "input.h"
#include "java-tree.h"
@@ -40,7 +37,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "langhooks.h"
#include "langhooks-def.h"
#include "flags.h"
-#include "ggc.h"
#include "diagnostic.h"
#include "tree-inline.h"
#include "splay-tree.h"
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index 76ab3de..e74925d 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -28,19 +28,15 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "jcf.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "java-tree.h"
#include "obstack.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "langhooks-def.h"
static void mangle_class_field (tree);
diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c
index 70799b1..3457f62 100644
--- a/gcc/java/mangle_name.c
+++ b/gcc/java/mangle_name.c
@@ -28,13 +28,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "jcf.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
#include "obstack.h"
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 9c8ef2c..6c51ae1 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -24,13 +24,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -44,9 +41,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "ggc.h"
#include "tree-iterator.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index 5e781c7..d2c9c9b 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -26,13 +26,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -43,7 +40,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "convert.h"
#include "diagnostic-core.h"
-#include "ggc.h"
static tree convert_ieee_real_to_integer (tree, tree);
static tree parse_signature_type (const unsigned char **,
diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c
index 18e1ff3..6af3f7a 100644
--- a/gcc/java/verify-glue.c
+++ b/gcc/java/verify-glue.c
@@ -27,13 +27,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "parse.h"
diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c
index eef7967..0e63c7e 100644
--- a/gcc/java/verify-impl.c
+++ b/gcc/java/verify-impl.c
@@ -15,13 +15,10 @@ details. */
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "verify.h"
/* Hack to work around namespace pollution from java-tree.h. */
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 3230822..1931433 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * dummy-frontend.c : Adjust include files.
+ * jit-common.h : Likewise.
+ * jit-playback.c : Likewise.
+
2015-06-05 David Malcolm <dmalcolm@redhat.com>
* dummy-frontend.c
diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index 41d14f5..a0c404d 100644
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "opts.h"
-#include "hash-set.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 04f7816..160e7c8 100644
--- a/gcc/jit/jit-common.h
+++ b/gcc/jit/jit-common.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "libgccjit.h"
-#include "hash-set.h"
#include "input.h"
#include "vec.h"
#include "alias.h"
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index 091a5ce..dbbfc52 100644
--- a/gcc/jit/jit-playback.c
+++ b/gcc/jit/jit-playback.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "opts.h"
#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "statistics.h"
#include "vec.h"
diff --git a/gcc/jump.c b/gcc/jump.c
index 96e7b53..5d4beac 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -45,9 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "insn-attr.h"
#include "recog.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "predict.h"
@@ -56,9 +53,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgrtl.h"
#include "basic-block.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index a1fe995..62f1612 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "tm.h"
#include "toplev.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "attribs.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks-def.h"
#include "diagnostic.h"
#include "tree-diagnostic.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/lcm.c b/gcc/lcm.c
index 9e8f523..ac27ec5 100644
--- a/gcc/lcm.c
+++ b/gcc/lcm.c
@@ -59,9 +59,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/libfuncs.h b/gcc/libfuncs.h
index dfec1d7..a2e8414 100644
--- a/gcc/libfuncs.h
+++ b/gcc/libfuncs.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_LIBFUNCS_H
#define GCC_LIBFUNCS_H
-#include "hashtab.h"
/* Enumeration of indexes into libfunc_table. */
enum libfunc_index
diff --git a/gcc/lists.c b/gcc/lists.c
index 3aa460b..1e1fd32 100644
--- a/gcc/lists.c
+++ b/gcc/lists.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic-core.h"
#include "rtl.h"
-#include "ggc.h"
static void free_list (rtx *, rtx *);
diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index 0aa0709..e78076e 100644
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -25,15 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index 7a51611..90898f9 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "regs.h"
#include "obstack.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "flags.h"
#include "df.h"
-#include "ggc.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 4a020a0..a782f3c 100644
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -43,9 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "obstack.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -55,9 +52,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
@@ -71,7 +66,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "target.h"
#include "df.h"
-#include "hash-table.h"
#include "except.h"
#include "params.h"
#include "regs.h"
diff --git a/gcc/loop-iv.c b/gcc/loop-iv.c
index 81603e5..fdd3323 100644
--- a/gcc/loop-iv.c
+++ b/gcc/loop-iv.c
@@ -55,9 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "obstack.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -66,9 +63,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
@@ -82,7 +77,6 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "diagnostic-core.h"
#include "df.h"
-#include "hash-table.h"
#include "dumpfile.h"
#include "rtl-iter.h"
diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c
index 5beff1c..ec7755e 100644
--- a/gcc/loop-unroll.c
+++ b/gcc/loop-unroll.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
#include "obstack.h"
@@ -42,9 +39,7 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -54,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "hash-table.h"
#include "recog.h"
#include "target.h"
#include "dumpfile.h"
diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c
index 0d2c729..e89c55d 100644
--- a/gcc/lower-subreg.c
+++ b/gcc/lower-subreg.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "tm_p.h"
@@ -46,8 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "bitmap.h"
#include "dce.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c
index 0ad91d0..8bbede0 100644
--- a/gcc/lra-assigns.c
+++ b/gcc/lra-assigns.c
@@ -87,16 +87,11 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lra-coalesce.c b/gcc/lra-coalesce.c
index f8692fa..10eaf17 100644
--- a/gcc/lra-coalesce.c
+++ b/gcc/lra-coalesce.c
@@ -54,15 +54,10 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 756871b..898dbec 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -120,16 +120,11 @@
#include "output.h"
#include "addresses.h"
#include "target.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c
index 920efc1..d8cbb47 100644
--- a/gcc/lra-eliminations.c
+++ b/gcc/lra-eliminations.c
@@ -65,16 +65,11 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "addresses.h"
#include "target.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index d3dce46..66baadd 100644
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -36,16 +36,11 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lra-remat.c b/gcc/lra-remat.c
index 7e089d0..b4f83d1 100644
--- a/gcc/lra-remat.c
+++ b/gcc/lra-remat.c
@@ -65,16 +65,11 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lra-spills.c b/gcc/lra-spills.c
index 3cf54c3..2b3e088 100644
--- a/gcc/lra-spills.c
+++ b/gcc/lra-spills.c
@@ -67,15 +67,10 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lra.c b/gcc/lra.c
index 03c7392..e44cec0 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -114,16 +114,11 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "addresses.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "optabs.h"
-#include "statistics.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index b5557f8..42db4d8 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -42,10 +39,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -61,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "except.h"
#include "timevar.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-compress.c b/gcc/lto-compress.c
index 51d0991..f2b780b 100644
--- a/gcc/lto-compress.c
+++ b/gcc/lto-compress.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
system.h. */
#include <zlib.h>
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -49,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "langhooks.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c
index 8247b81..2b2a61f 100644
--- a/gcc/lto-opts.c
+++ b/gcc/lto-opts.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -48,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "options.h"
#include "common/common-target.h"
#include "diagnostic.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index bd7735e..99a2930 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -40,10 +37,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -57,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "except.h"
#include "timevar.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index 1463216..b8db26c 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -40,10 +37,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -56,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "except.h"
#include "langhooks.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 1b83615..b4070de 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -25,21 +25,16 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "toplev.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -70,7 +65,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "except.h"
#include "debug.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 9f282ba..e14761b 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -24,22 +24,17 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -66,7 +61,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "except.h"
#include "lto-symtab.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index cb4d989..4f506b1 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "toplev.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -46,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "bitmap.h"
#include "diagnostic-core.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index e3465a8..6eb040b 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -24,10 +24,7 @@ along with GCC; see the file COPYING3. If not see
#define GCC_LTO_STREAMER_H
#include "plugin-api.h"
-#include "hash-table.h"
-#include "hash-map.h"
#include "target.h"
-#include "vec.h"
#include "alloc-pool.h"
#include "gcov-io.h"
#include "diagnostic.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 9ad289a..86771fe 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * lto-lang.c : Adjust include files.
+ * lto-object.c : Likewise.
+ * lto-partition.c : Likewise.
+ * lto-partition.h : Likewise.
+ * lto-symtab.c : Likewise.
+ * lto.c : Likewise.
+ * lto.h : Likewise.
+
2015-06-06 Jan Hubicka <hubicka@ucw.cz>
PR lto/65378
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index e1d6b7f..f9c908a 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "flags.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -52,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index 714f872..6a4d5ca 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "lto.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 823661a..52a791c 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "toplev.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -41,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/lto/lto-partition.h b/gcc/lto/lto-partition.h
index a44e8e7..904b1b4 100644
--- a/gcc/lto/lto-partition.h
+++ b/gcc/lto/lto-partition.h
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#include "hash-set.h"
/* Structure describing ltrans partitions. */
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index e808006..a6393c8 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "diagnostic-core.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "plugin-api.h"
-#include "hash-map.h"
#include "ipa-ref.h"
#include "cgraph.h"
#include "lto-streamer.h"
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index b93e512..b8e73cd 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "opts.h"
#include "toplev.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -37,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "predict.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
@@ -49,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "langhooks.h"
#include "bitmap.h"
-#include "inchash.h"
#include "alloc-pool.h"
#include "symbol-summary.h"
#include "ipa-prop.h"
diff --git a/gcc/lto/lto.h b/gcc/lto/lto.h
index 7b2c2c9..8f38ee8 100644
--- a/gcc/lto/lto.h
+++ b/gcc/lto/lto.h
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef LTO_H
#define LTO_H
-#include "hashtab.h"
-#include "vec.h"
/* A file. */
typedef struct lto_file_struct
diff --git a/gcc/mcf.c b/gcc/mcf.c
index 077e14c..81c1265 100644
--- a/gcc/mcf.c
+++ b/gcc/mcf.c
@@ -46,9 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/mem-stats.h b/gcc/mem-stats.h
index 7524ff7..6d3d79c7 100644
--- a/gcc/mem-stats.h
+++ b/gcc/mem-stats.h
@@ -1,11 +1,6 @@
#ifndef GCC_MEM_STATS_H
#define GCC_MEM_STATS_H
-#include "hash-map-traits.h"
-#include "inchash.h"
-#include "mem-stats-traits.h"
-#include "vec.h"
-
/* Forward declaration. */
template<typename Key, typename Value,
typename Traits = default_hashmap_traits>
@@ -358,7 +353,6 @@ private:
reverse_mem_map_t *m_reverse_map;
};
-#include "hash-map.h"
/* Returns true if instance PTR is registered by the memory description. */
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 5853e3a..be26d15 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "vec.h"
#include "target.h"
#include "rtl.h"
#include "regs.h"
@@ -30,8 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "predict.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index 39e9bc3..94b79c3 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -28,9 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "profile.h"
@@ -49,11 +46,9 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 46c3cfd..a7525af 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,14 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * objc-act.c : Adjust include files.
+ * 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-08 Aldy Hernandez <aldyh@redhat.com>
* objc-runtime-shared-support.c (build_module_descriptor): Set
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index f42f679..f536437 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -58,13 +55,11 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-target.h"
#include "diagnostic-core.h"
#include "intl.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
-#include "hash-table.h"
#include "langhooks-def.h"
/* Different initialization, code gen and meta data generation for each
runtime. */
diff --git a/gcc/objc/objc-encoding.c b/gcc/objc/objc-encoding.c
index f050ff0..1928de3 100644
--- a/gcc/objc/objc-encoding.c
+++ b/gcc/objc/objc-encoding.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.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 6986645..1937baf 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.c
+++ b/gcc/objc/objc-gnu-runtime-abi-01.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -51,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#endif /* OBJCPLUS */
#include "toplev.h"
-#include "ggc.h"
#include "tree-iterator.h"
#include "objc-runtime-hooks.h"
diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index 19a261b..fe50c38 100644
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.c
@@ -23,18 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "c/c-tree.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
-#include "ggc.h"
#include "objc-act.h"
#include "langhooks.h"
#include "langhooks-def.h"
diff --git a/gcc/objc/objc-map.c b/gcc/objc/objc-map.c
index 9c7330c..ebadf6a 100644
--- a/gcc/objc/objc-map.c
+++ b/gcc/objc/objc-map.c
@@ -20,15 +20,11 @@ Boston, MA 02110-1301, USA. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
-#include "ggc.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 0ae2dae..1e7522e 100644
--- a/gcc/objc/objc-next-runtime-abi-01.c
+++ b/gcc/objc/objc-next-runtime-abi-01.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -55,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "objcp-decl.h"
#endif /* OBJCPLUS */
-#include "ggc.h"
#include "target.h"
#include "c-family/c-target.h"
#include "tree-iterator.h"
diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index 5a8abff..fa6c0a2 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -57,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "objcp-decl.h"
#endif /* OBJCPLUS */
-#include "ggc.h"
#include "target.h"
#include "tree-iterator.h"
diff --git a/gcc/objc/objc-runtime-shared-support.c b/gcc/objc/objc-runtime-shared-support.c
index 1bcb14a..a2d5c45 100644
--- a/gcc/objc/objc-runtime-shared-support.c
+++ b/gcc/objc/objc-runtime-shared-support.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index 9da818d..fd0ddb5 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * objcp-decl.c : Adjust include files.
+ * objcp-lang.c : Likewise.
+
2015-06-04 Andrew MacLeod <amacleod@redhat.com>
* objcp-decl.c: Adjust includes for restructured coretypes.h.
diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c
index 120f189..1f84731 100644
--- a/gcc/objcp/objcp-decl.c
+++ b/gcc/objcp/objcp-decl.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c
index cd5e4dc..bfb4eb6 100644
--- a/gcc/objcp/objcp-lang.c
+++ b/gcc/objcp/objcp-lang.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/omega.c b/gcc/omega.c
index 9a8def9..f940da5 100644
--- a/gcc/omega.c
+++ b/gcc/omega.c
@@ -33,13 +33,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 1236deb..f322416 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -59,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "diagnostic-core.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
@@ -68,9 +64,7 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/optabs.c b/gcc/optabs.c
index b523f48..da5dfa4 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
is properly defined. */
#include "insn-config.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stor-layout.h"
@@ -44,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "function.h"
#include "except.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -58,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "libfuncs.h"
#include "recog.h"
#include "reload.h"
-#include "ggc.h"
#include "predict.h"
#include "dominance.h"
#include "cfg.h"
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 6edc11a..ff87252 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "opts.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h" /* Required by langhooks.h. */
#include "fold-const.h"
#include "predict.h"
@@ -47,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "dbgcnt.h"
#include "debug.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/opts.h b/gcc/opts.h
index b0b4b1a..5bf815b 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#define GCC_OPTS_H
#include "input.h"
-#include "vec.h"
#include "obstack.h"
/* Specifies how a switch's VAR_VALUE relates to its FLAG_VAR. */
diff --git a/gcc/passes.c b/gcc/passes.c
index 720e647..339c5f0 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -28,11 +28,8 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "line-map.h"
#include "input.h"
-#include "hash-set.h"
-#include "vec.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -48,8 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "function.h"
#include "toplev.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -90,7 +85,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "tree-dump.h"
#include "df.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/plugin.c b/gcc/plugin.c
index a770e6f..1be60e7 100644
--- a/gcc/plugin.c
+++ b/gcc/plugin.c
@@ -23,21 +23,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "diagnostic-core.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
#include "flags.h"
-#include "inchash.h"
#include "tree.h"
#include "tree-pass.h"
#include "intl.h"
#include "plugin.h"
-#include "ggc.h"
#ifdef ENABLE_PLUGIN
#include "plugin-version.h"
diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c
index 941f6cb..746d306 100644
--- a/gcc/postreload-gcse.c
+++ b/gcc/postreload-gcse.c
@@ -23,14 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic-core.h"
-#include "hash-table.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "regs.h"
@@ -45,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgrtl.h"
#include "basic-block.h"
#include "profile.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/postreload.c b/gcc/postreload.c
index 1cc7b14..f83da4a 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -28,15 +28,10 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "insn-config.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/predict.c b/gcc/predict.c
index 47b3587..fdfb8ef 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -31,12 +31,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
@@ -56,8 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "diagnostic-core.h"
#include "recog.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -70,7 +65,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "target.h"
#include "cfgloop.h"
-#include "hash-map.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index d2b2f73..644dde8 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -33,12 +33,9 @@ along with GCC; see the file COPYING3. If not see
/* These headers all define things which are not available in
generator programs. */
#ifndef GENERATOR_FILE
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
#include "flags.h"
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 715dc85..19a0aa5 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -22,22 +22,17 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "print-rtl.h"
#include "stor-layout.h"
-#include "ggc.h"
#include "langhooks.h"
#include "tree-iterator.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h" /* FIXME */
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index 1971ecd..7c4e150 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -55,15 +55,10 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "regs.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
@@ -92,7 +87,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-cfg.h"
#include "cfgloop.h"
#include "dumpfile.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/read-md.c b/gcc/read-md.c
index a551ba3..4c6ddef 100644
--- a/gcc/read-md.c
+++ b/gcc/read-md.c
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "bconfig.h"
#include "system.h"
#include "coretypes.h"
-#include "hashtab.h"
#include "errors.h"
#include "read-md.h"
diff --git a/gcc/read-md.h b/gcc/read-md.h
index 8e57fd4..97d08dc 100644
--- a/gcc/read-md.h
+++ b/gcc/read-md.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#define GCC_READ_MD_H
#include "obstack.h"
-#include "hashtab.h"
/* Holds one symbol or number in the .md file. */
struct md_name {
diff --git a/gcc/read-rtl.c b/gcc/read-rtl.c
index 138f179..e8c849f 100644
--- a/gcc/read-rtl.c
+++ b/gcc/read-rtl.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "obstack.h"
-#include "hashtab.h"
#include "read-md.h"
#include "gensupport.h"
diff --git a/gcc/real.c b/gcc/real.c
index f3f4a5f..18c01aa 100644
--- a/gcc/real.c
+++ b/gcc/real.c
@@ -23,12 +23,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "diagnostic-core.h"
#include "realmpfr.h"
diff --git a/gcc/realmpfr.c b/gcc/realmpfr.c
index ecca812..2edc0ab 100644
--- a/gcc/realmpfr.c
+++ b/gcc/realmpfr.c
@@ -21,13 +21,10 @@
#include "system.h"
#include "coretypes.h"
#include "realmpfr.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h" /* For TYPE_MODE in real_from_mpfr. */
#include "stor-layout.h"
diff --git a/gcc/recog.c b/gcc/recog.c
index b1b9c22..73592de 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl-error.h"
#include "tm_p.h"
@@ -37,11 +34,9 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "regs.h"
#include "addresses.h"
-#include "hashtab.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/ree.c b/gcc/ree.c
index 78bef9b..8c1d4bb 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -220,12 +220,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "flags.h"
@@ -238,8 +235,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgrtl.h"
#include "basic-block.h"
#include "insn-config.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -258,7 +253,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "tree-pass.h"
#include "df.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 25fcf21..a73c7ec 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -153,12 +153,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "rtl-error.h"
@@ -179,7 +176,6 @@
#include "cfgcleanup.h"
#include "basic-block.h"
#include "reload.h"
-#include "ggc.h"
#include "tree-pass.h"
#include "target.h"
#include "df.h"
diff --git a/gcc/regcprop.c b/gcc/regcprop.c
index 3311e81..8e6452e 100644
--- a/gcc/regcprop.c
+++ b/gcc/regcprop.c
@@ -28,9 +28,6 @@
#include "addresses.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index 0e676e1..fde13c4 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -30,18 +30,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hard-reg-set.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
-#include "hashtab.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/regrename.c b/gcc/regrename.c
index 1921831..d4b0469 100644
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -28,9 +28,6 @@
#include "addresses.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/regstat.c b/gcc/regstat.c
index de60f26..7de4991 100644
--- a/gcc/regstat.c
+++ b/gcc/regstat.c
@@ -30,9 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "hard-reg-set.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/reload.c b/gcc/reload.c
index b3c1851..079f0aa 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -96,17 +96,12 @@ a register with any other reload. */
#include "tm_p.h"
#include "insn-config.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 7c57227..1e29a49 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -27,18 +27,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "obstack.h"
#include "insn-config.h"
-#include "ggc.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/reorg.c b/gcc/reorg.c
index d1bc416..bca5c60 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -108,16 +108,11 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/resource.c b/gcc/resource.c
index 8a2d358..5ee6804 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -25,9 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "hard-reg-set.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "regs.h"
diff --git a/gcc/rtl-chkp.c b/gcc/rtl-chkp.c
index 321d05d8..60713c9 100644
--- a/gcc/rtl-chkp.c
+++ b/gcc/rtl-chkp.c
@@ -22,18 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
@@ -56,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "bitmap.h"
#include "rtl-chkp.h"
#include "tree-chkp.h"
-#include "hash-map.h"
static hash_map<tree, rtx> *chkp_rtx_bounds_map;
diff --git a/gcc/rtl.c b/gcc/rtl.c
index 998f025..6341b69 100644
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "ggc.h"
#include "rtl.h"
#ifdef GENERATOR_FILE
# include "errors.h"
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 8994f89..394513e 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -30,13 +30,14 @@ along with GCC; see the file COPYING3. If not see
#include "double-int.h"
#include "real.h"
#include "fixed-value.h"
+#include "statistics.h"
+#include "vec.h"
+#include "hash-table.h"
+#include "hash-set.h"
#endif /* GENERATOR_FILE */
-#include "statistics.h"
#include "input.h"
-#include "vec.h"
#include "alias.h"
-#include "hashtab.h"
#include "flags.h"
#include "is-a.h"
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 28a042a..5687336 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -32,16 +32,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "flags.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "predict.h"
#include "basic-block.h"
#include "df.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
#include "addresses.h"
diff --git a/gcc/rtlhash.c b/gcc/rtlhash.c
index 25204f1..62fe788 100644
--- a/gcc/rtlhash.c
+++ b/gcc/rtlhash.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "ggc.h"
#include "rtl.h"
#include "rtlhash.h"
diff --git a/gcc/rtlhash.h b/gcc/rtlhash.h
index 0285f43..f793a3b 100644
--- a/gcc/rtlhash.h
+++ b/gcc/rtlhash.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef RTL_HASH_H
#define RTL_HASH_H 1
-#include "inchash.h"
namespace inchash
{
diff --git a/gcc/rtlhooks.c b/gcc/rtlhooks.c
index 938f37e..c1e2dcd 100644
--- a/gcc/rtlhooks.c
+++ b/gcc/rtlhooks.c
@@ -24,16 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "rtlhooks-def.h"
#include "symtab.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
#include "expmed.h"
diff --git a/gcc/sanopt.c b/gcc/sanopt.c
index 7a5d102..bfb722a 100644
--- a/gcc/sanopt.c
+++ b/gcc/sanopt.c
@@ -21,16 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hash-table.h"
#include "predict.h"
#include "tm.h"
#include "hard-reg-set.h"
@@ -45,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "tree-pass.h"
#include "asan.h"
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index fea2704..a0f09da 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic-core.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h" /* FIXME: Used by call_may_noreturn_p. */
#include "tm_p.h"
#include "hard-reg-set.h"
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index 6be775f..47660c9 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -28,9 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "profile.h"
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index ba78738..0f970a0 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -52,9 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "profile.h"
diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index f4717baa..d7124e3 100644
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -28,17 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h" /* FIXME: To dump INSN_VAR_LOCATION_DECL. */
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/sdbout.c b/gcc/sdbout.c
index 15d0805..f5671c6 100644
--- a/gcc/sdbout.c
+++ b/gcc/sdbout.c
@@ -44,17 +44,12 @@ AT&T C compiler. From the example below I would conclude the following:
#include "coretypes.h"
#include "tm.h"
#include "debug.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
-#include "ggc.h"
-#include "vec.h"
static GTY(()) tree anonymous_types;
diff --git a/gcc/sel-sched-dump.c b/gcc/sel-sched-dump.c
index 362daac..17f2a20 100644
--- a/gcc/sel-sched-dump.c
+++ b/gcc/sel-sched-dump.c
@@ -26,9 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "predict.h"
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 1c3614b..ae6f637 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -26,9 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "predict.h"
@@ -46,9 +43,7 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "target.h"
#include "sched-int.h"
-#include "ggc.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
#include "rtlhooks-def.h"
diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h
index 3707a87..30d3fd8 100644
--- a/gcc/sel-sched-ir.h
+++ b/gcc/sel-sched-ir.h
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "regset.h"
/* For reg_note. */
#include "rtl.h"
-#include "ggc.h"
#include "bitmap.h"
#include "sched-int.h"
#include "cfgloop.h"
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index 5c49d8e..f706fb7 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -25,9 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "function.h"
#include "predict.h"
@@ -44,9 +41,7 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "output.h"
#include "sched-int.h"
-#include "ggc.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
#include "rtlhooks-def.h"
diff --git a/gcc/sese.c b/gcc/sese.c
index 25b59dd..6e64477 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -22,15 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "mem-stats.h"
-#include "hash-map.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-pretty-print.h"
diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index 542ab9b..e83c34b 100644
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl-error.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -39,9 +36,7 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h
index 4e86b41..5e7fac9 100644
--- a/gcc/shrink-wrap.h
+++ b/gcc/shrink-wrap.h
@@ -20,8 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_SHRINK_WRAP_H
#define GCC_SHRINK_WRAP_H
-#include "hashtab.h"
-#include "vec.h"
#include "function.h"
/* In shrink-wrap.c. */
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 0639a0e..a572ff0 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -41,8 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -51,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "target.h"
#include "predict.h"
diff --git a/gcc/stack-ptr-mod.c b/gcc/stack-ptr-mod.c
index e1288bc..9b5df39 100644
--- a/gcc/stack-ptr-mod.c
+++ b/gcc/stack-ptr-mod.c
@@ -21,20 +21,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "rtl.h"
#include "regs.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/statistics.c b/gcc/statistics.c
index b3892c6..e76ad95 100644
--- a/gcc/statistics.c
+++ b/gcc/statistics.c
@@ -23,11 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree-pass.h"
#include "tree-dump.h"
-#include "statistics.h"
-#include "hash-table.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 86d3d00..0070587 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -29,12 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "hard-reg-set.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -44,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "function.h"
#include "insn-config.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 09b95a4..30f97a8 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -39,8 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -54,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "regs.h"
#include "params.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index 42392cb..aeed299 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "regs.h"
@@ -47,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "lcm.h"
#include "cfgcleanup.h"
#include "basic-block.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -58,10 +53,8 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "except.h"
-#include "ggc.h"
#include "intl.h"
#include "tree-pass.h"
-#include "hash-table.h"
#include "df.h"
#include "dbgcnt.h"
#include "rtl-iter.h"
diff --git a/gcc/stringpool.c b/gcc/stringpool.c
index 10072fc..054f71c 100644
--- a/gcc/stringpool.c
+++ b/gcc/stringpool.c
@@ -28,15 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "ggc.h"
#include "ggc-internal.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "cpplib.h"
diff --git a/gcc/symtab.c b/gcc/symtab.c
index c117a0f..9dc07f5 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -23,17 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "print-tree.h"
#include "varasm.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -47,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "tree-inline.h"
#include "langhooks.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/target-globals.c b/gcc/target-globals.c
index 11c304c..6edb582 100644
--- a/gcc/target-globals.c
+++ b/gcc/target-globals.c
@@ -22,14 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "insn-config.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
-#include "ggc.h"
#include "toplev.h"
#include "target-globals.h"
#include "flags.h"
@@ -38,9 +34,7 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "reload.h"
#include "expmed.h"
-#include "hashtab.h"
#include "function.h"
-#include "statistics.h"
#include "dojump.h"
#include "explow.h"
#include "calls.h"
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index c858c84..e6deaaa 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -51,21 +51,16 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tlink.c b/gcc/tlink.c
index ec2f9f4..5d2b7da 100644
--- a/gcc/tlink.c
+++ b/gcc/tlink.c
@@ -26,13 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "intl.h"
#include "obstack.h"
-#include "hashtab.h"
#include "demangle.h"
#include "collect2.h"
#include "collect-utils.h"
#include "filenames.h"
#include "diagnostic-core.h"
-#include "vec.h"
/* TARGET_64BIT may be defined to use driver specific functionality. */
#undef TARGET_64BIT
diff --git a/gcc/toplev.c b/gcc/toplev.c
index eb8b8ac..306d008 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -28,11 +28,8 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "line-map.h"
#include "input.h"
-#include "hash-set.h"
-#include "vec.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -51,8 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "function.h"
#include "toplev.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -79,7 +74,6 @@ along with GCC; see the file COPYING3. If not see
#include "hosthooks.h"
#include "predict.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/tracer.c b/gcc/tracer.c
index d1ec6c9..308927a 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -37,12 +37,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "rtl.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 9c7e5ad..b820a6b 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -20,14 +20,10 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -52,7 +48,6 @@
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index c2fd286..ae45ea2 100644
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.c
@@ -20,22 +20,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-affine.h b/gcc/tree-affine.h
index 3afb652..b031efe 100644
--- a/gcc/tree-affine.h
+++ b/gcc/tree-affine.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_AFFINE_H
#define GCC_TREE_AFFINE_H
-#include "hash-map.h"
#define MAX_AFF_ELTS 8
diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
index 1cd4ef8..76526d6 100644
--- a/gcc/tree-browser.c
+++ b/gcc/tree-browser.c
@@ -21,14 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.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 9ec11b2..b07fbd6 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -23,9 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -34,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "symtab.h"
#include "alias.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index b8a1c86..9430151 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -21,15 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
-#include "hash-map.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "trans-mem.h"
@@ -67,9 +62,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
#include "tree-into-ssa.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 04e560d..47eb099 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
@@ -56,9 +53,7 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-ssanames.h"
#include "tree-ssa-loop-manip.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.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 4b8def4..59a0b40 100644
--- a/gcc/tree-chkp-opt.c
+++ b/gcc/tree-chkp-opt.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "target.h"
@@ -55,13 +52,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimplify-me.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c
index 1c81ba1..8edef48 100644
--- a/gcc/tree-chkp.c
+++ b/gcc/tree-chkp.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -38,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "tree-pass.h"
#include "diagnostic.h"
-#include "ggc.h"
#include "is-a.h"
#include "cfgloop.h"
#include "stringpool.h"
@@ -62,13 +58,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify.h"
#include "gimplify-me.h"
#include "print-tree.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index c631d89..b356da4 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-pretty-print.h"
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index 63f7f0c..3d600d1 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -52,9 +49,7 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 5f3a3d1..5b4f092 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -76,22 +76,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index b974208..f685cf2 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -22,13 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -55,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-ssanames.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-diagnostic.c b/gcc/tree-diagnostic.c
index 8640c0b..31920f8 100644
--- a/gcc/tree-diagnostic.c
+++ b/gcc/tree-diagnostic.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "diagnostic.h"
#include "tree-pretty-print.h"
@@ -36,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h" /* TDF_DIAGNOSTIC */
#include "langhooks.h"
#include "langhooks-def.h"
-#include "vec.h"
#include "intl.h"
/* Prints out, if necessary, the name of the current function
diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c
index 8ee8561..46a3d55 100644
--- a/gcc/tree-dump.c
+++ b/gcc/tree-dump.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "splay-tree.h"
#include "filenames.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 0529dfb..0f4d17a 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -20,22 +20,16 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -60,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-eh.h b/gcc/tree-eh.h
index 7405d3a..be831b9 100644
--- a/gcc/tree-eh.h
+++ b/gcc/tree-eh.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_EH_H
#define GCC_TREE_EH_H
-#include "hash-map.h"
typedef struct eh_region_d *eh_region;
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index b8c9763..a4ceeb3 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -48,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-walk.h"
#include "tree-pass.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-hasher.h b/gcc/tree-hasher.h
index 228e317..94ed8f0 100644
--- a/gcc/tree-hasher.h
+++ b/gcc/tree-hasher.h
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_HASHER_H
#define GCC_TREE_HASHER_H 1
-#include "hash-table.h"
-
struct int_tree_map {
unsigned int uid;
tree to;
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 8e9589f..050287e 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -84,12 +84,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -126,9 +123,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-address.h"
#include "tree-pass.h"
#include "dbgcnt.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -140,7 +135,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "insn-codes.h"
#include "optabs.h"
-#include "hash-map.h"
/* List of basic blocks in if-conversion-suitable order. */
static basic_block *ifc_bbs;
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 28a7e11..46a5f8d 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "diagnostic-core.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -37,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "params.h"
#include "insn-config.h"
-#include "hashtab.h"
#include "langhooks.h"
#include "predict.h"
#include "hard-reg-set.h"
@@ -67,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "rtl.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
@@ -80,7 +75,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "except.h"
#include "debug.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-inline.h b/gcc/tree-inline.h
index f8b2ebf..0bfd20c 100644
--- a/gcc/tree-inline.h
+++ b/gcc/tree-inline.h
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_INLINE_H
#define GCC_TREE_INLINE_H
-#include "hash-map.h"
-#include "hash-set.h"
struct cgraph_edge;
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index b1130d4..44f5267 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
@@ -41,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfganal.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
@@ -55,9 +51,7 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-iterator.c b/gcc/tree-iterator.c
index a654e64..e7faaed 100644
--- a/gcc/tree-iterator.c
+++ b/gcc/tree-iterator.c
@@ -21,16 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "tree-iterator.h"
-#include "ggc.h"
/* This is a cache of STATEMENT_LIST nodes. We create and destroy them
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 3452cf9..5c203db 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -44,13 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 742b51c..12992f2 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -21,12 +21,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -48,15 +45,12 @@
#include "gimple-walk.h"
#include "tree-iterator.h"
#include "bitmap.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 3a3c878..4eeab41 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index e51f783..f3d7cf1 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-object-size.h"
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index 58dadc3..93ac258 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -64,10 +61,8 @@ 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 "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index c4b83fe..3495ac1 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index efb58fc..4b37a71 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index 558c2cd..4415fe3 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -188,12 +188,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
@@ -223,10 +220,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
#include "tree-into-ssa.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index 8df6dc6..76baf43 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -22,20 +22,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -48,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "gimple-expr.h"
#include "predict.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 5f9f033..377ab0d 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -29,9 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -44,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-ssa-alias.h"
@@ -58,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 35a697d..52d2c9d 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -256,22 +256,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 90067cb..9bfcd98 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -74,17 +74,11 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "mem-stats.h"
-#include "hash-map.h"
-#include "hash-table.h"
#include "alloc-pool.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -111,10 +105,8 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index 3d87335..c4aba10 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -49,10 +46,8 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-ssanames.h"
#include "tree-ssa-loop-ivopts.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index d954b8e..b2d29ca 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
@@ -52,9 +49,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-ssa.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -69,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "alloc-pool.h"
#include "bitmap.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 06e5dde..68d861f 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -122,12 +122,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -141,7 +138,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index 47742ce..0504aeb 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -22,19 +22,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
#include "tree-pretty-print.h"
#include "bitmap.h"
#include "dumpfile.h"
-#include "hash-table.h"
#include "predict.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index 78537f6..ea65289 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index d225631..2fbaec8 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -48,9 +45,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-ssa.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.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 98aa648..562ad8a 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -46,12 +46,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
@@ -79,10 +76,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-into-ssa.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 7f7d70d..d0030b1 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -21,14 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -43,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfganal.h"
#include "basic-block.h"
#include "cfgloop.h"
-#include "inchash.h"
#include "gimple-pretty-print.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
@@ -69,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-scopedtables.h"
#include "tree-ssa-threadedge.h"
#include "tree-ssa-dom.h"
-#include "inchash.h"
#include "gimplify.h"
#include "tree-cfgcleanup.h"
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index 2315c59..a7b70f5 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
@@ -50,10 +47,8 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 0d95b5f..7ae4ea4 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -54,10 +51,8 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index fe9a220..a224551 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
BRANCH_COST. */
#include "rtl.h"
#include "tm_p.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 8799109..204e70b 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -21,14 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "gimple-pretty-print.h"
@@ -51,10 +47,8 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index 09ab481..6ece78b 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 3b680e6..5ae5c47 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
@@ -39,8 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfganal.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "hash-map.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index c1945d0..4e21dce 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -39,12 +39,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
@@ -66,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 7d23b40..e94a0bc 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -65,12 +65,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -82,8 +79,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "basic-block.h"
#include "gimple-pretty-print.h"
-#include "hash-map.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
@@ -106,10 +101,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-loop-manip.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 5eb0755..0aa25dd 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index d2b5f24..7104e60 100644
--- a/gcc/tree-ssa-loop-niter.c
+++ b/gcc/tree-ssa-loop-niter.c
@@ -21,22 +21,17 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "fold-const.h"
#include "calls.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index 9c50c18..0f6cb8b 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -66,10 +63,8 @@ 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 "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index a6d6408..a49c9ce 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index 31d762e..d03ff05 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index 4f45f1a..d46839c 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -89,12 +89,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -119,9 +116,7 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index 6d6f6d0..0d0a2a7 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stmt.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index ce61938..e26e686 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -20,14 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -54,9 +50,7 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.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 57e13c6..17d26e7 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tm_p.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 192084f..d218492 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
@@ -59,10 +55,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-ssa-loop.h"
#include "tree-into-ssa.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -85,7 +79,6 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "dbgcnt.h"
#include "domwalk.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index 497038f..1db0e86 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -22,12 +22,9 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 4d0120c..b502ff1 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -21,16 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
#include "rtl.h"
#include "tm_p.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -43,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "hash-map.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
@@ -61,9 +56,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 8eba4c3..238cf30 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple-pretty-print.h"
#include "tree-inline.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
@@ -54,10 +50,8 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-scopedtables.c b/gcc/tree-ssa-scopedtables.c
index a961d5f..16f279d 100644
--- a/gcc/tree-ssa-scopedtables.c
+++ b/gcc/tree-ssa-scopedtables.c
@@ -20,14 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-table.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 77d8f21..0bc7eaf 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index ddac444..044fb03 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -21,18 +21,13 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "hash-table.h"
-#include "hash-map.h"
#include "bitmap.h"
#include "predict.h"
#include "tm.h"
@@ -56,10 +51,8 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "stringpool.h"
#include "tree-ssanames.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 2b7d977..1ed0bc4 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -27,9 +27,6 @@
#include "sbitmap.h"
#include "flags.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -38,12 +35,10 @@
#include "basic-block.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stmt.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
@@ -51,7 +46,6 @@
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
@@ -59,7 +53,6 @@
#include "tree-ssanames.h"
#include "tree-into-ssa.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index c348b3d..e73feec 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -189,17 +189,13 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "trans-mem.h"
-#include "inchash.h"
#include "tm_p.h"
#include "predict.h"
#include "hard-reg-set.h"
@@ -211,7 +207,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgcleanup.h"
#include "basic-block.h"
#include "flags.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index abf4426..9cc9f22 100644
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.c
@@ -23,20 +23,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index c627e51..01c8aa3 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index a0a9084..8514696 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
@@ -39,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfganal.h"
#include "basic-block.h"
-#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index f117040..0ae8bee 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -40,8 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfganal.h"
#include "basic-block.h"
-#include "hash-table.h"
-#include "hash-map.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index d074002..95d1e9c 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "flags.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index b87016e..026b23a 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -60,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-into-ssa.h"
#include "tree-ssa.h"
#include "tree-inline.h"
-#include "hash-map.h"
#include "tree-pass.h"
#include "diagnostic-core.h"
#include "cfgloop.h"
diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index 6bad037..5a25c73 100644
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 28fb58f..08d10b5 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index fc5b639..32bd5a7 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "diagnostic.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -44,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index d7cada7..623c32bc5 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "diagnostic.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c
index 0fcc434..c1203fd 100644
--- a/gcc/tree-streamer.c
+++ b/gcc/tree-streamer.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
@@ -41,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
-#include "hash-map.h"
#include "is-a.h"
#include "gimple.h"
#include "streamer-hooks.h"
diff --git a/gcc/tree-streamer.h b/gcc/tree-streamer.h
index 20e2621..fdd8666 100644
--- a/gcc/tree-streamer.h
+++ b/gcc/tree-streamer.h
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "streamer-hooks.h"
#include "lto-streamer.h"
#include "data-streamer.h"
-#include "hash-map.h"
/* Cache of pickled nodes. Used to avoid writing the same node more
than once. The first time a tree node is streamed out, it is
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index c92b3ea..e09942f 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -29,12 +29,9 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "line-map.h"
#include "params.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -55,7 +52,6 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
@@ -72,9 +68,7 @@ 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 "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 06ee503..6f0d6cc 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -50,10 +47,8 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-ssanames.h"
#include "tree-into-ssa.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -72,7 +67,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "cfgloop.h"
#include "common/common-target.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index ca33446..0f85ae1 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -64,15 +61,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-scalar-evolution.h"
#include "tree-vectorizer.h"
#include "diagnostic-core.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
/* Need to include rtl.h, expr.h, etc. for optabs. */
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index 885d617..822ddfb 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.c
@@ -20,13 +20,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -57,9 +54,7 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
/* Need to include rtl.h, expr.h, etc. for optabs. */
-#include "hashtab.h"
#include "rtl.h"
-#include "statistics.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 6a2a9dd..4132ece 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 7756dc7..9edb0d1 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -59,10 +56,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-loop-niter.h"
#include "tree-pass.h"
#include "cfgloop.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index cb40596..786adf2 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -52,10 +49,8 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-ssanames.h"
#include "cfgloop.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 6120998..9d8211e 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -52,10 +49,8 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-pass.h"
#include "cfgloop.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 6f31312..0698061 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -60,10 +57,8 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "tree-ssa-loop.h"
#include "tree-scalar-evolution.h"
-#include "hashtab.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -78,7 +73,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "diagnostic-core.h"
#include "tree-vectorizer.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 716f10f..b18b513 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -59,12 +59,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -84,7 +81,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 9976096..b7ce941 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-data-ref.h"
#include "target.h"
-#include "hash-table.h"
/* Used for naming of new temporaries. */
enum vect_var_kind {
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 049d89e..b517363 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -70,9 +67,7 @@ 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 "hashtab.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index e92e63f..db4ea8e 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -32,12 +32,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -45,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "attribs.h"
#include "varasm.h"
#include "tm_p.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "obstack.h"
@@ -70,7 +66,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
@@ -78,7 +73,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-ssanames.h"
#include "rtl.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index e6e93eb..27d5fb6 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -22,22 +22,17 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
-#include "hashtab.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -61,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 5a7bab4..4e2214d 100644
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.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 "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -37,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfganal.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "tm.h"
@@ -61,9 +57,7 @@ along with GCC; see the file COPYING3. If not see
#include "ubsan.h"
#include "c-family/c-common.h"
#include "rtl.h"
-#include "hashtab.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/valtrack.c b/gcc/valtrack.c
index 43d66d9..b110175 100644
--- a/gcc/valtrack.c
+++ b/gcc/valtrack.c
@@ -27,9 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "predict.h"
#include "basic-block.h"
#include "valtrack.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/valtrack.h b/gcc/valtrack.h
index b7b53f3..67bdebb 100644
--- a/gcc/valtrack.h
+++ b/gcc/valtrack.h
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "bitmap.h"
#include "df.h"
#include "rtl.h"
-#include "hash-table.h"
/* Debug uses of dead regs. */
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 9826772..462659b 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -21,22 +21,17 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-nested.h"
#include "calls.h"
#include "rtl.h"
-#include "hashtab.h"
#include "hard-reg-set.h"
#include "function.h"
#include "flags.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -75,7 +70,6 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "dumpfile.h"
#include "profile.h"
-#include "hash-map.h"
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 8536747..c3adf51 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -90,17 +90,12 @@
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
-#include "hash-map.h"
-#include "hash-table.h"
#include "predict.h"
#include "hard-reg-set.h"
#include "function.h"
@@ -116,8 +111,6 @@
#include "sbitmap.h"
#include "alloc-pool.h"
#include "regs.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 18f3eac..95cb539 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -30,12 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -44,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "hard-reg-set.h"
#include "function.h"
-#include "hashtab.h"
-#include "statistics.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
@@ -57,7 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "output.h"
#include "diagnostic-core.h"
-#include "ggc.h"
#include "langhooks.h"
#include "tm_p.h"
#include "debug.h"
@@ -68,7 +62,6 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "ipa-ref.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index d09b172..284aae3 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -22,18 +22,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
#include "predict.h"
#include "basic-block.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/vec.c b/gcc/vec.c
index f1a4d65..e0307dd 100644
--- a/gcc/vec.c
+++ b/gcc/vec.c
@@ -29,13 +29,8 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
-#include "ggc.h"
-#include "vec.h"
#include "diagnostic-core.h"
-#include "hashtab.h"
-#include "mem-stats.h"
-#include "hash-map.h"
-#include "mem-stats.h"
+#include "hash-table.h"
/* vNULL is an empty type with a template cast operation that returns
a zero-initialized vec<T, A, L> instance. Use this when you want
diff --git a/gcc/vec.h b/gcc/vec.h
index 7b96979..61a6189 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -22,38 +22,14 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_VEC_H
#define GCC_VEC_H
-/* FIXME - When compiling some of the gen* binaries, we cannot enable GC
- support because the headers generated by gengtype are still not
- present. In particular, the header file gtype-desc.h is missing,
- so compilation may fail if we try to include ggc.h.
-
- Since we use some of those declarations, we need to provide them
- (even if the GC-based templates are not used). This is not a
- problem because the code that runs before gengtype is built will
- never need to use GC vectors. But it does force us to declare
- these functions more than once. */
-#ifdef GENERATOR_FILE
-#define VEC_GC_ENABLED 0
-#else
-#define VEC_GC_ENABLED 1
-#endif // GENERATOR_FILE
-
-#include "statistics.h" // For CXX_MEM_STAT_INFO.
-
-#if VEC_GC_ENABLED
-#include "ggc.h"
-#else
-# ifndef GCC_GGC_H
- /* Even if we think that GC is not enabled, the test that sets it is
- weak. There are files compiled with -DGENERATOR_FILE that already
- include ggc.h. We only need to provide these definitions if ggc.h
- has not been included. Sigh. */
-
- extern void ggc_free (void *);
- extern size_t ggc_round_alloc_size (size_t requested_size);
- extern void *ggc_realloc (void *, size_t MEM_STAT_DECL);
-# endif // GCC_GGC_H
-#endif // VEC_GC_ENABLED
+/* Some gen* file have no ggc support as the header file gtype-desc.h is
+ missing. Provide these definitions in case ggc.h has not been included.
+ This is not a problem because any code that runs before gengtype is built
+ will never need to use GC vectors.*/
+
+extern void ggc_free (void *);
+extern size_t ggc_round_alloc_size (size_t requested_size);
+extern void *ggc_realloc (void *, size_t MEM_STAT_DECL);
/* Templated vector type and associated interfaces.
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index 252f40c..8297e02 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#ifdef VMS_DEBUGGING_INFO
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "version.h"
diff --git a/gcc/vtable-verify.c b/gcc/vtable-verify.c
index 29b9c68..5dc72a4 100644
--- a/gcc/vtable-verify.c
+++ b/gcc/vtable-verify.c
@@ -135,13 +135,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "predict.h"
diff --git a/gcc/vtable-verify.h b/gcc/vtable-verify.h
index 6fb2b60..fbb3bfd 100644
--- a/gcc/vtable-verify.h
+++ b/gcc/vtable-verify.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#define VTABLE_VERIFY_H
#include "sbitmap.h"
-#include "hash-table.h"
/* The function decl used to create calls to __VLTVtableVerify. It must
be global because it needs to be initialized in the C++ front end, but
diff --git a/gcc/web.c b/gcc/web.c
index 63f592f..1e6e121 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -44,9 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "obstack.h"
#include "predict.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/wide-int.cc b/gcc/wide-int.cc
index b5aa9c5..f4f84bc 100644
--- a/gcc/wide-int.cc
+++ b/gcc/wide-int.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hwint.h"
-#include "hash-set.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c
index 405a4f6..07b8257 100644
--- a/gcc/xcoffout.c
+++ b/gcc/xcoffout.c
@@ -26,19 +26,15 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "rtl.h"
#include "flags.h"
#include "diagnostic-core.h"
#include "output.h"
-#include "ggc.h"
#include "target.h"
#include "debug.h"