From abb226c954fadee4955160f0952e12296fc4a25e Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacleod@redhat.com>
Date: Wed, 17 Jun 2015 14:58:44 +0000
Subject: [PATCH] coretypes.h: Include input.h and as-a.h.

2015-06-17  Andrew MacLeod  <amacleod@redhat.com>

	* coretypes.h: Include input.h and as-a.h.
	* rtl.h: Include input.h and as-a.h for generator files.
	* hwint.c: Include input.h.
	* vec.c: Include input.h.
	* alias.c: Do not include input.h, line-map.h or is-a.h.
	* asan.c: Likewise.
	* attribs.c: Likewise.
	* auto-inc-dec.c: Likewise.
	* auto-profile.c: Likewise.
	* bb-reorder.c: Likewise.
	* bt-load.c: Likewise.
	* builtins.c: Likewise.
	* caller-save.c: Likewise.
	* calls.c: Likewise.
	* ccmp.c: Likewise.
	* cfg.c: Likewise.
	* cfganal.c: Likewise.
	* cfgbuild.c: Likewise.
	* cfgcleanup.c: Likewise.
	* cfgexpand.c: Likewise.
	* cfghooks.c: Likewise.
	* cfgloop.c: Likewise.
	* 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.
	* convert.c: Likewise.
	* coverage.c: Likewise.
	* cppbuiltin.c: Likewise.
	* cprop.c: Likewise.
	* cse.c: Likewise.
	* cselib.c: Likewise.
	* data-streamer-in.c: Likewise.
	* data-streamer-out.c: Likewise.
	* data-streamer.c: Likewise.
	* dbxout.c: Likewise.
	* dce.c: Likewise.
	* ddg.c: Likewise.
	* debug.c: Likewise.
	* df-core.c: Likewise.
	* df-problems.c: Likewise.
	* df-scan.c: Likewise.
	* df.h: Likewise.
	* dfp.c: Likewise.
	* diagnostic-core.h: Likewise.
	* diagnostic.c: Likewise.
	* dojump.c: Likewise.
	* dominance.c: Likewise.
	* domwalk.c: Likewise.
	* double-int.c: Likewise.
	* dse.c: Likewise.
	* dumpfile.c: Likewise.
	* dumpfile.h: Likewise.
	* dwarf2asm.c: Likewise.
	* dwarf2cfi.c: Likewise.
	* dwarf2out.c: Likewise.
	* emit-rtl.c: Likewise.
	* et-forest.c: Likewise.
	* except.c: Likewise.
	* explow.c: Likewise.
	* expmed.c: Likewise.
	* expr.c: Likewise.
	* final.c: Likewise.
	* fixed-value.c: Likewise.
	* fold-const.c: Likewise.
	* function.c: Likewise.
	* fwprop.c: Likewise.
	* gcc-plugin.h: Likewise.
	* gcse.c: Likewise.
	* generic-match-head.c: Likewise.
	* ggc-page.c: Likewise.
	* gimple-builder.c: Likewise.
	* gimple-expr.c: Likewise.
	* gimple-fold.c: Likewise.
	* gimple-iterator.c: Likewise.
	* gimple-low.c: Likewise.
	* gimple-match-head.c: Likewise.
	* gimple-pretty-print.c: Likewise.
	* gimple-ssa-isolate-paths.c: Likewise.
	* gimple-ssa-strength-reduction.c: Likewise.
	* gimple-streamer-in.c: Likewise.
	* gimple-streamer-out.c: Likewise.
	* gimple-streamer.h: Likewise.
	* gimple-walk.c: Likewise.
	* gimple.c: Likewise.
	* gimplify-me.c: Likewise.
	* gimplify.c: Likewise.
	* godump.c: Likewise.
	* graph.c: Likewise.
	* graphite-blocking.c: Likewise.
	* graphite-dependences.c: Likewise.
	* graphite-interchange.c: Likewise.
	* graphite-isl-ast-to-gimple.c: Likewise.
	* graphite-optimize-isl.c: Likewise.
	* graphite-poly.c: Likewise.
	* graphite-scop-detection.c: Likewise.
	* graphite-sese-to-poly.c: Likewise.
	* graphite.c: Likewise.
	* haifa-sched.c: Likewise.
	* hw-doloop.c: Likewise.
	* ifcvt.c: Likewise.
	* init-regs.c: Likewise.
	* 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.
	* loop-doloop.c: Likewise.
	* loop-init.c: Likewise.
	* loop-invariant.c: Likewise.
	* loop-iv.c: Likewise.
	* loop-unroll.c: Likewise.
	* lower-subreg.c: Likewise.
	* lra-assigns.c: Likewise.
	* lra-coalesce.c: Likewise.
	* lra-constraints.c: Likewise.
	* lra-eliminations.c: Likewise.
	* lra-lives.c: Likewise.
	* lra-remat.c: Likewise.
	* lra-spills.c: Likewise.
	* lra.c: Likewise.
	* lto-cgraph.c: Likewise.
	* lto-compress.c: Likewise.
	* lto-opts.c: Likewise.
	* lto-section-in.c: Likewise.
	* lto-section-out.c: Likewise.
	* lto-streamer-in.c: Likewise.
	* lto-streamer-out.c: Likewise.
	* lto-streamer.c: Likewise.
	* mcf.c: Likewise.
	* mode-switching.c: Likewise.
	* modulo-sched.c: Likewise.
	* omega.c: Likewise.
	* omp-low.c: Likewise.
	* optabs.c: Likewise.
	* opts-global.c: Likewise.
	* opts.h: Likewise.
	* passes.c: Likewise.
	* plugin.c: Likewise.
	* postreload-gcse.c: Likewise.
	* postreload.c: Likewise.
	* predict.c: Likewise.
	* pretty-print.h: Likewise.
	* print-rtl.c: Likewise.
	* print-tree.c: Likewise.
	* profile.c: Likewise.
	* real.c: Likewise.
	* realmpfr.c: Likewise.
	* recog.c: Likewise.
	* ree.c: Likewise.
	* reg-stack.c: Likewise.
	* regcprop.c: Likewise.
	* reginfo.c: Likewise.
	* regrename.c: Likewise.
	* regstat.c: Likewise.
	* reload.c: Likewise.
	* reload1.c: Likewise.
	* reorg.c: Likewise.
	* resource.c: Likewise.
	* rtl-chkp.c: Likewise.
	* rtl-error.c: Likewise.
	* rtlanal.c: Likewise.
	* rtlhooks.c: Likewise.
	* sanopt.c: Likewise.
	* sched-deps.c: Likewise.
	* sched-ebb.c: Likewise.
	* sched-rgn.c: Likewise.
	* sched-vis.c: Likewise.
	* sdbout.c: Likewise.
	* sel-sched-dump.c: Likewise.
	* sel-sched-ir.c: Likewise.
	* sel-sched.c: Likewise.
	* sese.c: Likewise.
	* shrink-wrap.c: Likewise.
	* simplify-rtx.c: Likewise.
	* stack-ptr-mod.c: Likewise.
	* statistics.c: Likewise.
	* stmt.c: Likewise.
	* stor-layout.c: Likewise.
	* store-motion.c: Likewise.
	* streamer-hooks.c: Likewise.
	* stringpool.c: Likewise.
	* symtab.c: Likewise.
	* target-globals.c: Likewise.
	* targhooks.c: Likewise.
	* toplev.c: Likewise.
	* tracer.c: Likewise.
	* trans-mem.c: Likewise.
	* tree-affine.c: Likewise.
	* tree-browser.c: Likewise.
	* tree-call-cdce.c: Likewise.
	* tree-cfg.c: Likewise.
	* tree-cfgcleanup.c: Likewise.
	* tree-chkp-opt.c: Likewise.
	* tree-chkp.c: Likewise.
	* tree-chrec.c: Likewise.
	* tree-complex.c: Likewise.
	* tree-data-ref.c: Likewise.
	* tree-dfa.c: Likewise.
	* tree-diagnostic.c: Likewise.
	* tree-dump.c: Likewise.
	* tree-eh.c: Likewise.
	* tree-emutls.c: Likewise.
	* tree-if-conv.c: Likewise.
	* tree-inline.c: Likewise.
	* tree-into-ssa.c: Likewise.
	* tree-iterator.c: Likewise.
	* tree-loop-distribution.c: Likewise.
	* tree-nested.c: Likewise.
	* tree-nrv.c: Likewise.
	* tree-object-size.c: Likewise.
	* tree-outof-ssa.c: Likewise.
	* tree-parloops.c: Likewise.
	* tree-phinodes.c: Likewise.
	* tree-predcom.c: Likewise.
	* tree-pretty-print.c: Likewise.
	* tree-profile.c: Likewise.
	* tree-scalar-evolution.c: Likewise.
	* tree-sra.c: Likewise.
	* tree-ssa-address.c: Likewise.
	* tree-ssa-alias.c: Likewise.
	* tree-ssa-ccp.c: Likewise.
	* tree-ssa-coalesce.c: Likewise.
	* tree-ssa-copy.c: Likewise.
	* tree-ssa-copyrename.c: Likewise.
	* tree-ssa-dce.c: Likewise.
	* tree-ssa-dom.c: Likewise.
	* tree-ssa-dse.c: Likewise.
	* tree-ssa-forwprop.c: Likewise.
	* tree-ssa-ifcombine.c: Likewise.
	* tree-ssa-live.c: Likewise.
	* tree-ssa-loop-ch.c: Likewise.
	* tree-ssa-loop-im.c: Likewise.
	* tree-ssa-loop-ivcanon.c: Likewise.
	* tree-ssa-loop-ivopts.c: Likewise.
	* tree-ssa-loop-manip.c: Likewise.
	* tree-ssa-loop-niter.c: Likewise.
	* tree-ssa-loop-prefetch.c: Likewise.
	* tree-ssa-loop-unswitch.c: Likewise.
	* tree-ssa-loop.c: Likewise.
	* tree-ssa-math-opts.c: Likewise.
	* tree-ssa-operands.c: Likewise.
	* tree-ssa-phiopt.c: Likewise.
	* tree-ssa-phiprop.c: Likewise.
	* tree-ssa-pre.c: Likewise.
	* tree-ssa-propagate.c: Likewise.
	* tree-ssa-reassoc.c: Likewise.
	* tree-ssa-sccvn.c: Likewise.
	* tree-ssa-scopedtables.c: Likewise.
	* tree-ssa-sink.c: Likewise.
	* tree-ssa-strlen.c: Likewise.
	* tree-ssa-structalias.c: Likewise.
	* tree-ssa-tail-merge.c: Likewise.
	* tree-ssa-ter.c: Likewise.
	* tree-ssa-threadedge.c: Likewise.
	* tree-ssa-threadupdate.c: Likewise.
	* tree-ssa-uncprop.c: Likewise.
	* tree-ssa-uninit.c: Likewise.
	* tree-ssa.c: Likewise.
	* tree-ssanames.c: Likewise.
	* tree-stdarg.c: Likewise.
	* tree-streamer-in.c: Likewise.
	* tree-streamer-out.c: Likewise.
	* tree-streamer.c: Likewise.
	* tree-switch-conversion.c: Likewise.
	* tree-tailcall.c: Likewise.
	* tree-vect-data-refs.c: Likewise.
	* tree-vect-generic.c: Likewise.
	* tree-vect-loop-manip.c: Likewise.
	* tree-vect-loop.c: Likewise.
	* tree-vect-patterns.c: Likewise.
	* tree-vect-slp.c: Likewise.
	* tree-vect-stmts.c: Likewise.
	* tree-vectorizer.c: Likewise.
	* tree-vrp.c: Likewise.
	* tree.c: Likewise.
	* tsan.c: Likewise.
	* ubsan.c: Likewise.
	* valtrack.c: Likewise.
	* value-prof.c: Likewise.
	* var-tracking.c: Likewise.
	* varasm.c: Likewise.
	* varpool.c: Likewise.
	* vmsdbgout.c: Likewise.
	* vtable-verify.c: Likewise.
	* web.c: Likewise.
	* wide-int.cc: Likewise.
	* xcoffout.c: Likewise.
	* config/aarch64/aarch64-builtins.c: Likewise.
	* config/aarch64/aarch64.c: Likewise.
	* config/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.

ada
	* ada/gcc-interface/cuintp.c: Do not include input.h, line-map.h or
	is-a.h.
	* ada/gcc-interface/decl.c: Likewise.
	* ada/gcc-interface/misc.c: Likewise.
	* ada/gcc-interface/targtyps.c: Likewise.
	* ada/gcc-interface/trans.c: Likewise.
	* ada/gcc-interface/utils.c: Likewise.
	* ada/gcc-interface/utils2.c: Likewise.

c
	* c/c-array-notation.c: Do not include input.h, line-map.h or is-a.h.
	* c/c-aux-info.c: Likewise.
	* c/c-convert.c: Likewise.
	* c/c-decl.c: Likewise.
	* c/c-errors.c: Likewise.
	* c/c-lang.c: Likewise.
	* c/c-objc-common.c: Likewise.
	* c/c-parser.c: Likewise.
	* c/c-typeck.c: Likewise.

c-family
	* c-family/array-notation-common.c: Do not include input.h, line-map.h
	or is-a.h.
	* c-family/c-ada-spec.c: Likewise.
	* c-family/c-cilkplus.c: Likewise.
	* c-family/c-common.c: Likewise.
	* c-family/c-common.h: Likewise.
	* c-family/c-cppbuiltin.c: Likewise.
	* c-family/c-dump.c: Likewise.
	* c-family/c-format.c: Likewise.
	* c-family/c-gimplify.c: Likewise.
	* c-family/c-indentation.c: Likewise.
	* c-family/c-lex.c: Likewise.
	* c-family/c-omp.c: Likewise.
	* c-family/c-opts.c: Likewise.
	* c-family/c-pch.c: Likewise.
	* c-family/c-ppoutput.c: Likewise.
	* c-family/c-pragma.c: Likewise.
	* c-family/c-pretty-print.c: Likewise.
	* c-family/c-semantics.c: Likewise.
	* c-family/c-ubsan.c: Likewise.
	* c-family/cilk.c: Likewise.
	* c-family/stub-objc.c: Likewise.

common
	* common/common-target.h: Do not include input.h, line-map.h or is-a.h.
	* common/common-targhooks.c: Likewise.

cp
	* cp/call.c: Do not include input.h, line-map.h or is-a.h.
	* cp/class.c: Likewise.
	* cp/constexpr.c: Likewise.
	* cp/cp-array-notation.c: Likewise.
	* cp/cp-gimplify.c: Likewise.
	* cp/cp-lang.c: Likewise.
	* cp/cp-objcp-common.c: Likewise.
	* cp/cp-tree.h: Likewise.
	* cp/cp-ubsan.c: Likewise.
	* cp/cvt.c: Likewise.
	* cp/decl.c: Likewise.
	* cp/decl2.c: Likewise.
	* cp/dump.c: Likewise.
	* cp/error.c: Likewise.
	* cp/except.c: Likewise.
	* cp/expr.c: Likewise.
	* cp/friend.c: Likewise.
	* cp/init.c: Likewise.
	* cp/lambda.c: Likewise.
	* cp/lex.c: Likewise.
	* cp/mangle.c: Likewise.
	* cp/method.c: Likewise.
	* cp/name-lookup.c: Likewise.
	* cp/optimize.c: Likewise.
	* cp/parser.c: Likewise.
	* cp/pt.c: Likewise.
	* cp/ptree.c: Likewise.
	* cp/repo.c: Likewise.
	* cp/rtti.c: Likewise.
	* cp/search.c: Likewise.
	* cp/semantics.c: Likewise.
	* cp/tree.c: Likewise.
	* cp/typeck.c: Likewise.
	* cp/typeck2.c: Likewise.
	* cp/vtable-class-hierarchy.c: Likewise.

fortran
	* fortran/convert.c: Do not include input.h, line-map.h or is-a.h.
	* fortran/cpp.c: Likewise.
	* fortran/decl.c: Likewise.
	* fortran/f95-lang.c: Likewise.
	* fortran/gfortran.h: Likewise.
	* fortran/iresolve.c: Likewise.
	* fortran/match.c: Likewise.
	* fortran/module.c: Likewise.
	* fortran/options.c: Likewise.
	* fortran/target-memory.c: Likewise.
	* fortran/trans-array.c: Likewise.
	* fortran/trans-common.c: Likewise.
	* fortran/trans-const.c: Likewise.
	* fortran/trans-decl.c: Likewise.
	* fortran/trans-expr.c: Likewise.
	* fortran/trans-intrinsic.c: Likewise.
	* fortran/trans-io.c: Likewise.
	* fortran/trans-openmp.c: Likewise.
	* fortran/trans-stmt.c: Likewise.
	* fortran/trans-types.c: Likewise.
	* fortran/trans.c: Likewise.

go
	* go/go-backend.c: Do not include input.h, line-map.h or is-a.h.
	* go/go-gcc.cc: Likewise.
	* go/go-lang.c: Likewise.
	* go/go-system.h: Likewise.

java
	* java/boehm.c: Do not include input.h, line-map.h or is-a.h.
	* java/builtins.c: Likewise.
	* java/class.c: Likewise.
	* java/constants.c: Likewise.
	* java/decl.c: Likewise.
	* java/except.c: Likewise.
	* java/expr.c: Likewise.
	* java/java-gimplify.c: Likewise.
	* java/jcf-dump.c: Likewise.
	* java/jcf-io.c: Likewise.
	* java/jcf-parse.c: Likewise.
	* java/jvgenmain.c: Likewise.
	* java/lang.c: Likewise.
	* java/mangle.c: Likewise.
	* java/mangle_name.c: Likewise.
	* java/resource.c: Likewise.
	* java/typeck.c: Likewise.
	* java/verify-glue.c: Likewise.
	* java/verify-impl.c: Likewise.

jit
	* jit/dummy-frontend.c: Do not include input.h, line-map.h or is-a.h.
	* jit/jit-common.h: Likewise.
	* jit/jit-playback.c: Likewise.

lto
	* lto/lto-lang.c: Do not include input.h, line-map.h or is-a.h.
	* lto/lto-object.c: Likewise.
	* lto/lto-partition.c: Likewise.
	* lto/lto-symtab.c: Likewise.
	* lto/lto.c: Likewise.

objc
	* objc/objc-act.c: Do not include input.h, line-map.h or is-a.h.
	* objc/objc-encoding.c: Likewise.
	* objc/objc-gnu-runtime-abi-01.c: Likewise.
	* objc/objc-lang.c: Likewise.
	* objc/objc-map.c: Likewise.
	* objc/objc-next-runtime-abi-01.c: Likewise.
	* objc/objc-next-runtime-abi-02.c: Likewise.
	* objc/objc-runtime-shared-support.c: Likewise.

objcp
	* objcp/objcp-decl.c: Do not include input.h, line-map.h or is-a.h.
	* objcp/objcp-lang.c: Likewise.

From-SVN: r224562
---
 gcc/ChangeLog                                | 427 +++++++++++++++++++
 gcc/ada/ChangeLog                            |  10 +
 gcc/ada/gcc-interface/cuintp.c               |   1 -
 gcc/ada/gcc-interface/decl.c                 |   1 -
 gcc/ada/gcc-interface/misc.c                 |   1 -
 gcc/ada/gcc-interface/targtyps.c             |   1 -
 gcc/ada/gcc-interface/trans.c                |   2 -
 gcc/ada/gcc-interface/utils.c                |   2 -
 gcc/ada/gcc-interface/utils2.c               |   1 -
 gcc/alias.c                                  |   2 -
 gcc/asan.c                                   |   2 -
 gcc/attribs.c                                |   1 -
 gcc/auto-inc-dec.c                           |   1 -
 gcc/auto-profile.c                           |   3 -
 gcc/bb-reorder.c                             |   2 -
 gcc/bt-load.c                                |   1 -
 gcc/builtins.c                               |   2 -
 gcc/c-family/ChangeLog                       |  24 ++
 gcc/c-family/array-notation-common.c         |   1 -
 gcc/c-family/c-ada-spec.c                    |   1 -
 gcc/c-family/c-cilkplus.c                    |   1 -
 gcc/c-family/c-common.c                      |   3 -
 gcc/c-family/c-common.h                      |   1 -
 gcc/c-family/c-cppbuiltin.c                  |   1 -
 gcc/c-family/c-dump.c                        |   1 -
 gcc/c-family/c-format.c                      |   1 -
 gcc/c-family/c-gimplify.c                    |   3 -
 gcc/c-family/c-indentation.c                 |   2 -
 gcc/c-family/c-lex.c                         |   2 -
 gcc/c-family/c-omp.c                         |   1 -
 gcc/c-family/c-opts.c                        |   1 -
 gcc/c-family/c-pch.c                         |   1 -
 gcc/c-family/c-ppoutput.c                    |   1 -
 gcc/c-family/c-pragma.c                      |   3 -
 gcc/c-family/c-pretty-print.c                |   1 -
 gcc/c-family/c-semantics.c                   |   1 -
 gcc/c-family/c-ubsan.c                       |   3 -
 gcc/c-family/cilk.c                          |   3 -
 gcc/c-family/stub-objc.c                     |   1 -
 gcc/c/ChangeLog                              |  12 +
 gcc/c/c-array-notation.c                     |   1 -
 gcc/c/c-aux-info.c                           |   1 -
 gcc/c/c-convert.c                            |   1 -
 gcc/c/c-decl.c                               |   3 -
 gcc/c/c-errors.c                             |   1 -
 gcc/c/c-lang.c                               |   1 -
 gcc/c/c-objc-common.c                        |   1 -
 gcc/c/c-parser.c                             |   3 -
 gcc/c/c-typeck.c                             |   2 -
 gcc/caller-save.c                            |   1 -
 gcc/calls.c                                  |   2 -
 gcc/ccmp.c                                   |   2 -
 gcc/cfg.c                                    |   2 -
 gcc/cfganal.c                                |   1 -
 gcc/cfgbuild.c                               |   1 -
 gcc/cfgcleanup.c                             |   1 -
 gcc/cfgexpand.c                              |   2 -
 gcc/cfghooks.c                               |   2 -
 gcc/cfgloop.c                                |   2 -
 gcc/cfgloop.h                                |   1 -
 gcc/cfgloopanal.c                            |   1 -
 gcc/cfgloopmanip.c                           |   2 -
 gcc/cfgrtl.c                                 |   1 -
 gcc/cgraph.c                                 |   2 -
 gcc/cgraphbuild.c                            |   3 -
 gcc/cgraphclones.c                           |   3 -
 gcc/cgraphunit.c                             |   3 -
 gcc/cilk-common.c                            |   1 -
 gcc/combine-stack-adj.c                      |   1 -
 gcc/combine.c                                |   2 -
 gcc/common/common-target.h                   |   1 -
 gcc/common/common-targhooks.c                |   1 -
 gcc/compare-elim.c                           |   1 -
 gcc/config/aarch64/aarch64-builtins.c        |   2 -
 gcc/config/aarch64/aarch64.c                 |   2 -
 gcc/config/alpha/alpha.c                     |   2 -
 gcc/config/arc/arc.c                         |   1 -
 gcc/config/arm/aarch-common.c                |   1 -
 gcc/config/arm/arm-builtins.c                |   1 -
 gcc/config/arm/arm-c.c                       |   1 -
 gcc/config/arm/arm.c                         |   2 -
 gcc/config/avr/avr-c.c                       |   1 -
 gcc/config/avr/avr-log.c                     |   2 -
 gcc/config/avr/avr.c                         |   1 -
 gcc/config/bfin/bfin.c                       |   2 -
 gcc/config/c6x/c6x.c                         |   2 -
 gcc/config/cr16/cr16.c                       |   1 -
 gcc/config/cris/cris.c                       |   2 -
 gcc/config/darwin-c.c                        |   3 -
 gcc/config/darwin.c                          |   2 -
 gcc/config/default-c.c                       |   1 -
 gcc/config/epiphany/epiphany.c               |   1 -
 gcc/config/epiphany/mode-switch-use.c        |   1 -
 gcc/config/epiphany/resolve-sw-modes.c       |   1 -
 gcc/config/fr30/fr30.c                       |   1 -
 gcc/config/frv/frv.c                         |   1 -
 gcc/config/ft32/ft32.c                       |   1 -
 gcc/config/glibc-c.c                         |   1 -
 gcc/config/h8300/h8300.c                     |   1 -
 gcc/config/i386/i386-c.c                     |   1 -
 gcc/config/i386/i386.c                       |   2 -
 gcc/config/i386/msformat-c.c                 |   1 -
 gcc/config/i386/winnt-cxx.c                  |   1 -
 gcc/config/i386/winnt-stubs.c                |   1 -
 gcc/config/i386/winnt.c                      |   3 -
 gcc/config/ia64/ia64-c.c                     |   1 -
 gcc/config/ia64/ia64.c                       |   2 -
 gcc/config/iq2000/iq2000.c                   |   1 -
 gcc/config/lm32/lm32.c                       |   1 -
 gcc/config/m32c/m32c-pragma.c                |   1 -
 gcc/config/m32c/m32c.c                       |   2 -
 gcc/config/m32r/m32r.c                       |   1 -
 gcc/config/m68k/m68k.c                       |   1 -
 gcc/config/mcore/mcore.c                     |   1 -
 gcc/config/mep/mep-pragma.c                  |   2 -
 gcc/config/mep/mep.c                         |   2 -
 gcc/config/microblaze/microblaze-c.c         |   1 -
 gcc/config/microblaze/microblaze.c           |   2 -
 gcc/config/mips/mips.c                       |   2 -
 gcc/config/mmix/mmix.c                       |   1 -
 gcc/config/mn10300/mn10300.c                 |   1 -
 gcc/config/moxie/moxie.c                     |   1 -
 gcc/config/msp430/msp430-c.c                 |   1 -
 gcc/config/msp430/msp430.c                   |   1 -
 gcc/config/nds32/nds32-cost.c                |   1 -
 gcc/config/nds32/nds32-fp-as-gp.c            |   1 -
 gcc/config/nds32/nds32-intrinsic.c           |   1 -
 gcc/config/nds32/nds32-isr.c                 |   1 -
 gcc/config/nds32/nds32-md-auxiliary.c        |   1 -
 gcc/config/nds32/nds32-memory-manipulation.c |   1 -
 gcc/config/nds32/nds32-pipelines-auxiliary.c |   1 -
 gcc/config/nds32/nds32-predicates.c          |   1 -
 gcc/config/nds32/nds32.c                     |   1 -
 gcc/config/nios2/nios2.c                     |   1 -
 gcc/config/nvptx/nvptx.c                     |   1 -
 gcc/config/pa/pa.c                           |   1 -
 gcc/config/pdp11/pdp11.c                     |   1 -
 gcc/config/rl78/rl78-c.c                     |   1 -
 gcc/config/rl78/rl78.c                       |   1 -
 gcc/config/rs6000/rs6000-c.c                 |   1 -
 gcc/config/rs6000/rs6000.c                   |   2 -
 gcc/config/rx/rx.c                           |   2 -
 gcc/config/s390/s390-c.c                     |   1 -
 gcc/config/s390/s390.c                       |   2 -
 gcc/config/sh/sh-c.c                         |   1 -
 gcc/config/sh/sh-mem.cc                      |   1 -
 gcc/config/sh/sh.c                           |   2 -
 gcc/config/sh/sh_optimize_sett_clrt.cc       |   1 -
 gcc/config/sh/sh_treg_combine.cc             |   1 -
 gcc/config/sol2-c.c                          |   1 -
 gcc/config/sol2-cxx.c                        |   1 -
 gcc/config/sol2-stubs.c                      |   1 -
 gcc/config/sol2.c                            |   1 -
 gcc/config/sparc/sparc-c.c                   |   1 -
 gcc/config/sparc/sparc.c                     |   2 -
 gcc/config/spu/spu-c.c                       |   1 -
 gcc/config/spu/spu.c                         |   2 -
 gcc/config/stormy16/stormy16.c               |   2 -
 gcc/config/tilegx/mul-tables.c               |   1 -
 gcc/config/tilegx/tilegx-c.c                 |   1 -
 gcc/config/tilegx/tilegx.c                   |   2 -
 gcc/config/tilepro/mul-tables.c              |   1 -
 gcc/config/tilepro/tilepro-c.c               |   1 -
 gcc/config/tilepro/tilepro.c                 |   2 -
 gcc/config/v850/v850-c.c                     |   1 -
 gcc/config/v850/v850.c                       |   1 -
 gcc/config/vax/vax.c                         |   1 -
 gcc/config/visium/visium.c                   |   1 -
 gcc/config/vms/vms-c.c                       |   1 -
 gcc/config/vms/vms.c                         |   1 -
 gcc/config/vxworks.c                         |   1 -
 gcc/config/winnt-c.c                         |   1 -
 gcc/config/xtensa/xtensa.c                   |   2 -
 gcc/convert.c                                |   1 -
 gcc/coretypes.h                              |   2 +
 gcc/coverage.c                               |   2 -
 gcc/cp/ChangeLog                             |  38 ++
 gcc/cp/call.c                                |   3 -
 gcc/cp/class.c                               |   3 -
 gcc/cp/constexpr.c                           |   1 -
 gcc/cp/cp-array-notation.c                   |   1 -
 gcc/cp/cp-gimplify.c                         |   3 -
 gcc/cp/cp-lang.c                             |   1 -
 gcc/cp/cp-objcp-common.c                     |   1 -
 gcc/cp/cp-tree.h                             |   1 -
 gcc/cp/cp-ubsan.c                            |   2 -
 gcc/cp/cvt.c                                 |   1 -
 gcc/cp/decl.c                                |   3 -
 gcc/cp/decl2.c                               |   3 -
 gcc/cp/dump.c                                |   1 -
 gcc/cp/error.c                               |   1 -
 gcc/cp/except.c                              |   1 -
 gcc/cp/expr.c                                |   1 -
 gcc/cp/friend.c                              |   1 -
 gcc/cp/init.c                                |   1 -
 gcc/cp/lambda.c                              |   3 -
 gcc/cp/lex.c                                 |   2 -
 gcc/cp/mangle.c                              |   3 -
 gcc/cp/method.c                              |   3 -
 gcc/cp/name-lookup.c                         |   1 -
 gcc/cp/optimize.c                            |   3 -
 gcc/cp/parser.c                              |   3 -
 gcc/cp/pt.c                                  |   1 -
 gcc/cp/ptree.c                               |   1 -
 gcc/cp/repo.c                                |   2 -
 gcc/cp/rtti.c                                |   1 -
 gcc/cp/search.c                              |   1 -
 gcc/cp/semantics.c                           |   3 -
 gcc/cp/tree.c                                |   3 -
 gcc/cp/typeck.c                              |   1 -
 gcc/cp/typeck2.c                             |   1 -
 gcc/cp/vtable-class-hierarchy.c              |   2 -
 gcc/cppbuiltin.c                             |   1 -
 gcc/cprop.c                                  |   1 -
 gcc/cse.c                                    |   1 -
 gcc/cselib.c                                 |   2 -
 gcc/data-streamer-in.c                       |   3 -
 gcc/data-streamer-out.c                      |   3 -
 gcc/data-streamer.c                          |   3 -
 gcc/dbxout.c                                 |   2 -
 gcc/dce.c                                    |   1 -
 gcc/ddg.c                                    |   1 -
 gcc/debug.c                                  |   1 -
 gcc/df-core.c                                |   1 -
 gcc/df-problems.c                            |   1 -
 gcc/df-scan.c                                |   2 -
 gcc/df.h                                     |   1 -
 gcc/dfp.c                                    |   1 -
 gcc/diagnostic-core.h                        |   1 -
 gcc/diagnostic.c                             |   1 -
 gcc/dojump.c                                 |   1 -
 gcc/dominance.c                              |   1 -
 gcc/domwalk.c                                |   1 -
 gcc/double-int.c                             |   1 -
 gcc/dse.c                                    |   2 -
 gcc/dumpfile.c                               |   1 -
 gcc/dumpfile.h                               |   1 -
 gcc/dwarf2asm.c                              |   1 -
 gcc/dwarf2cfi.c                              |   1 -
 gcc/dwarf2out.c                              |   2 -
 gcc/emit-rtl.c                               |   1 -
 gcc/et-forest.c                              |   1 -
 gcc/except.c                                 |   2 -
 gcc/explow.c                                 |   1 -
 gcc/expmed.c                                 |   1 -
 gcc/expr.c                                   |   2 -
 gcc/final.c                                  |   2 -
 gcc/fixed-value.c                            |   1 -
 gcc/fold-const.c                             |   2 -
 gcc/fortran/ChangeLog                        |  24 ++
 gcc/fortran/convert.c                        |   1 -
 gcc/fortran/cpp.c                            |   1 -
 gcc/fortran/decl.c                           |   1 -
 gcc/fortran/f95-lang.c                       |   3 -
 gcc/fortran/gfortran.h                       |   1 -
 gcc/fortran/iresolve.c                       |   1 -
 gcc/fortran/match.c                          |   1 -
 gcc/fortran/module.c                         |   1 -
 gcc/fortran/options.c                        |   1 -
 gcc/fortran/target-memory.c                  |   1 -
 gcc/fortran/trans-array.c                    |   1 -
 gcc/fortran/trans-common.c                   |   1 -
 gcc/fortran/trans-const.c                    |   1 -
 gcc/fortran/trans-decl.c                     |   3 -
 gcc/fortran/trans-expr.c                     |   1 -
 gcc/fortran/trans-intrinsic.c                |   1 -
 gcc/fortran/trans-io.c                       |   1 -
 gcc/fortran/trans-openmp.c                   |   1 -
 gcc/fortran/trans-stmt.c                     |   1 -
 gcc/fortran/trans-types.c                    |   1 -
 gcc/fortran/trans.c                          |   1 -
 gcc/function.c                               |   1 -
 gcc/fwprop.c                                 |   1 -
 gcc/gcc-plugin.h                             |   2 -
 gcc/gcse.c                                   |   1 -
 gcc/generic-match-head.c                     |   2 -
 gcc/ggc-page.c                               |   3 -
 gcc/gimple-builder.c                         |   3 -
 gcc/gimple-expr.c                            |   3 -
 gcc/gimple-fold.c                            |   2 -
 gcc/gimple-iterator.c                        |   3 -
 gcc/gimple-low.c                             |   3 -
 gcc/gimple-match-head.c                      |   2 -
 gcc/gimple-pretty-print.c                    |   3 -
 gcc/gimple-ssa-isolate-paths.c               |   3 -
 gcc/gimple-ssa-strength-reduction.c          |   2 -
 gcc/gimple-streamer-in.c                     |   3 -
 gcc/gimple-streamer-out.c                    |   3 -
 gcc/gimple-streamer.h                        |   1 -
 gcc/gimple-walk.c                            |   2 -
 gcc/gimple.c                                 |   3 -
 gcc/gimplify-me.c                            |   3 -
 gcc/gimplify.c                               |   2 -
 gcc/go/ChangeLog                             |   7 +
 gcc/go/go-backend.c                          |   1 -
 gcc/go/go-gcc.cc                             |   3 -
 gcc/go/go-lang.c                             |   2 -
 gcc/go/go-system.h                           |   1 -
 gcc/godump.c                                 |   1 -
 gcc/graph.c                                  |   1 -
 gcc/graphite-blocking.c                      |   3 -
 gcc/graphite-dependences.c                   |   3 -
 gcc/graphite-interchange.c                   |   3 -
 gcc/graphite-isl-ast-to-gimple.c             |   3 -
 gcc/graphite-optimize-isl.c                  |   3 -
 gcc/graphite-poly.c                          |   3 -
 gcc/graphite-scop-detection.c                |   3 -
 gcc/graphite-sese-to-poly.c                  |   2 -
 gcc/graphite.c                               |   3 -
 gcc/haifa-sched.c                            |   1 -
 gcc/hw-doloop.c                              |   1 -
 gcc/hwint.c                                  |   2 +-
 gcc/ifcvt.c                                  |   1 -
 gcc/init-regs.c                              |   1 -
 gcc/input.c                                  |   1 -
 gcc/internal-fn.c                            |   2 -
 gcc/ipa-chkp.c                               |   2 -
 gcc/ipa-comdats.c                            |   3 -
 gcc/ipa-cp.c                                 |   3 -
 gcc/ipa-devirt.c                             |   2 -
 gcc/ipa-icf-gimple.c                         |   2 -
 gcc/ipa-icf.c                                |   2 -
 gcc/ipa-inline-analysis.c                    |   3 -
 gcc/ipa-inline-transform.c                   |   3 -
 gcc/ipa-inline.c                             |   3 -
 gcc/ipa-polymorphic-call.c                   |   2 -
 gcc/ipa-profile.c                            |   3 -
 gcc/ipa-prop.c                               |   2 -
 gcc/ipa-pure-const.c                         |   3 -
 gcc/ipa-ref.c                                |   3 -
 gcc/ipa-reference.c                          |   3 -
 gcc/ipa-split.c                              |   2 -
 gcc/ipa-utils.c                              |   3 -
 gcc/ipa-visibility.c                         |   3 -
 gcc/ipa.c                                    |   3 -
 gcc/ira-build.c                              |   1 -
 gcc/ira-color.c                              |   1 -
 gcc/ira-conflicts.c                          |   1 -
 gcc/ira-costs.c                              |   1 -
 gcc/ira-emit.c                               |   1 -
 gcc/ira-lives.c                              |   1 -
 gcc/ira.c                                    |   1 -
 gcc/java/ChangeLog                           |  22 +
 gcc/java/boehm.c                             |   1 -
 gcc/java/builtins.c                          |   1 -
 gcc/java/class.c                             |   3 -
 gcc/java/constants.c                         |   1 -
 gcc/java/decl.c                              |   3 -
 gcc/java/except.c                            |   1 -
 gcc/java/expr.c                              |   1 -
 gcc/java/java-gimplify.c                     |   3 -
 gcc/java/jcf-dump.c                          |   1 -
 gcc/java/jcf-io.c                            |   1 -
 gcc/java/jcf-parse.c                         |   3 -
 gcc/java/jvgenmain.c                         |   1 -
 gcc/java/lang.c                              |   2 -
 gcc/java/mangle.c                            |   1 -
 gcc/java/mangle_name.c                       |   1 -
 gcc/java/resource.c                          |   3 -
 gcc/java/typeck.c                            |   1 -
 gcc/java/verify-glue.c                       |   1 -
 gcc/java/verify-impl.c                       |   1 -
 gcc/jit/ChangeLog                            |   6 +
 gcc/jit/dummy-frontend.c                     |   1 -
 gcc/jit/jit-common.h                         |   1 -
 gcc/jit/jit-playback.c                       |   2 -
 gcc/jump.c                                   |   1 -
 gcc/langhooks.c                              |   3 -
 gcc/lcm.c                                    |   1 -
 gcc/loop-doloop.c                            |   1 -
 gcc/loop-init.c                              |   2 -
 gcc/loop-invariant.c                         |   1 -
 gcc/loop-iv.c                                |   1 -
 gcc/loop-unroll.c                            |   1 -
 gcc/lower-subreg.c                           |   1 -
 gcc/lra-assigns.c                            |   1 -
 gcc/lra-coalesce.c                           |   1 -
 gcc/lra-constraints.c                        |   1 -
 gcc/lra-eliminations.c                       |   1 -
 gcc/lra-lives.c                              |   1 -
 gcc/lra-remat.c                              |   1 -
 gcc/lra-spills.c                             |   1 -
 gcc/lra.c                                    |   1 -
 gcc/lto-cgraph.c                             |   2 -
 gcc/lto-compress.c                           |   3 -
 gcc/lto-opts.c                               |   3 -
 gcc/lto-section-in.c                         |   2 -
 gcc/lto-section-out.c                        |   2 -
 gcc/lto-streamer-in.c                        |   2 -
 gcc/lto-streamer-out.c                       |   2 -
 gcc/lto-streamer.c                           |   3 -
 gcc/lto/ChangeLog                            |   8 +
 gcc/lto/lto-lang.c                           |   3 -
 gcc/lto/lto-object.c                         |   3 -
 gcc/lto/lto-partition.c                      |   3 -
 gcc/lto/lto-symtab.c                         |   3 -
 gcc/lto/lto.c                                |   3 -
 gcc/mcf.c                                    |   1 -
 gcc/mode-switching.c                         |   1 -
 gcc/modulo-sched.c                           |   1 -
 gcc/objc/ChangeLog                           |  11 +
 gcc/objc/objc-act.c                          |   3 -
 gcc/objc/objc-encoding.c                     |   1 -
 gcc/objc/objc-gnu-runtime-abi-01.c           |   1 -
 gcc/objc/objc-lang.c                         |   1 -
 gcc/objc/objc-map.c                          |   1 -
 gcc/objc/objc-next-runtime-abi-01.c          |   1 -
 gcc/objc/objc-next-runtime-abi-02.c          |   1 -
 gcc/objc/objc-runtime-shared-support.c       |   1 -
 gcc/objcp/ChangeLog                          |   5 +
 gcc/objcp/objcp-decl.c                       |   1 -
 gcc/objcp/objcp-lang.c                       |   1 -
 gcc/omega.c                                  |   1 -
 gcc/omp-low.c                                |   2 -
 gcc/optabs.c                                 |   1 -
 gcc/opts-global.c                            |   3 -
 gcc/opts.h                                   |   1 -
 gcc/passes.c                                 |   3 -
 gcc/plugin.c                                 |   1 -
 gcc/postreload-gcse.c                        |   1 -
 gcc/postreload.c                             |   1 -
 gcc/predict.c                                |   2 -
 gcc/pretty-print.h                           |   1 -
 gcc/print-rtl.c                              |   2 -
 gcc/print-tree.c                             |   3 -
 gcc/profile.c                                |   2 -
 gcc/real.c                                   |   1 -
 gcc/realmpfr.c                               |   1 -
 gcc/recog.c                                  |   1 -
 gcc/ree.c                                    |   2 -
 gcc/reg-stack.c                              |   2 -
 gcc/regcprop.c                               |   1 -
 gcc/reginfo.c                                |   1 -
 gcc/regrename.c                              |   1 -
 gcc/regstat.c                                |   1 -
 gcc/reload.c                                 |   1 -
 gcc/reload1.c                                |   1 -
 gcc/reorg.c                                  |   1 -
 gcc/resource.c                               |   1 -
 gcc/rtl-chkp.c                               |   2 -
 gcc/rtl-error.c                              |   1 -
 gcc/rtl.h                                    |   4 +-
 gcc/rtlanal.c                                |   1 -
 gcc/rtlhooks.c                               |   1 -
 gcc/sanopt.c                                 |   2 -
 gcc/sched-deps.c                             |   2 -
 gcc/sched-ebb.c                              |   1 -
 gcc/sched-rgn.c                              |   1 -
 gcc/sched-vis.c                              |   2 -
 gcc/sdbout.c                                 |   1 -
 gcc/sel-sched-dump.c                         |   1 -
 gcc/sel-sched-ir.c                           |   1 -
 gcc/sel-sched.c                              |   1 -
 gcc/sese.c                                   |   3 -
 gcc/shrink-wrap.c                            |   1 -
 gcc/simplify-rtx.c                           |   1 -
 gcc/stack-ptr-mod.c                          |   1 -
 gcc/statistics.c                             |   1 -
 gcc/stmt.c                                   |   2 -
 gcc/stor-layout.c                            |   2 -
 gcc/store-motion.c                           |   1 -
 gcc/streamer-hooks.c                         |   1 -
 gcc/stringpool.c                             |   1 -
 gcc/symtab.c                                 |   3 -
 gcc/target-globals.c                         |   1 -
 gcc/targhooks.c                              |   1 -
 gcc/toplev.c                                 |   3 -
 gcc/tracer.c                                 |   3 -
 gcc/trans-mem.c                              |   3 -
 gcc/tree-affine.c                            |   2 -
 gcc/tree-browser.c                           |   1 -
 gcc/tree-call-cdce.c                         |   2 -
 gcc/tree-cfg.c                               |   2 -
 gcc/tree-cfgcleanup.c                        |   2 -
 gcc/tree-chkp-opt.c                          |   2 -
 gcc/tree-chkp.c                              |   2 -
 gcc/tree-chrec.c                             |   2 -
 gcc/tree-complex.c                           |   2 -
 gcc/tree-data-ref.c                          |   2 -
 gcc/tree-dfa.c                               |   2 -
 gcc/tree-diagnostic.c                        |   1 -
 gcc/tree-dump.c                              |   1 -
 gcc/tree-eh.c                                |   2 -
 gcc/tree-emutls.c                            |   3 -
 gcc/tree-if-conv.c                           |   2 -
 gcc/tree-inline.c                            |   2 -
 gcc/tree-into-ssa.c                          |   2 -
 gcc/tree-iterator.c                          |   1 -
 gcc/tree-loop-distribution.c                 |   3 -
 gcc/tree-nested.c                            |   2 -
 gcc/tree-nrv.c                               |   3 -
 gcc/tree-object-size.c                       |   3 -
 gcc/tree-outof-ssa.c                         |   2 -
 gcc/tree-parloops.c                          |   3 -
 gcc/tree-phinodes.c                          |   3 -
 gcc/tree-predcom.c                           |   2 -
 gcc/tree-pretty-print.c                      |   2 -
 gcc/tree-profile.c                           |   3 -
 gcc/tree-scalar-evolution.c                  |   2 -
 gcc/tree-sra.c                               |   2 -
 gcc/tree-ssa-address.c                       |   2 -
 gcc/tree-ssa-alias.c                         |   2 -
 gcc/tree-ssa-ccp.c                           |   3 -
 gcc/tree-ssa-coalesce.c                      |   3 -
 gcc/tree-ssa-copy.c                          |   3 -
 gcc/tree-ssa-copyrename.c                    |   2 -
 gcc/tree-ssa-dce.c                           |   2 -
 gcc/tree-ssa-dom.c                           |   3 -
 gcc/tree-ssa-dse.c                           |   2 -
 gcc/tree-ssa-forwprop.c                      |   2 -
 gcc/tree-ssa-ifcombine.c                     |   3 -
 gcc/tree-ssa-live.c                          |   2 -
 gcc/tree-ssa-loop-ch.c                       |   3 -
 gcc/tree-ssa-loop-im.c                       |   3 -
 gcc/tree-ssa-loop-ivcanon.c                  |   3 -
 gcc/tree-ssa-loop-ivopts.c                   |   2 -
 gcc/tree-ssa-loop-manip.c                    |   3 -
 gcc/tree-ssa-loop-niter.c                    |   2 -
 gcc/tree-ssa-loop-prefetch.c                 |   2 -
 gcc/tree-ssa-loop-unswitch.c                 |   3 -
 gcc/tree-ssa-loop.c                          |   3 -
 gcc/tree-ssa-math-opts.c                     |   2 -
 gcc/tree-ssa-operands.c                      |   3 -
 gcc/tree-ssa-phiopt.c                        |   2 -
 gcc/tree-ssa-phiprop.c                       |   3 -
 gcc/tree-ssa-pre.c                           |   2 -
 gcc/tree-ssa-propagate.c                     |   3 -
 gcc/tree-ssa-reassoc.c                       |   2 -
 gcc/tree-ssa-sccvn.c                         |   2 -
 gcc/tree-ssa-scopedtables.c                  |   1 -
 gcc/tree-ssa-sink.c                          |   3 -
 gcc/tree-ssa-strlen.c                        |   2 -
 gcc/tree-ssa-structalias.c                   |   2 -
 gcc/tree-ssa-tail-merge.c                    |   3 -
 gcc/tree-ssa-ter.c                           |   3 -
 gcc/tree-ssa-threadedge.c                    |   3 -
 gcc/tree-ssa-threadupdate.c                  |   3 -
 gcc/tree-ssa-uncprop.c                       |   3 -
 gcc/tree-ssa-uninit.c                        |   3 -
 gcc/tree-ssa.c                               |   3 -
 gcc/tree-ssanames.c                          |   3 -
 gcc/tree-stdarg.c                            |   3 -
 gcc/tree-streamer-in.c                       |   3 -
 gcc/tree-streamer-out.c                      |   3 -
 gcc/tree-streamer.c                          |   3 -
 gcc/tree-switch-conversion.c                 |   3 -
 gcc/tree-tailcall.c                          |   2 -
 gcc/tree-vect-data-refs.c                    |   2 -
 gcc/tree-vect-generic.c                      |   2 -
 gcc/tree-vect-loop-manip.c                   |   3 -
 gcc/tree-vect-loop.c                         |   2 -
 gcc/tree-vect-patterns.c                     |   2 -
 gcc/tree-vect-slp.c                          |   2 -
 gcc/tree-vect-stmts.c                        |   2 -
 gcc/tree-vectorizer.c                        |   3 -
 gcc/tree-vrp.c                               |   2 -
 gcc/tree.c                                   |   2 -
 gcc/tsan.c                                   |   2 -
 gcc/ubsan.c                                  |   2 -
 gcc/valtrack.c                               |   1 -
 gcc/value-prof.c                             |   2 -
 gcc/var-tracking.c                           |   1 -
 gcc/varasm.c                                 |   2 -
 gcc/varpool.c                                |   3 -
 gcc/vec.c                                    |   1 -
 gcc/vmsdbgout.c                              |   2 -
 gcc/vtable-verify.c                          |   3 -
 gcc/web.c                                    |   1 -
 gcc/wide-int.cc                              |   1 -
 gcc/xcoffout.c                               |   1 -
 570 files changed, 599 insertions(+), 952 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1888fc2910aa..77af01c8cec4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,430 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* coretypes.h: Include input.h and as-a.h.
+	* rtl.h: Include input.h and as-a.h for generator files.
+	* hwint.c: Include coretypes.h, don't include diagnostic-core.h.
+	* vec.c: Don't include diagnostic-core.h.
+	* alias.c: Do not include input.h, line-map.h or is-a.h.
+	* asan.c: Likewise.
+	* attribs.c: Likewise.
+	* auto-inc-dec.c: Likewise.
+	* auto-profile.c: Likewise.
+	* bb-reorder.c: Likewise.
+	* bt-load.c: Likewise.
+	* builtins.c: Likewise.
+	* caller-save.c: Likewise.
+	* calls.c: Likewise.
+	* ccmp.c: Likewise.
+	* cfg.c: Likewise.
+	* cfganal.c: Likewise.
+	* cfgbuild.c: Likewise.
+	* cfgcleanup.c: Likewise.
+	* cfgexpand.c: Likewise.
+	* cfghooks.c: Likewise.
+	* cfgloop.c: Likewise.
+	* 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.
+	* convert.c: Likewise.
+	* coverage.c: Likewise.
+	* cppbuiltin.c: Likewise.
+	* cprop.c: Likewise.
+	* cse.c: Likewise.
+	* cselib.c: Likewise.
+	* data-streamer-in.c: Likewise.
+	* data-streamer-out.c: Likewise.
+	* data-streamer.c: Likewise.
+	* dbxout.c: Likewise.
+	* dce.c: Likewise.
+	* ddg.c: Likewise.
+	* debug.c: Likewise.
+	* df-core.c: Likewise.
+	* df-problems.c: Likewise.
+	* df-scan.c: Likewise.
+	* df.h: Likewise.
+	* dfp.c: Likewise.
+	* diagnostic-core.h: Likewise.
+	* diagnostic.c: Likewise.
+	* dojump.c: Likewise.
+	* dominance.c: Likewise.
+	* domwalk.c: Likewise.
+	* double-int.c: Likewise.
+	* dse.c: Likewise.
+	* dumpfile.c: Likewise.
+	* dumpfile.h: Likewise.
+	* dwarf2asm.c: Likewise.
+	* dwarf2cfi.c: Likewise.
+	* dwarf2out.c: Likewise.
+	* emit-rtl.c: Likewise.
+	* et-forest.c: Likewise.
+	* except.c: Likewise.
+	* explow.c: Likewise.
+	* expmed.c: Likewise.
+	* expr.c: Likewise.
+	* final.c: Likewise.
+	* fixed-value.c: Likewise.
+	* fold-const.c: Likewise.
+	* function.c: Likewise.
+	* fwprop.c: Likewise.
+	* gcc-plugin.h: Likewise.
+	* gcse.c: Likewise.
+	* generic-match-head.c: Likewise.
+	* ggc-page.c: Likewise.
+	* gimple-builder.c: Likewise.
+	* gimple-expr.c: Likewise.
+	* gimple-fold.c: Likewise.
+	* gimple-iterator.c: Likewise.
+	* gimple-low.c: Likewise.
+	* gimple-match-head.c: Likewise.
+	* gimple-pretty-print.c: Likewise.
+	* gimple-ssa-isolate-paths.c: Likewise.
+	* gimple-ssa-strength-reduction.c: Likewise.
+	* gimple-streamer-in.c: Likewise.
+	* gimple-streamer-out.c: Likewise.
+	* gimple-streamer.h: Likewise.
+	* gimple-walk.c: Likewise.
+	* gimple.c: Likewise.
+	* gimplify-me.c: Likewise.
+	* gimplify.c: Likewise.
+	* godump.c: Likewise.
+	* graph.c: Likewise.
+	* graphite-blocking.c: Likewise.
+	* graphite-dependences.c: Likewise.
+	* graphite-interchange.c: Likewise.
+	* graphite-isl-ast-to-gimple.c: Likewise.
+	* graphite-optimize-isl.c: Likewise.
+	* graphite-poly.c: Likewise.
+	* graphite-scop-detection.c: Likewise.
+	* graphite-sese-to-poly.c: Likewise.
+	* graphite.c: Likewise.
+	* haifa-sched.c: Likewise.
+	* hw-doloop.c: Likewise.
+	* ifcvt.c: Likewise.
+	* init-regs.c: Likewise.
+	* 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.
+	* loop-doloop.c: Likewise.
+	* loop-init.c: Likewise.
+	* loop-invariant.c: Likewise.
+	* loop-iv.c: Likewise.
+	* loop-unroll.c: Likewise.
+	* lower-subreg.c: Likewise.
+	* lra-assigns.c: Likewise.
+	* lra-coalesce.c: Likewise.
+	* lra-constraints.c: Likewise.
+	* lra-eliminations.c: Likewise.
+	* lra-lives.c: Likewise.
+	* lra-remat.c: Likewise.
+	* lra-spills.c: Likewise.
+	* lra.c: Likewise.
+	* lto-cgraph.c: Likewise.
+	* lto-compress.c: Likewise.
+	* lto-opts.c: Likewise.
+	* lto-section-in.c: Likewise.
+	* lto-section-out.c: Likewise.
+	* lto-streamer-in.c: Likewise.
+	* lto-streamer-out.c: Likewise.
+	* lto-streamer.c: Likewise.
+	* mcf.c: Likewise.
+	* mode-switching.c: Likewise.
+	* modulo-sched.c: Likewise.
+	* omega.c: Likewise.
+	* omp-low.c: Likewise.
+	* optabs.c: Likewise.
+	* opts-global.c: Likewise.
+	* opts.h: Likewise.
+	* passes.c: Likewise.
+	* plugin.c: Likewise.
+	* postreload-gcse.c: Likewise.
+	* postreload.c: Likewise.
+	* predict.c: Likewise.
+	* pretty-print.h: Likewise.
+	* print-rtl.c: Likewise.
+	* print-tree.c: Likewise.
+	* profile.c: Likewise.
+	* real.c: Likewise.
+	* realmpfr.c: Likewise.
+	* recog.c: Likewise.
+	* ree.c: Likewise.
+	* reg-stack.c: Likewise.
+	* regcprop.c: Likewise.
+	* reginfo.c: Likewise.
+	* regrename.c: Likewise.
+	* regstat.c: Likewise.
+	* reload.c: Likewise.
+	* reload1.c: Likewise.
+	* reorg.c: Likewise.
+	* resource.c: Likewise.
+	* rtl-chkp.c: Likewise.
+	* rtl-error.c: Likewise.
+	* rtlanal.c: Likewise.
+	* rtlhooks.c: Likewise.
+	* sanopt.c: Likewise.
+	* sched-deps.c: Likewise.
+	* sched-ebb.c: Likewise.
+	* sched-rgn.c: Likewise.
+	* sched-vis.c: Likewise.
+	* sdbout.c: Likewise.
+	* sel-sched-dump.c: Likewise.
+	* sel-sched-ir.c: Likewise.
+	* sel-sched.c: Likewise.
+	* sese.c: Likewise.
+	* shrink-wrap.c: Likewise.
+	* simplify-rtx.c: Likewise.
+	* stack-ptr-mod.c: Likewise.
+	* statistics.c: Likewise.
+	* stmt.c: Likewise.
+	* stor-layout.c: Likewise.
+	* store-motion.c: Likewise.
+	* streamer-hooks.c: Likewise.
+	* stringpool.c: Likewise.
+	* symtab.c: Likewise.
+	* target-globals.c: Likewise.
+	* targhooks.c: Likewise.
+	* toplev.c: Likewise.
+	* tracer.c: Likewise.
+	* trans-mem.c: Likewise.
+	* tree-affine.c: Likewise.
+	* tree-browser.c: Likewise.
+	* tree-call-cdce.c: Likewise.
+	* tree-cfg.c: Likewise.
+	* tree-cfgcleanup.c: Likewise.
+	* tree-chkp-opt.c: Likewise.
+	* tree-chkp.c: Likewise.
+	* tree-chrec.c: Likewise.
+	* tree-complex.c: Likewise.
+	* tree-data-ref.c: Likewise.
+	* tree-dfa.c: Likewise.
+	* tree-diagnostic.c: Likewise.
+	* tree-dump.c: Likewise.
+	* tree-eh.c: Likewise.
+	* tree-emutls.c: Likewise.
+	* tree-if-conv.c: Likewise.
+	* tree-inline.c: Likewise.
+	* tree-into-ssa.c: Likewise.
+	* tree-iterator.c: Likewise.
+	* tree-loop-distribution.c: Likewise.
+	* tree-nested.c: Likewise.
+	* tree-nrv.c: Likewise.
+	* tree-object-size.c: Likewise.
+	* tree-outof-ssa.c: Likewise.
+	* tree-parloops.c: Likewise.
+	* tree-phinodes.c: Likewise.
+	* tree-predcom.c: Likewise.
+	* tree-pretty-print.c: Likewise.
+	* tree-profile.c: Likewise.
+	* tree-scalar-evolution.c: Likewise.
+	* tree-sra.c: Likewise.
+	* tree-ssa-address.c: Likewise.
+	* tree-ssa-alias.c: Likewise.
+	* tree-ssa-ccp.c: Likewise.
+	* tree-ssa-coalesce.c: Likewise.
+	* tree-ssa-copy.c: Likewise.
+	* tree-ssa-copyrename.c: Likewise.
+	* tree-ssa-dce.c: Likewise.
+	* tree-ssa-dom.c: Likewise.
+	* tree-ssa-dse.c: Likewise.
+	* tree-ssa-forwprop.c: Likewise.
+	* tree-ssa-ifcombine.c: Likewise.
+	* tree-ssa-live.c: Likewise.
+	* tree-ssa-loop-ch.c: Likewise.
+	* tree-ssa-loop-im.c: Likewise.
+	* tree-ssa-loop-ivcanon.c: Likewise.
+	* tree-ssa-loop-ivopts.c: Likewise.
+	* tree-ssa-loop-manip.c: Likewise.
+	* tree-ssa-loop-niter.c: Likewise.
+	* tree-ssa-loop-prefetch.c: Likewise.
+	* tree-ssa-loop-unswitch.c: Likewise.
+	* tree-ssa-loop.c: Likewise.
+	* tree-ssa-math-opts.c: Likewise.
+	* tree-ssa-operands.c: Likewise.
+	* tree-ssa-phiopt.c: Likewise.
+	* tree-ssa-phiprop.c: Likewise.
+	* tree-ssa-pre.c: Likewise.
+	* tree-ssa-propagate.c: Likewise.
+	* tree-ssa-reassoc.c: Likewise.
+	* tree-ssa-sccvn.c: Likewise.
+	* tree-ssa-scopedtables.c: Likewise.
+	* tree-ssa-sink.c: Likewise.
+	* tree-ssa-strlen.c: Likewise.
+	* tree-ssa-structalias.c: Likewise.
+	* tree-ssa-tail-merge.c: Likewise.
+	* tree-ssa-ter.c: Likewise.
+	* tree-ssa-threadedge.c: Likewise.
+	* tree-ssa-threadupdate.c: Likewise.
+	* tree-ssa-uncprop.c: Likewise.
+	* tree-ssa-uninit.c: Likewise.
+	* tree-ssa.c: Likewise.
+	* tree-ssanames.c: Likewise.
+	* tree-stdarg.c: Likewise.
+	* tree-streamer-in.c: Likewise.
+	* tree-streamer-out.c: Likewise.
+	* tree-streamer.c: Likewise.
+	* tree-switch-conversion.c: Likewise.
+	* tree-tailcall.c: Likewise.
+	* tree-vect-data-refs.c: Likewise.
+	* tree-vect-generic.c: Likewise.
+	* tree-vect-loop-manip.c: Likewise.
+	* tree-vect-loop.c: Likewise.
+	* tree-vect-patterns.c: Likewise.
+	* tree-vect-slp.c: Likewise.
+	* tree-vect-stmts.c: Likewise.
+	* tree-vectorizer.c: Likewise.
+	* tree-vrp.c: Likewise.
+	* tree.c: Likewise.
+	* tsan.c: Likewise.
+	* ubsan.c: Likewise.
+	* valtrack.c: Likewise.
+	* value-prof.c: Likewise.
+	* var-tracking.c: Likewise.
+	* varasm.c: Likewise.
+	* varpool.c: Likewise.
+	* vmsdbgout.c: Likewise.
+	* vtable-verify.c: Likewise.
+	* web.c: Likewise.
+	* wide-int.cc: Likewise.
+	* xcoffout.c: Likewise.
+	* common/common-target.h: Do not include input.h, line-map.h or is-a.h.
+	* common/common-targhooks.c: Likewise.
+	* config/aarch64/aarch64-builtins.c: Likewise.
+	* config/aarch64/aarch64.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-17  Robert Suchanek  <robert.suchanek@imgtec.com>
 
 	* config/mips/mips.c (mips_ira_change_pseudo_allocno_class): New
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4eeb13e4844f..47aaea51e4f4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* gcc-interface/cuintp.c: Do not include input.h, line-map.h or is-a.h.
+	* 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-11  Pierre-Marie de Rodat  <derodat@adacore.com>
 
 	* gcc-interface/utils.c (get_global_context): Register the main
diff --git a/gcc/ada/gcc-interface/cuintp.c b/gcc/ada/gcc-interface/cuintp.c
index 4eb569da49ac..bd01daebb4e5 100644
--- a/gcc/ada/gcc-interface/cuintp.c
+++ b/gcc/ada/gcc-interface/cuintp.c
@@ -31,7 +31,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 2e722e06b684..a17eab6dbfbc 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -28,7 +28,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index f911e9881763..cc1f92345cc8 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -30,7 +30,6 @@
 #include "options.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
diff --git a/gcc/ada/gcc-interface/targtyps.c b/gcc/ada/gcc-interface/targtyps.c
index f1728470ed67..8b5cb98ca926 100644
--- a/gcc/ada/gcc-interface/targtyps.c
+++ b/gcc/ada/gcc-interface/targtyps.c
@@ -29,7 +29,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index e7f4120f40bb..85a77ea5fafc 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -28,7 +28,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
@@ -46,7 +45,6 @@
 #include "gimplify.h"
 #include "bitmap.h"
 #include "hash-map.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 655bfa1b8d50..e4b96d7b120c 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -28,7 +28,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
@@ -49,7 +48,6 @@
 #include "common/common-target.h"
 #include "langhooks.h"
 #include "hash-map.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c
index 681266685bbf..f0ec0b5bf31d 100644
--- a/gcc/ada/gcc-interface/utils2.c
+++ b/gcc/ada/gcc-interface/utils2.c
@@ -28,7 +28,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
diff --git a/gcc/alias.c b/gcc/alias.c
index bc6a0eef0b8a..f79cc4236a9d 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -58,7 +57,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "rtl-iter.h"
diff --git a/gcc/asan.c b/gcc/asan.c
index 599c8222897d..e89817e6fe29 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -39,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/attribs.c b/gcc/attribs.c
index b50c73392c3a..793107797432 100644
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "tree.h"
 #include "stringpool.h"
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index 0bdf91a507dd..3241ed7c1e22 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index 9246eadad7dc..ab5a27ece347 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include <set>
 
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -37,7 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -55,7 +53,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-ssa-operands.h"
 #include "tree-into-ssa.h"
 #include "internal-fn.h"
-#include "is-a.h"
 #include "gimple-expr.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 522d94489ef9..2fb4e44b646b 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -82,7 +82,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -119,7 +118,6 @@
 #include "basic-block.h"
 #include "df.h"
 #include "bb-reorder.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index f48edf201d09..9c1d04e11739 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "target.h"
 #include "symtab.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "alias.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index e8fe3db55177..1b5e659c4032 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -41,7 +40,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 "is-a.h"
 #include "gimple.h"
 #include "flags.h"
 #include "regs.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 80c3e48e13de..33cf7690bb6f 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,27 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* array-notation-common.c: Do not include input.h, line-map.h or is-a.h.
+	* 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-13  Patrick Palka  <ppalka@gcc.gnu.org>
 
 	PR c++/65168
diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c
index 1cdcb19c43e3..d60ec3f45e4c 100644
--- a/gcc/c-family/array-notation-common.c
+++ b/gcc/c-family/array-notation-common.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h" 
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index b79eca815c71..85db5e37dc28 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/c-family/c-cilkplus.c b/gcc/c-family/c-cilkplus.c
index d615bd936aac..c61cf47b824a 100644
--- a/gcc/c-family/c-cilkplus.c
+++ b/gcc/c-family/c-cilkplus.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index b1af682cf622..dc2bf00ebbc1 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "c-common.h"
 #include "tm.h"
 #include "intl.h"
@@ -48,10 +47,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "tree-iterator.h"
 #include "opts.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 7ba81c4ecf88..8951c3f9fb61 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "splay-tree.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "flags.h"
 #include "symtab.h"
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 918f51b35650..cdf2d5ab7769 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/c-family/c-dump.c b/gcc/c-family/c-dump.c
index 3c5d9abd2516..cc006585d58d 100644
--- a/gcc/c-family/c-dump.c
+++ b/gcc/c-family/c-dump.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index 397091b82c2e..76dc56735df5 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index 8a799b9cef60..b646a3bccaac 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -35,13 +34,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-common.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "tree-inline.h"
diff --git a/gcc/c-family/c-indentation.c b/gcc/c-family/c-indentation.c
index f8c28cfb1902..b05185c26f06 100644
--- a/gcc/c-family/c-indentation.c
+++ b/gcc/c-family/c-indentation.c
@@ -21,13 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "stor-layout.h"
-#include "input.h"
 #include "c-common.h"
 
 extern cpp_options *cpp_opts;
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index 94ee59d6647c..9c56832219b2 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -21,13 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "stor-layout.h"
-#include "input.h"
 #include "c-common.h"
 #include "flags.h"
 #include "timevar.h"
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index e0658f9d5030..289016da19b1 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index b90e0f485f19..4e0894fc2213 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "options.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c
index 4db9c24be49c..187526aa2446 100644
--- a/gcc/c-family/c-pch.c
+++ b/gcc/c-family/c-pch.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "version.h"
 #include "cpplib.h"
 #include "options.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index d404c8516e9e..276b110e74d7 100644
--- a/gcc/c-family/c-ppoutput.c
+++ b/gcc/c-family/c-ppoutput.c
@@ -21,7 +21,6 @@
 #include "coretypes.h"
 #include "cpplib.h"
 #include "../libcpp/internal.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index 5d8300e4e4e4..3cc360337fa2 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "attribs.h"
 #include "varasm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"		/* For cfun.  FIXME: Does the parser know
 				   when it is inside a function, so that
 				   we don't have to look at cfun?  */
@@ -44,7 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "opts.h"
 #include "plugin.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c
index 2115d76aa54f..482509b34c50 100644
--- a/gcc/c-family/c-pretty-print.c
+++ b/gcc/c-family/c-pretty-print.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/c-family/c-semantics.c b/gcc/c-family/c-semantics.c
index 1b3c27788aa3..c34026fb39c1 100644
--- a/gcc/c-family/c-semantics.c
+++ b/gcc/c-family/c-semantics.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index 19e9bf15f849..6cf2a74d6543 100644
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -21,17 +21,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
 #include "tree.h"
 #include "alloc-pool.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 4957ade7e0f6..c38e05f41342 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -38,11 +37,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "c-family/c-common.h"
 #include "toplev.h" 
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index 835ebaca94b8..9d225e34701b 100644
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "alias.h"
-#include "input.h"
 #include "symtab.h"
 #include "flags.h"
 #include "tree.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index ae9f862fe305..4bac6e02c356 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,15 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* c-array-notation.c: Do not include input.h, line-map.h or is-a.h.
+	* c-aux-info.c: Likewise.
+	* c-convert.c: Likewise.
+	* c-decl.c: Likewise.
+	* c-errors.c: Likewise.
+	* c-lang.c: Likewise.
+	* c-objc-common.c: Likewise.
+	* c-parser.c: Likewise.
+	* c-typeck.c: Likewise.
+
 2015-06-11  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR middle-end/66325
diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index 682d4120da67..2816680a995a 100644
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -69,7 +69,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "flags.h"
 #include "tree.h"
diff --git a/gcc/c/c-aux-info.c b/gcc/c/c-aux-info.c
index 2cc8d0999234..01e81f92510d 100644
--- a/gcc/c/c-aux-info.c
+++ b/gcc/c/c-aux-info.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "flags.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "tree.h"
 #include "c-tree.h"
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index e6cba968b0f4..aa8427b0fb6d 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "tree.h"
 #include "flags.h"
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index b124feb37d67..fc1fdf97beee 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -27,11 +27,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "tm.h"
 #include "intl.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "tree.h"
 #include "fold-const.h"
@@ -61,7 +59,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-iterator.h"
 #include "diagnostic-core.h"
 #include "dumpfile.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/c/c-errors.c b/gcc/c/c-errors.c
index b3e7ee9b5d68..1c1a1da97e44 100644
--- a/gcc/c/c-errors.c
+++ b/gcc/c/c-errors.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "tree.h"
 #include "c-tree.h"
diff --git a/gcc/c/c-lang.c b/gcc/c/c-lang.c
index fae024f69d2f..327ead21cdf6 100644
--- a/gcc/c/c-lang.c
+++ b/gcc/c/c-lang.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "tree.h"
 #include "c-tree.h"
diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c
index 514cc55d08d2..0bd331608c33 100644
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "flags.h"
 #include "tree.h"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 0f6d1c9f75f6..e0ab0a1a33c7 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"			/* For rtl.h: needs enum reg_class.  */
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "flags.h"
 #include "tree.h"
@@ -51,7 +50,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "varasm.h"
 #include "trans-mem.h"
 #include "langhooks.h"
-#include "input.h"
 #include "cpplib.h"
 #include "timevar.h"
 #include "c-family/c-pragma.h"
@@ -61,7 +59,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "target.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 636e0bbc9ae6..aeb104363bfc 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "symtab.h"
-#include "input.h"
 #include "alias.h"
 #include "tree.h"
 #include "fold-const.h"
@@ -46,7 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "gimple-expr.h"
 #include "gimplify.h"
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index c64daf90adb0..45aa68d4974e 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "recog.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index 3da5212e512c..d632881f4b4b 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -38,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "flags.h"
 #include "insn-config.h"
diff --git a/gcc/ccmp.c b/gcc/ccmp.c
index 375fe9d105e0..32ae8ac75d05 100644
--- a/gcc/ccmp.c
+++ b/gcc/ccmp.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "rtl.h"
 #include "tm_p.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -53,7 +52,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "tree-ssanames.h"
diff --git a/gcc/cfg.c b/gcc/cfg.c
index 9ca8987e0763..72f711c39176 100644
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -51,7 +51,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "obstack.h"
 #include "alloc-pool.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -59,7 +58,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index 10e699e26471..a99fd73a79e1 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 806dcec7b486..43c0b3a125d3 100644
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 59071ca13456..dfd1315548fc 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index b23e325c39df..06755d5491c8 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "rtl.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -59,7 +58,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index a8a41992a1b0..c649b7e8fd28 100644
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -23,14 +23,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "dumpfile.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "rtl.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index 20b81b3841aa..0d9519d061f1 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
@@ -39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index c73ad7f6254a..062034276367 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "sbitmap.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "cfgloopmanip.h"
 
diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index 62fbd76a3cbf..ac9c9ae50992 100644
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "obstack.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c
index 8b075343bb54..b5c13a791275 100644
--- a/gcc/cfgloopmanip.c
+++ b/gcc/cfgloopmanip.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -37,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 31787a9395cf..20e3fc7c8749 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -41,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 95907fb51241..e530568a5368 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -45,7 +44,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "dominance.h"
 #include "cfg.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index 5282bdc3bc86..6726a348e9b0 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -22,14 +22,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -38,7 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index 9d951edc80c2..baf347a6d45f 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -69,14 +69,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "stringpool.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "emit-rtl.h"
 #include "predict.h"
@@ -85,7 +83,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "bitmap.h"
 #include "tree-cfg.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 3aadf28dd314..066a155709d3 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -161,7 +161,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -173,7 +172,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "dominance.h"
@@ -183,7 +181,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/cilk-common.c b/gcc/cilk-common.c
index 594ab5c5783d..d62f5a75910f 100644
--- a/gcc/cilk-common.c
+++ b/gcc/cilk-common.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index ff45da99514a..a39ac8d8b55c 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -49,7 +49,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "flags.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "alias.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index bce843031f4d..171e51dc4c78 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -80,7 +80,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -117,7 +116,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "df.h"
 #include "valtrack.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/common/common-target.h b/gcc/common/common-target.h
index 66cba2cdf2dc..e9b60f36e1e7 100644
--- a/gcc/common/common-target.h
+++ b/gcc/common/common-target.h
@@ -22,7 +22,6 @@
 #ifndef GCC_COMMON_TARGET_H
 #define GCC_COMMON_TARGET_H
 
-#include "input.h"
 
 /* Sets of optimization levels at which an option may be enabled by
    default_options_optimization.  */
diff --git a/gcc/common/common-targhooks.c b/gcc/common/common-targhooks.c
index 22029ace560b..2b5c4c3e1657 100644
--- a/gcc/common/common-targhooks.c
+++ b/gcc/common/common-targhooks.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 "input.h"
 #include "tm.h"
 #include "common/common-target.h"
 #include "common/common-targhooks.h"
diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c
index 1d1a16596773..c4aa810ac556 100644
--- a/gcc/compare-elim.c
+++ b/gcc/compare-elim.c
@@ -65,7 +65,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index f7a39ec2ea66..ec60955c6af3 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -23,7 +23,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -62,7 +61,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index a79bb6a96572..17bae0870c3b 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -25,7 +25,6 @@
 #include "insn-codes.h"
 #include "rtl.h"
 #include "insn-attr.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -70,7 +69,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "optabs.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 4536aba9db60..122f5861b438 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -73,7 +72,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "tree-pass.h"
 #include "context.h"
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index 12a3448d4d5b..d09520fccb7d 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/arm/aarch-common.c b/gcc/config/arm/aarch-common.c
index cde6485813a3..41ea22dae9b5 100644
--- a/gcc/config/arm/aarch-common.c
+++ b/gcc/config/arm/aarch-common.c
@@ -27,7 +27,6 @@
 #include "tm.h"
 #include "tm_p.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c
index 1ceb89824090..f960e0ab4443 100644
--- a/gcc/config/arm/arm-builtins.c
+++ b/gcc/config/arm/arm-builtins.c
@@ -22,7 +22,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
index f02dfb475604..6aa59ad5bf5f 100644
--- a/gcc/config/arm/arm-c.c
+++ b/gcc/config/arm/arm-c.c
@@ -21,7 +21,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "tm_p.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index f5050cbf640c..d794fc0eb808 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -25,7 +25,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -63,7 +62,6 @@
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/avr/avr-c.c b/gcc/config/avr/avr-c.c
index 4836a9653948..efe690ca2fd4 100644
--- a/gcc/config/avr/avr-c.c
+++ b/gcc/config/avr/avr-c.c
@@ -25,7 +25,6 @@
 #include "tm.h"
 #include "tm_p.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/avr/avr-log.c b/gcc/config/avr/avr-log.c
index 1bf8e8c3d5b4..8d53db998bee 100644
--- a/gcc/config/avr/avr-log.c
+++ b/gcc/config/avr/avr-log.c
@@ -23,13 +23,11 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "print-tree.h"
 #include "output.h"
-#include "input.h"
 #include "hard-reg-set.h"
 #include "function.h"
 #include "tm_p.h"
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index ef65d222420a..f291cf97c126 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -31,7 +31,6 @@
 #include "insn-codes.h"
 #include "flags.h"
 #include "reload.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index dc24ed5e9981..3b4b54e57e85 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -31,7 +31,6 @@
 #include "insn-flags.h"
 #include "output.h"
 #include "insn-attr.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -61,7 +60,6 @@
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index ef449e4d9248..7088e454e85b 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -24,7 +24,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -66,7 +65,6 @@
 #include "tm-constrs.h"
 #include "df.h"
 #include "diagnostic-core.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index 0112179b310a..00250f6c2bf2 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -23,7 +23,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 5f44a9655812..ecddc8e344d9 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "conditions.h"
 #include "insn-attr.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -67,7 +66,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "df.h"
 #include "opts.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index a33f594aad0b..455689547e99 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -48,10 +47,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 839fbc8b11ed..3627ba6c2faa 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "output.h"
 #include "insn-attr.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -70,7 +69,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "plugin-api.h"
diff --git a/gcc/config/default-c.c b/gcc/config/default-c.c
index 6eaa8e4294c1..b71826b02197 100644
--- a/gcc/config/default-c.c
+++ b/gcc/config/default-c.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "c-family/c-target.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
index ffd687c211bb..60000bf3ea85 100644
--- a/gcc/config/epiphany/epiphany.c
+++ b/gcc/config/epiphany/epiphany.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/epiphany/mode-switch-use.c b/gcc/config/epiphany/mode-switch-use.c
index 410446402b53..86963fdec1f0 100644
--- a/gcc/config/epiphany/mode-switch-use.c
+++ b/gcc/config/epiphany/mode-switch-use.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "rtl.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "emit-rtl.h"
 #include "tree-pass.h"
diff --git a/gcc/config/epiphany/resolve-sw-modes.c b/gcc/config/epiphany/resolve-sw-modes.c
index c61e6bd74abf..f3376e9e3a24 100644
--- a/gcc/config/epiphany/resolve-sw-modes.c
+++ b/gcc/config/epiphany/resolve-sw-modes.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "sbitmap.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index 2ce966078a75..3bb53f02ea3e 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -32,7 +32,6 @@
 #include "insn-attr.h"
 #include "flags.h"
 #include "recog.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 667c08d7ec80..46569adedc75 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/ft32/ft32.c b/gcc/config/ft32/ft32.c
index ff844d374b59..bc18c23fd839 100644
--- a/gcc/config/ft32/ft32.c
+++ b/gcc/config/ft32/ft32.c
@@ -35,7 +35,6 @@
 #include "reload.h"
 #include "diagnostic-core.h"
 #include "obstack.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/glibc-c.c b/gcc/config/glibc-c.c
index 9ac15018b67a..3ba2aaf69060 100644
--- a/gcc/config/glibc-c.c
+++ b/gcc/config/glibc-c.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "c-family/c-target.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index b517f4800406..8a8ff53c05c1 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/i386/i386-c.c b/gcc/config/i386/i386-c.c
index 68fdfe0afcfe..0228f4bf2327 100644
--- a/gcc/config/i386/i386-c.c
+++ b/gcc/config/i386/i386-c.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 1d2784d40a00..44a8624725fb 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -67,7 +66,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "common/common-target.h"
 #include "langhooks.h"
 #include "reload.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/i386/msformat-c.c b/gcc/config/i386/msformat-c.c
index 9d0553762c98..9319d0497bbf 100644
--- a/gcc/config/i386/msformat-c.c
+++ b/gcc/config/i386/msformat-c.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/i386/winnt-cxx.c b/gcc/config/i386/winnt-cxx.c
index 6afdcb9964e8..dcb2e0b96195 100644
--- a/gcc/config/i386/winnt-cxx.c
+++ b/gcc/config/i386/winnt-cxx.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/i386/winnt-stubs.c b/gcc/config/i386/winnt-stubs.c
index 203d84c1e97b..3bdc9d6d0bcc 100644
--- a/gcc/config/i386/winnt-stubs.c
+++ b/gcc/config/i386/winnt-stubs.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "output.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 88859db95d5f..1fd90f51c1cf 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "output.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -40,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "except.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -55,7 +53,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/config/ia64/ia64-c.c b/gcc/config/ia64/ia64-c.c
index 35e459ee38c6..1265793cafd2 100644
--- a/gcc/config/ia64/ia64-c.c
+++ b/gcc/config/ia64/ia64-c.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 459edd7a5853..1cee14b5da31 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -74,7 +73,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "intl.h"
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index cf37f802c5eb..518a6da23c1e 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c
index 92eaa36d0c31..ba4782c74a53 100644
--- a/gcc/config/lm32/lm32.c
+++ b/gcc/config/lm32/lm32.c
@@ -27,7 +27,6 @@
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/config/m32c/m32c-pragma.c b/gcc/config/m32c/m32c-pragma.c
index 93bf150c445e..90470144efb6 100644
--- a/gcc/config/m32c/m32c-pragma.c
+++ b/gcc/config/m32c/m32c-pragma.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index a4c47bf3c15a..10e53e4563f1 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -35,7 +35,6 @@
 #include "reload.h"
 #include "diagnostic-core.h"
 #include "obstack.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -71,7 +70,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "df.h"
 #include "tm-constrs.h"
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 80828744ffe5..bf88ef263329 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -21,7 +21,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index c0fb325fb346..3d814491710f 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index 412ef050393d..937090217dd6 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -22,7 +22,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/mep/mep-pragma.c b/gcc/config/mep/mep-pragma.c
index b32cc8a0c924..de66e7ec3a37 100644
--- a/gcc/config/mep/mep-pragma.c
+++ b/gcc/config/mep/mep-pragma.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -32,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "output.h" /* for decode_reg_name */
 #include "mep-protos.h"
-#include "input.h"
 #include "function.h"
 #define MAX_RECOG_OPERANDS 10
 #include "reload.h"
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 23d02bb9e2d8..5f710e241059 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -73,7 +72,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "opts.h"
diff --git a/gcc/config/microblaze/microblaze-c.c b/gcc/config/microblaze/microblaze-c.c
index f5ae551de625..a540331fb832 100644
--- a/gcc/config/microblaze/microblaze-c.c
+++ b/gcc/config/microblaze/microblaze-c.c
@@ -24,7 +24,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 9c0d303ece69..5ded8bc7131a 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -31,7 +31,6 @@
 #include "insn-flags.h"
 #include "insn-attr.h"
 #include "recog.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -65,7 +64,6 @@
 #include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 76484e280bfb..d427c0c0b073 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "insn-attr.h"
 #include "recog.h"
 #include "output.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -76,7 +75,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "bitmap.h"
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index b76529a08a57..28b4a3e25430 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "insn-config.h"
 #include "output.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 0d46b7e099c2..1e6c28fbd01e 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -23,7 +23,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c
index 7402db337ea9..4b8e2c3db747 100644
--- a/gcc/config/moxie/moxie.c
+++ b/gcc/config/moxie/moxie.c
@@ -35,7 +35,6 @@
 #include "reload.h"
 #include "diagnostic-core.h"
 #include "obstack.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/msp430/msp430-c.c b/gcc/config/msp430/msp430-c.c
index 8f87ff6798da..e4f7cdaaac1f 100644
--- a/gcc/config/msp430/msp430-c.c
+++ b/gcc/config/msp430/msp430-c.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index e1c0c96c646b..b76fe9365eef 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-cost.c b/gcc/config/nds32/nds32-cost.c
index f283f198f9fc..d9bb30762196 100644
--- a/gcc/config/nds32/nds32-cost.c
+++ b/gcc/config/nds32/nds32-cost.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-fp-as-gp.c b/gcc/config/nds32/nds32-fp-as-gp.c
index f3304edbf558..ae146703059e 100644
--- a/gcc/config/nds32/nds32-fp-as-gp.c
+++ b/gcc/config/nds32/nds32-fp-as-gp.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-intrinsic.c b/gcc/config/nds32/nds32-intrinsic.c
index 6668a40ebda7..7b443b9f8e93 100644
--- a/gcc/config/nds32/nds32-intrinsic.c
+++ b/gcc/config/nds32/nds32-intrinsic.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-isr.c b/gcc/config/nds32/nds32-isr.c
index 8b4c0720348f..2611fcc249e7 100644
--- a/gcc/config/nds32/nds32-isr.c
+++ b/gcc/config/nds32/nds32-isr.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-md-auxiliary.c b/gcc/config/nds32/nds32-md-auxiliary.c
index f231563cbcec..fbad1e0a9115 100644
--- a/gcc/config/nds32/nds32-md-auxiliary.c
+++ b/gcc/config/nds32/nds32-md-auxiliary.c
@@ -25,7 +25,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-memory-manipulation.c b/gcc/config/nds32/nds32-memory-manipulation.c
index 27438bc711d8..aea63d3d3e7b 100644
--- a/gcc/config/nds32/nds32-memory-manipulation.c
+++ b/gcc/config/nds32/nds32-memory-manipulation.c
@@ -25,7 +25,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-pipelines-auxiliary.c b/gcc/config/nds32/nds32-pipelines-auxiliary.c
index e6f07ff8fecd..eafebd0c3499 100644
--- a/gcc/config/nds32/nds32-pipelines-auxiliary.c
+++ b/gcc/config/nds32/nds32-pipelines-auxiliary.c
@@ -25,7 +25,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32-predicates.c b/gcc/config/nds32/nds32-predicates.c
index 06821647bdfe..61d5cf7b4ffc 100644
--- a/gcc/config/nds32/nds32-predicates.c
+++ b/gcc/config/nds32/nds32-predicates.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 18c7adf1e6f8..8623983d099f 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 2987862f70d6..608a4c3786ca 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -25,7 +25,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index 964c3cd4638a..98e7422520ff 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -24,7 +24,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 6c7c3f69223f..276848628fd1 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "conditions.h"
 #include "insn-attr.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index fbf24f666dbc..60d06350407a 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -27,7 +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 "input.h"
 #include "function.h"
 #include "output.h"
 #include "insn-attr.h"
diff --git a/gcc/config/rl78/rl78-c.c b/gcc/config/rl78/rl78-c.c
index cfce5a49b2a6..1298fab15b70 100644
--- a/gcc/config/rl78/rl78-c.c
+++ b/gcc/config/rl78/rl78-c.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index 49bca043f413..33f4e64cb104 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index f0413acdd772..cf1b91f9e970 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -25,7 +25,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index ed2da593d56f..56acc86578cf 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -31,7 +31,6 @@
 #include "flags.h"
 #include "recog.h"
 #include "obstack.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -77,7 +76,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index f4f68081ba68..cf9a3c15dac9 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -26,7 +26,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -71,7 +70,6 @@
 #include "target-def.h"
 #include "langhooks.h"
 #include "opts.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index 75fde807f373..a7e08c1c88b7 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -32,7 +32,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 2469e2be19f7..9807e64376c9 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -74,7 +73,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "df.h"
diff --git a/gcc/config/sh/sh-c.c b/gcc/config/sh/sh-c.c
index 8b7c4c702bfb..4aada59a95a6 100644
--- a/gcc/config/sh/sh-c.c
+++ b/gcc/config/sh/sh-c.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/sh/sh-mem.cc b/gcc/config/sh/sh-mem.cc
index 5d5b2d98e94c..f76a71013e93 100644
--- a/gcc/config/sh/sh-mem.cc
+++ b/gcc/config/sh/sh-mem.cc
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 8fc819764fa1..e5fcd7683ef7 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "insn-config.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -77,7 +76,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "cfgloop.h"
diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index a546ef98eb61..60c872f086d7 100644
--- a/gcc/config/sh/sh_optimize_sett_clrt.cc
+++ b/gcc/config/sh/sh_optimize_sett_clrt.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index 90e0023e301c..9be01dec91fa 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c
index 06ed2f41f07f..4dbcebc8adb4 100644
--- a/gcc/config/sol2-c.c
+++ b/gcc/config/sol2-c.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/sol2-cxx.c b/gcc/config/sol2-cxx.c
index 0274324dbbb7..658e56fd1aa8 100644
--- a/gcc/config/sol2-cxx.c
+++ b/gcc/config/sol2-cxx.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/sol2-stubs.c b/gcc/config/sol2-stubs.c
index d037722c446d..efdd6ae20062 100644
--- a/gcc/config/sol2-stubs.c
+++ b/gcc/config/sol2-stubs.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/sol2.c b/gcc/config/sol2.c
index 9eb889aebb6f..21147d6573d9 100644
--- a/gcc/config/sol2.c
+++ b/gcc/config/sol2.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/sparc/sparc-c.c b/gcc/config/sparc/sparc-c.c
index 67e28c130b9d..b19d48f8201b 100644
--- a/gcc/config/sparc/sparc-c.c
+++ b/gcc/config/sparc/sparc-c.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 5d7d5f9e1b2e..995a76976386 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -72,7 +71,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "langhooks.h"
diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index 6b4f40647a70..3c683746cfbd 100644
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -19,7 +19,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 00472d004852..8f02ef85de5e 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -27,7 +27,6 @@
 #include "flags.h"
 #include "recog.h"
 #include "obstack.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -69,7 +68,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "tm-constrs.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index beb5a1339ee8..d6247a04d611 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -34,7 +34,6 @@
 #include "recog.h"
 #include "diagnostic-core.h"
 #include "obstack.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -71,7 +70,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "df.h"
diff --git a/gcc/config/tilegx/mul-tables.c b/gcc/config/tilegx/mul-tables.c
index 86a5c4cdd34f..bf9294df10b0 100644
--- a/gcc/config/tilegx/mul-tables.c
+++ b/gcc/config/tilegx/mul-tables.c
@@ -27,7 +27,6 @@
 #include "symtab.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/config/tilegx/tilegx-c.c b/gcc/config/tilegx/tilegx-c.c
index 696332136792..b38bcd2f4b25 100644
--- a/gcc/config/tilegx/tilegx-c.c
+++ b/gcc/config/tilegx/tilegx-c.c
@@ -24,7 +24,6 @@
 #include "tm.h"
 #include "tm_p.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index ab250eb23c21..b77891911207 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -29,7 +29,6 @@
 #include "insn-attr.h"
 #include "recog.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "alias.h"
@@ -68,7 +67,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "stringpool.h"
 #include "stor-layout.h"
diff --git a/gcc/config/tilepro/mul-tables.c b/gcc/config/tilepro/mul-tables.c
index 21ac465df501..49821861ca4e 100644
--- a/gcc/config/tilepro/mul-tables.c
+++ b/gcc/config/tilepro/mul-tables.c
@@ -27,7 +27,6 @@
 #include "symtab.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/config/tilepro/tilepro-c.c b/gcc/config/tilepro/tilepro-c.c
index f5f8bcdfd71e..dd5f97f445b7 100644
--- a/gcc/config/tilepro/tilepro-c.c
+++ b/gcc/config/tilepro/tilepro-c.c
@@ -24,7 +24,6 @@
 #include "tm.h"
 #include "tm_p.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c
index 72a65e5f7f5a..e1b5acd249ee 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -29,7 +29,6 @@
 #include "insn-attr.h"
 #include "recog.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "alias.h"
@@ -69,7 +68,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "stringpool.h"
 #include "stor-layout.h"
diff --git a/gcc/config/v850/v850-c.c b/gcc/config/v850/v850-c.c
index 25fcf3bcf974..6191d7b9aab7 100644
--- a/gcc/config/v850/v850-c.c
+++ b/gcc/config/v850/v850-c.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 7156721594f7..490c19c420e1 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 5038de9a974c..811d058744fb 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "basic-block.h"
 #include "df.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c
index 55f24862a3b3..341666c04ed1 100644
--- a/gcc/config/visium/visium.c
+++ b/gcc/config/visium/visium.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "flags.h"
 #include "symtab.h"
diff --git a/gcc/config/vms/vms-c.c b/gcc/config/vms/vms-c.c
index 6e9ae83b7465..97ac89265c3c 100644
--- a/gcc/config/vms/vms-c.c
+++ b/gcc/config/vms/vms-c.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/vms/vms.c b/gcc/config/vms/vms.c
index cdad95f9e6bd..5570125675f9 100644
--- a/gcc/config/vms/vms.c
+++ b/gcc/config/vms/vms.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/config/vxworks.c b/gcc/config/vxworks.c
index db4cb1412d86..c24c1126ed19 100644
--- a/gcc/config/vxworks.c
+++ b/gcc/config/vxworks.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic-core.h"
 #include "output.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/config/winnt-c.c b/gcc/config/winnt-c.c
index 19941d48f3db..f0dbaa2df7a6 100644
--- a/gcc/config/winnt-c.c
+++ b/gcc/config/winnt-c.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "c-family/c-target.h"
-#include "input.h"
 #include "alias.h"
 #include "options.h"
 #include "symtab.h"
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index d8c5b41b9090..5396bd575796 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -71,7 +70,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "df.h"
diff --git a/gcc/convert.c b/gcc/convert.c
index d45635125d09..c3cb0ae29aaa 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index 9bb541db4167..110d5b64a82c 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -309,6 +309,8 @@ typedef unsigned char uchar;
 #include "fixed-value.h"
 #include "hash-table.h"
 #include "hash-set.h"
+#include "input.h"
+#include "is-a.h"
 #endif /* GENERATOR_FILE && !USED_FOR_TARGET */
 
 #endif /* coretypes.h */
diff --git a/gcc/coverage.c b/gcc/coverage.c
index e6566097a904..40d788f368cf 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -62,7 +61,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "context.h"
 #include "pass_manager.h"
 #include "tree-pass.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 88f33d7b84c8..cfa392b1a5c1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,41 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* call.c: Do not include input.h, line-map.h or is-a.h.
+	* class.c: Likewise.
+	* constexpr.c: Likewise.
+	* cp-array-notation.c: Likewise.
+	* cp-gimplify.c: Likewise.
+	* cp-lang.c: Likewise.
+	* cp-objcp-common.c: Likewise.
+	* cp-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-16  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/59682
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 2f0c53a73917..d4da80a4ad82 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -43,10 +42,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "c-family/c-objc.h"
 #include "timevar.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 5b9bba871ec7..9da532e18dd4 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -38,10 +37,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "target.h"
 #include "convert.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 5dc59a47a88a..a52c96ff6b41 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index a3656d3f6a3c..3b8610fba974 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -53,7 +53,6 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 05a009138cf3..1a627db1db21 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -33,13 +32,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-iterator.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "flags.h"
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 6eb7741f8965..3645a06c9b54 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index 13e2e22ca91a..cb17daf831ce 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 303a432760a0..37128be1600d 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 
 /* In order for the format checking to accept the C++ front end
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index ac9e38c76f7f..1ae897b2d7db 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -39,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "builtins.h"
 #include "fold-const.h"
 #include "stringpool.h"
-#include "is-a.h"
 #include "predict.h"
 #include "tree-ssa-alias.h"
 #include "basic-block.h"
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 9f93c681bd13..d29c64b4c4e4 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index ffd068aadebe..3cb9ca199226 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -60,10 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "timevar.h"
 #include "splay-tree.h"
 #include "plugin.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index ce7ab52c28b3..8e0eae3745d0 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -48,10 +47,8 @@ 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 "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index 465fadc7af4c..2382e27b4289 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 32877864fb95..bb5106cacb66 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 894cc28188cc..c5d80d9ce036 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 5d900396d81c..4270fffe5097 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 4f7e8086bd63..96655f327f1a 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index aa964b9e8e3a..fc30fef6dede 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index c423830a4bbf..0ac96afef31a 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -24,17 +24,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
 #include "tree.h"
 #include "stringpool.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index e04600b1f750..9bbdba5a7ec1 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -25,8 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index d1bb765108a4..69ecb674bc34 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -60,10 +59,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "obstack.h"
 #include "flags.h"
 #include "target.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index e27945887da9..79e4bbc06304 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -38,10 +37,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "common/common-target.h"
 #include "diagnostic.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index cafc31f59272..cc116988637c 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index cc5450811b8b..2440d5f4150c 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -22,13 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cp-tree.h"
-#include "input.h"
 #include "params.h"
 #include "target.h"
 #include "debug.h"
@@ -38,7 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic-core.h"
 #include "dumpfile.h"
 #include "tree-iterator.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index b8218714f6dd..9a1cbd814c05 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "timevar.h"
 #include "cpplib.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -39,10 +38,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "diagnostic-core.h"
 #include "target.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 9236311329db..6a73a2eef369 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index 91438ac4c17f..9e0073a0a191 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 850b256786ef..62c35f90ddc1 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -28,13 +28,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cp-tree.h"
-#include "input.h"
 #include "obstack.h"
 #include "toplev.h"
 #include "diagnostic-core.h"
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 5acef1b949bb..baa11879301e 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 26d58e8c8b43..53b038e5cf4a 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index a1519b9e608b..9b5f050dfa4e 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -44,10 +43,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "timevar.h"
 #include "diagnostic.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index e6442cd9a458..a9c9214132a3 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -36,10 +35,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "debug.h"
 #include "convert.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 7716c2154250..c33ffd57a0bf 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 709875c71e14..6c3aa4ca033a 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index dfd8af8d7e0d..9f06a30229d8 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -115,11 +115,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "cp-tree.h"
 #include "output.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c
index 21661265be34..9a366c22b92f 100644
--- a/gcc/cppbuiltin.c
+++ b/gcc/cppbuiltin.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cprop.c b/gcc/cprop.c
index 6d83e225a0c4..259686892859 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic-core.h"
 #include "toplev.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/cse.c b/gcc/cse.c
index 6af1cf338c75..100c9c83e769 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "regs.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/cselib.c b/gcc/cselib.c
index 7ccaab4b811f..6336e6bdc3e1 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"/* FIXME: For hashing DEBUG_EXPR & friends.  */
@@ -32,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "insn-config.h"
 #include "recog.h"
-#include "input.h"
 #include "function.h"
 #include "emit-rtl.h"
 #include "diagnostic-core.h"
diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index c8f6dcbfff77..fc48787814d4 100644
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -33,13 +32,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index 82c92e3e20d6..5d7a3b171102 100644
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -32,13 +31,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/data-streamer.c b/gcc/data-streamer.c
index 7061dd6a8bda..1c98baa4b36f 100644
--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -31,13 +30,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index a13d29db878b..469ff35801b9 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -70,7 +70,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -101,7 +100,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "emit-rtl.h"
 #include "stmt.h"
 #include "expr.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/dce.c b/gcc/dce.c
index d20906d048f0..0f7d35e7182f 100644
--- a/gcc/dce.c
+++ b/gcc/dce.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/ddg.c b/gcc/ddg.c
index eb889222a263..ca7ebe20499d 100644
--- a/gcc/ddg.c
+++ b/gcc/ddg.c
@@ -28,7 +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 "input.h"
 #include "function.h"
 #include "flags.h"
 #include "insn-config.h"
diff --git a/gcc/debug.c b/gcc/debug.c
index ab92cc870cb4..d72dd460c65a 100644
--- a/gcc/debug.c
+++ b/gcc/debug.c
@@ -19,7 +19,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/df-core.c b/gcc/df-core.c
index 702a112d0b32..e2fd9d21588b 100644
--- a/gcc/df-core.c
+++ b/gcc/df-core.c
@@ -383,7 +383,6 @@ are write-only operations.
 #include "insn-config.h"
 #include "recog.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "regs.h"
 #include "alloc-pool.h"
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index 10dc40185143..a34578157ae1 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "insn-config.h"
 #include "recog.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "regs.h"
 #include "alloc-pool.h"
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index 91f6aca84060..07e6ad5de51b 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -29,11 +29,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "insn-config.h"
 #include "recog.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "regs.h"
 #include "alloc-pool.h"
diff --git a/gcc/df.h b/gcc/df.h
index 32954021edec..7023c9a98e6a 100644
--- a/gcc/df.h
+++ b/gcc/df.h
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "alloc-pool.h"
 #include "timevar.h"
diff --git a/gcc/dfp.c b/gcc/dfp.c
index 6c8a6c7f2a17..7c9a86f81a72 100644
--- a/gcc/dfp.c
+++ b/gcc/dfp.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/diagnostic-core.h b/gcc/diagnostic-core.h
index 09a6867c28a0..66d2e42eb345 100644
--- a/gcc/diagnostic-core.h
+++ b/gcc/diagnostic-core.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DIAGNOSTIC_CORE_H
 #define GCC_DIAGNOSTIC_CORE_H
 
-#include "input.h"
 #include "bversion.h"
 
 /* Constants used to discriminate diagnostics.  */
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 8b70a16ad098..fb9d1fbfd1ba 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "version.h"
 #include "demangle.h"
-#include "input.h"
 #include "intl.h"
 #include "backtrace.h"
 #include "diagnostic.h"
diff --git a/gcc/dojump.c b/gcc/dojump.c
index 196d106630b9..b062a569cf59 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/dominance.c b/gcc/dominance.c
index 23f107c94cc3..b39cd7992254 100644
--- a/gcc/dominance.c
+++ b/gcc/dominance.c
@@ -40,7 +40,6 @@
 #include "hard-reg-set.h"
 #include "obstack.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/domwalk.c b/gcc/domwalk.c
index a600db374153..65113533d336 100644
--- a/gcc/domwalk.c
+++ b/gcc/domwalk.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/double-int.c b/gcc/double-int.c
index a7d29a0b8a35..7ffcac25a75c 100644
--- a/gcc/double-int.c
+++ b/gcc/double-int.c
@@ -21,7 +21,6 @@ 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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/dse.c b/gcc/dse.c
index d7d4ba6afbfd..508ec006fc38 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -66,7 +65,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "rtl-iter.h"
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index faba9d355c5d..d5f601f139de 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "diagnostic-core.h"
 #include "dumpfile.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/dumpfile.h b/gcc/dumpfile.h
index 40b6473732cb..a3334f64b88f 100644
--- a/gcc/dumpfile.h
+++ b/gcc/dumpfile.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_DUMPFILE_H
 #define GCC_DUMPFILE_H 1
 
-#include "line-map.h"
 
 /* Different tree dump places.  When you add new tree dump places,
    extend the DUMP_FILES array in dumpfile.c.  */
diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index 6b2625f2dc88..7cd997a8948f 100644
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 1c91d975e6ef..4af2b9939275 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "version.h"
 #include "flags.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 4fe33f8a8b99..360f67f151cc 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -60,7 +60,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -97,7 +96,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "common/common-target.h"
 #include "langhooks.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index e64ca4ceb4c2..bab02fe76c58 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -37,7 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "diagnostic-core.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/et-forest.c b/gcc/et-forest.c
index 57c99164bc54..a3f60d33823c 100644
--- a/gcc/et-forest.c
+++ b/gcc/et-forest.c
@@ -34,7 +34,6 @@ License along with libiberty; see the file COPYING3.  If not see
 #ifdef DEBUG_ET
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #endif
diff --git a/gcc/except.c b/gcc/except.c
index 11d95a411d70..cb830885b94e 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -114,7 +114,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -152,7 +151,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfg.h"
 #include "cfgrtl.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/explow.c b/gcc/explow.c
index bcd9f72a1947..adc17a31a3a9 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "diagnostic-core.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 70123bfa5c41..3f7490899cbc 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "diagnostic-core.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index 26b54a835662..4eb1ab32c2f7 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -64,7 +63,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "plugin-api.h"
diff --git a/gcc/final.c b/gcc/final.c
index 6134d1b2b492..399c2554ae08 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -46,7 +46,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -83,7 +82,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "stmt.h"
 #include "expr.h"
 #include "tree-pass.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/fixed-value.c b/gcc/fixed-value.c
index 6c15ede9d74e..151b6a10ba14 100644
--- a/gcc/fixed-value.c
+++ b/gcc/fixed-value.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index dffd935a7b0e..e61d94634627 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -45,7 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -77,7 +76,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "tree-dfa.h"
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5ede14dbc34c..ee6b190c9c57 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,27 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* convert.c: Do not include input.h, line-map.h or is-a.h.
+	* cpp.c: Likewise.
+	* decl.c: Likewise.
+	* f95-lang.c: Likewise.
+	* gfortran.h: Likewise.
+	* iresolve.c: Likewise.
+	* match.c: Likewise.
+	* module.c: Likewise.
+	* options.c: Likewise.
+	* target-memory.c: Likewise.
+	* trans-array.c: Likewise.
+	* trans-common.c: Likewise.
+	* trans-const.c: Likewise.
+	* trans-decl.c: Likewise.
+	* trans-expr.c: Likewise.
+	* trans-intrinsic.c: Likewise.
+	* trans-io.c: Likewise.
+	* trans-openmp.c: Likewise.
+	* trans-stmt.c: Likewise.
+	* trans-types.c: Likewise.
+	* trans.c: Likewise.
+
 2015-06-15  Andre Vehreschild  <vehre@gmx.de>
 
 	PR fortran/44672
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index ff2fc3d6dcc7..dfef05b8d7f3 100644
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index 9e98d25057b1..363763f09622 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 9850757859a8..dfac81c08d96 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "parse.h"
 #include "flags.h"
 #include "constructor.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 2c055f59d3d9..725cf195f588 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "gfortran.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -39,14 +38,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "timevar.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "toplev.h"
 #include "target.h"
 #include "debug.h"
 #include "diagnostic.h" /* For errorcount/warningcount */
 #include "dumpfile.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 4b07ddb13f40..53da7d65d2b9 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -50,7 +50,6 @@ not after.
 
 
 #include "intl.h"
-#include "input.h"
 #include "splay-tree.h"
 
 /* Major control parameters.  */
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index 784bbe5d3588..9dab49e5f486 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 4394d7b6b930..e7fe8318164f 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 15ee0935c03a..8bcc091a2514 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -73,7 +73,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "parse.h" /* FIXME */
 #include "constructor.h"
 #include "cpp.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 0b53ea985baf..9c30cf3a9e52 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index 25d81061ab8c..ddb6b4f38971 100644
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index e9174aebd1e1..fece3abd2ef1 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -79,7 +79,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "gfortran.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c
index add37b6fd277..572fcb23f592 100644
--- a/gcc/fortran/trans-common.c
+++ b/gcc/fortran/trans-common.c
@@ -97,7 +97,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 6b855d32d4e4..5673b9833585 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "gfortran.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index b9c16fb58a7a..1eed32d21056 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "gfortran.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -40,10 +39,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"	/* For announce_function.  */
 #include "target.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 77d2cda02881..5d6555bc84c0 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "gfortran.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index d27732fedafa..11554818e7af 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"		/* For UNITS_PER_WORD.  */
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index 02bb0f2824cd..db0f6d941a24 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 3d82447f5004..ca7e2503c400 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 6772a3cf8093..a6ab07a82043 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 657afeb10083..db628a5dc846 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -33,7 +33,6 @@ 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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index e07c6d84d586..9e85b37232b7 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "gfortran.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/function.c b/gcc/function.c
index 8baaed745402..ac0458a6cc8f 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl-error.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index 75b7d5469e63..b62ad3f2029e 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "obstack.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index bad508e0931e..1eb0e5b8984d 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
@@ -39,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "lcm.h"
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "alias.h"
diff --git a/gcc/gcse.c b/gcc/gcse.c
index e4b8a2fd24c7..f1d3af9d03cc 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -140,7 +140,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 #include "hard-reg-set.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/generic-match-head.c b/gcc/generic-match-head.c
index e2fdf3c9ba4b..ea4a29610545 100644
--- a/gcc/generic-match-head.c
+++ b/gcc/generic-match-head.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -37,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "tree-ssanames.h"
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index f5f09733833b..d46bc42753ea 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -32,10 +31,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "ggc-internal.h"
 #include "timevar.h"
 #include "params.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/gimple-builder.c b/gcc/gimple-builder.c
index 0cf5ea0b375b..f2be20ce4368 100644
--- a/gcc/gimple-builder.c
+++ b/gcc/gimple-builder.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,13 +29,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "tree-ssanames.h"
 
diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index 7bbbe1797551..5f05d9361f04 100644
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -23,21 +23,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "stringpool.h"
 #include "gimplify.h"
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 7c17fde94c87..28dafd43510c 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -51,7 +50,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index 84d7f5e15595..b51c3c93be52 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -22,14 +22,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -38,7 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index ac2a0df0a4a1..bd858ce8cb3b 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -31,13 +30,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "calls.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-iterator.h"
diff --git a/gcc/gimple-match-head.c b/gcc/gimple-match-head.c
index 8fbb4897c245..86ba78bab80d 100644
--- a/gcc/gimple-match-head.c
+++ b/gcc/gimple-match-head.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -37,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "tree-ssanames.h"
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index 5fa4a0ab66d1..a006fa924fda 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -34,14 +33,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/gimple-ssa-isolate-paths.c b/gcc/gimple-ssa-isolate-paths.c
index a4626be9cac3..2633736bb2b4 100644
--- a/gcc/gimple-ssa-isolate-paths.c
+++ b/gcc/gimple-ssa-isolate-paths.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -32,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -40,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index e5e9b6de8c52..81ba14b70138 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -52,7 +51,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index b2c1433e5fd3..f1ec3de2b6ae 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -32,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -41,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c
index 1b2a5af6d604..6732bc1c78c2 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -31,14 +30,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/gimple-streamer.h b/gcc/gimple-streamer.h
index b4e52f444ba5..63a6a3c5d345 100644
--- a/gcc/gimple-streamer.h
+++ b/gcc/gimple-streamer.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "lto-streamer.h"
 
diff --git a/gcc/gimple-walk.c b/gcc/gimple-walk.c
index b416ac82dd7d..05ea179e09ff 100644
--- a/gcc/gimple-walk.c
+++ b/gcc/gimple-walk.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -31,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "function.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "tree-ssa-alias.h"
 #include "basic-block.h"
 #include "fold-const.h"
diff --git a/gcc/gimple.c b/gcc/gimple.c
index bc6522379e5c..20cd840f08c3 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "target.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -34,7 +33,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "stor-layout.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -43,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/gimplify-me.c b/gcc/gimplify-me.c
index 44b59a54599d..caad2fc6954b 100644
--- a/gcc/gimplify-me.c
+++ b/gcc/gimplify-me.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -35,14 +34,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 39911a142c77..7492d9338682 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -50,7 +49,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 91c281533c7a..44c33e032be6 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* go-backend.c: Do not include input.h, line-map.h or is-a.h.
+	* go-gcc.cc: Likewise.
+	* go-lang.c: Likewise.
+	* go-system.h: Likewise.
+
 2015-06-08  Andrew MacLeod  <amacleod@redhat.com>
 
 	* go-backend.c : Adjust include files.
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index e8dda31eb9c1..ad25565ba5f2 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "simple-object.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index d4e514209ee3..cee100b762b8 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -25,7 +25,6 @@
 #include <gmp.h>
 
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -37,11 +36,9 @@
 #include "varasm.h"
 #include "tree-iterator.h"
 #include "hash-map.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index ce4dd9b1b116..ee5b6714489a 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "ansidecl.h"
 #include "coretypes.h"
 #include "opts.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "gimple-expr.h"
 #include "gimplify.h"
diff --git a/gcc/go/go-system.h b/gcc/go/go-system.h
index e70c75dbc28f..9df1341e8ba9 100644
--- a/gcc/go/go-system.h
+++ b/gcc/go/go-system.h
@@ -130,7 +130,6 @@ struct hash<T*>
 #include "coretypes.h"
 
 #include "diagnostic-core.h"	/* For error_at and friends.  */
-#include "input.h"		/* For source_location.  */
 #include "intl.h"		/* For _().  */
 
 // When using gcc, go_assert is just gcc_assert.
diff --git a/gcc/godump.c b/gcc/godump.c
index 63bd7dd440ae..783f3d4cd981 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic-core.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/graph.c b/gcc/graph.c
index f73eab651d97..f6bdfa7b851c 100644
--- a/gcc/graph.c
+++ b/gcc/graph.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index a14a474c9b64..aba4ee6973c7 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -41,14 +40,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop.h"
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index 2abf0c98fc05..7803acb26f31 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -40,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -48,7 +46,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop.h"
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index 2ff3951c568a..7a51ca438212 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -43,7 +43,6 @@ extern "C" {
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -52,7 +51,6 @@ extern "C" {
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -60,7 +58,6 @@ extern "C" {
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop.h"
diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 8ee6df688a9f..b6ef13d5b373 100644
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -38,7 +38,6 @@ extern "C" {
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -47,7 +46,6 @@ extern "C" {
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -55,7 +53,6 @@ extern "C" {
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop.h"
diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index 74602c71473f..624cc87df9b1 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -41,7 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -49,7 +47,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop.h"
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index 28b696ba17c9..1d52be59b2f8 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -43,7 +43,6 @@ extern "C" {
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic-core.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -52,7 +51,6 @@ extern "C" {
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -60,7 +58,6 @@ extern "C" {
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop.h"
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 56548d6ea9aa..e8ddecdae3bc 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -38,7 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -46,7 +44,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index ba38e1cb9b20..271c49925c0b 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -40,7 +40,6 @@ extern "C" {
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -56,7 +55,6 @@ extern "C" {
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify.h"
diff --git a/gcc/graphite.c b/gcc/graphite.c
index afcc6ad2f638..ba8029a09725 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -44,7 +44,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic-core.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -53,7 +52,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -61,7 +59,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-cfg.h"
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index fc7e0a1672a3..21274deca3fc 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -131,7 +131,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl.h"
 #include "tm_p.h"
 #include "regs.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "insn-config.h"
diff --git a/gcc/hw-doloop.c b/gcc/hw-doloop.c
index 27f2220b08a9..e00c3d75a8cc 100644
--- a/gcc/hw-doloop.c
+++ b/gcc/hw-doloop.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "alias.h"
 #include "tree.h"
diff --git a/gcc/hwint.c b/gcc/hwint.c
index 2d1b248c2edc..120ebfe27215 100644
--- a/gcc/hwint.c
+++ b/gcc/hwint.c
@@ -19,7 +19,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
-#include "diagnostic-core.h"
+#include "coretypes.h"
 
 #if GCC_VERSION < 3004
 
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 50ccaa11f0bd..648965c42089 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -25,7 +25,6 @@
 #include "rtl.h"
 #include "regs.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "insn-config.h"
diff --git a/gcc/init-regs.c b/gcc/init-regs.c
index 6d743d5a0f84..5d7d4cc2e02f 100644
--- a/gcc/init-regs.c
+++ b/gcc/init-regs.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/input.c b/gcc/input.c
index b501a1473bc7..59cab5cebefd 100644
--- a/gcc/input.c
+++ b/gcc/input.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "intl.h"
-#include "input.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 9ac882733a55..64ce8e34f4dd 100644
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -50,7 +49,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "ubsan.h"
 #include "target.h"
diff --git a/gcc/ipa-chkp.c b/gcc/ipa-chkp.c
index f3d7c73420dd..181be9b96489 100644
--- a/gcc/ipa-chkp.c
+++ b/gcc/ipa-chkp.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -35,7 +34,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "function.h"
-#include "is-a.h"
 #include "tree-ssa-alias.h"
 #include "predict.h"
 #include "basic-block.h"
diff --git a/gcc/ipa-comdats.c b/gcc/ipa-comdats.c
index a188da094eb9..c68deb69ff2e 100644
--- a/gcc/ipa-comdats.c
+++ b/gcc/ipa-comdats.c
@@ -52,14 +52,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 44efa1917ba4..b87c98413724 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -103,7 +103,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -114,11 +113,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index d7d97ec2422f..6fba692577f4 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -109,7 +109,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -118,7 +117,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "calls.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
 #include "function.h"
diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c
index 91e18ae7fab3..c151cd1a36fb 100644
--- a/gcc/ipa-icf-gimple.c
+++ b/gcc/ipa-icf-gimple.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -36,7 +35,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 "is-a.h"
 #include "gimple.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index d800e1e41bf5..e998fbf216cd 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include <list>
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -71,7 +70,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 "is-a.h"
 #include "gimple.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index bbde8550eee9..d062d7ad847e 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -68,7 +68,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -86,7 +85,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coverage.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -95,7 +93,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 43cc4977dc29..7baa3025fa4a 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -40,10 +39,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "coverage.h"
 #include "tree-cfg.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 4380f0df008b..40606b9be26e 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -93,7 +93,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -114,13 +113,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "profile.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "plugin-api.h"
diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index 7aa9663ace8f..0036565a844f 100644
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -46,7 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pretty-print.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c
index 1bc2ca47f977..3de4ec5c3424 100644
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -57,10 +56,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "dominance.h"
 #include "cfg.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 9290bfb2e4b3..cf3fa4e1412d 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -38,7 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 2150186dfc52..371234cc80bf 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -44,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "calls.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -54,7 +52,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/ipa-ref.c b/gcc/ipa-ref.c
index 139733182a15..3e34017c886e 100644
--- a/gcc/ipa-ref.c
+++ b/gcc/ipa-ref.c
@@ -21,18 +21,15 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "target.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 0e5843cdd938..df018c7d80e8 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -49,13 +48,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "calls.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "tree-inline.h"
 #include "tree-pass.h"
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index a4ff47765a2c..c1ce1a4e2534 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -77,7 +77,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -94,7 +93,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 "is-a.h"
 #include "gimple.h"
 #include "stringpool.h"
 #include "rtl.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index c02657b5af2c..e2e0eedfe5ad 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "fold-const.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -38,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "tree-inline.h"
 #include "dumpfile.h"
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index 08f8bef4b084..1389dd9991d7 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -76,14 +76,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ipa.c b/gcc/ipa.c
index e42ad5e625a9..e7d470491497 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -31,10 +30,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "stringpool.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/ira-build.c b/gcc/ira-build.c
index f0d0ed3312ce..9fcbcb0aa2b3 100644
--- a/gcc/ira-build.c
+++ b/gcc/ira-build.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index b9e1bda6b40b..6c535072793b 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c
index 52397a7b5ef8..b999c59940a6 100644
--- a/gcc/ira-conflicts.c
+++ b/gcc/ira-conflicts.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "insn-config.h"
diff --git a/gcc/ira-costs.c b/gcc/ira-costs.c
index af6c5f0cd7fd..972978d603a3 100644
--- a/gcc/ira-costs.c
+++ b/gcc/ira-costs.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "rtl.h"
 #include "symtab.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "alias.h"
diff --git a/gcc/ira-emit.c b/gcc/ira-emit.c
index 54804eb2c51d..d204ec13a283 100644
--- a/gcc/ira-emit.c
+++ b/gcc/ira-emit.c
@@ -78,7 +78,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index dd9614c868e3..8bd62d2dc70c 100644
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "except.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "insn-config.h"
diff --git a/gcc/ira.c b/gcc/ira.c
index 02dc8b21cba5..c95f57b9f883 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -368,7 +368,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "regs.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 22abc32329b1..cb06d83aa8f3 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,25 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* boehm.c: Do not include input.h, line-map.h or is-a.h.
+	* builtins.c: Likewise.
+	* class.c: Likewise.
+	* constants.c: Likewise.
+	* decl.c: Likewise.
+	* except.c: Likewise.
+	* expr.c: Likewise.
+	* java-gimplify.c: Likewise.
+	* jcf-dump.c: Likewise.
+	* jcf-io.c: Likewise.
+	* jcf-parse.c: Likewise.
+	* jvgenmain.c: Likewise.
+	* lang.c: Likewise.
+	* mangle.c: Likewise.
+	* mangle_name.c: Likewise.
+	* resource.c: Likewise.
+	* typeck.c: Likewise.
+	* verify-glue.c: Likewise.
+	* verify-impl.c: Likewise.
+
 2015-06-08  Andrew MacLeod  <amacleod@redhat.com>
 
 	* boehm.c : Adjust include files.
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c
index 36f0eb69d080..51714b4dae7b 100644
--- a/gcc/java/boehm.c
+++ b/gcc/java/boehm.c
@@ -27,7 +27,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index 5ec0fee170f8..6c7545b9ada2 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -30,7 +30,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 14d2706e3c38..d32004670309 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -26,7 +26,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -45,9 +44,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "parse.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index d2d67fdce936..3aa7bcff3786 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -25,7 +25,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "coretypes.h"
 #include "tm.h"
 #include "jcf.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 3b2df78256ce..53ba65a5e4ce 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -27,7 +27,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -41,11 +40,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "java-tree.h"
 #include "jcf.h"
 #include "java-except.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/java/except.c b/gcc/java/except.c
index bb818ac3db97..557726c05e51 100644
--- a/gcc/java/except.c
+++ b/gcc/java/except.c
@@ -25,7 +25,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 4563a6fb0f20..92a328e1bda8 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -32,7 +32,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 				   MODIFY_JNI_METHOD_CALL and
 				   PARM_BOUNDARY.  */
 				   
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index 08981bbde66b..036fdccfeb1a 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -24,7 +24,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -35,13 +34,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 4c8ecda0fb40..83299f2a7757 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -54,7 +54,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "diagnostic.h"
 
 #include "jcf.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 2cedf8bde677..8156927423af 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -28,7 +28,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "coretypes.h"
 
 #include "jcf.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index b9b6e6f2442f..8da8320b8315 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -26,7 +26,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -35,13 +34,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "obstack.h"
 #include "flags.h"
 #include "java-except.h"
-#include "input.h"
 #include "javaop.h"
 #include "java-tree.h"
 #include "diagnostic-core.h"
 #include "parse.h"
 #include "debug.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 597f6db3d94f..dcdcb397877a 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -28,7 +28,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "coretypes.h"
 #include "obstack.h"
 #include "jcf.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 5bd919abccf6..d2b519c6c8ef 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -27,11 +27,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
-#include "input.h"
 #include "java-tree.h"
 #include "jcf.h"
 #include "langhooks.h"
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index e74925d1094c..111e4bd82c85 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -28,7 +28,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "jcf.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c
index 3457f6210b26..050f5da97278 100644
--- a/gcc/java/mangle_name.c
+++ b/gcc/java/mangle_name.c
@@ -28,7 +28,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "jcf.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 6c51ae1083c2..d89575f32197 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -24,7 +24,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -39,10 +38,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "parse.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "tree-iterator.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index d2c9c9b30ebc..df06a4bf8f6b 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -26,7 +26,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c
index 6af3f7ab01e0..c98a3ddf0d10 100644
--- a/gcc/java/verify-glue.c
+++ b/gcc/java/verify-glue.c
@@ -27,7 +27,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c
index 0e63c7eb0562..ee06eec478ca 100644
--- a/gcc/java/verify-impl.c
+++ b/gcc/java/verify-impl.c
@@ -15,7 +15,6 @@ details.  */
 #include "system.h"
 #include "coretypes.h"
 
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 0ba2fd6cc87b..d9e61b657a30 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* dummy-frontend.c: Do not include input.h, line-map.h or is-a.h.
+	* jit-common.h: Likewise.
+	* jit-playback.c: Likewise.
+
 2015-06-16  David Malcolm  <dmalcolm@redhat.com>
 
 	PR jit/66539
diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index a0c404d7cd31..e3611cf73931 100644
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "hash-map.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "vec.h"
 #include "hashtab.h"
diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 160e7c8283df..5a8a56dce4f9 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 "input.h"
 #include "vec.h"
 #include "alias.h"
 #include "flags.h"
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index dbbfc52c95ca..14ed277402fc 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 "input.h"
 #include "statistics.h"
 #include "vec.h"
 #include "alias.h"
@@ -33,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "inchash.h"
 #include "tree.h"
 #include "hash-map.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "vec.h"
 #include "hashtab.h"
diff --git a/gcc/jump.c b/gcc/jump.c
index 5d4beacc0c2f..1bf54871220b 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -45,7 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "insn-config.h"
 #include "insn-attr.h"
 #include "recog.h"
-#include "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 62f1612e9cad..c7982c3bab76 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "tm.h"
 #include "toplev.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -40,10 +39,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks-def.h"
 #include "diagnostic.h"
 #include "tree-diagnostic.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/lcm.c b/gcc/lcm.c
index ac27ec51a806..af5e78e0fa47 100644
--- a/gcc/lcm.c
+++ b/gcc/lcm.c
@@ -59,7 +59,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "insn-config.h"
 #include "recog.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index e78076e29ea0..38303f545957 100644
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "alias.h"
 #include "tree.h"
diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index 90898f934ec2..5959145b9697 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "obstack.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c
index a782f3c88534..92d8e4c638ac 100644
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -43,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "obstack.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/loop-iv.c b/gcc/loop-iv.c
index fdd3323a76fa..141b43672ce8 100644
--- a/gcc/loop-iv.c
+++ b/gcc/loop-iv.c
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hard-reg-set.h"
 #include "obstack.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c
index ec7755ed6e27..e2e2f23f95ec 100644
--- a/gcc/loop-unroll.c
+++ b/gcc/loop-unroll.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c
index e89c55dfa377..bacb65f856d2 100644
--- a/gcc/lower-subreg.c
+++ b/gcc/lower-subreg.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c
index 8bbede0b3b48..abdb419251b6 100644
--- a/gcc/lra-assigns.c
+++ b/gcc/lra-assigns.c
@@ -87,7 +87,6 @@ along with GCC; see the file COPYING3.	If not see
 #include "recog.h"
 #include "output.h"
 #include "regs.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "flags.h"
diff --git a/gcc/lra-coalesce.c b/gcc/lra-coalesce.c
index 10eaf170b1d4..8fb2488258e5 100644
--- a/gcc/lra-coalesce.c
+++ b/gcc/lra-coalesce.c
@@ -54,7 +54,6 @@ along with GCC; see the file COPYING3.	If not see
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "flags.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "alias.h"
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 898dbecb7dbb..1d3f94e5ab07 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -120,7 +120,6 @@
 #include "output.h"
 #include "addresses.h"
 #include "target.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "flags.h"
diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c
index d8cbb478a48e..1fc37e1b55dc 100644
--- a/gcc/lra-eliminations.c
+++ b/gcc/lra-eliminations.c
@@ -65,7 +65,6 @@ along with GCC; see the file COPYING3.	If not see
 #include "output.h"
 #include "addresses.h"
 #include "target.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "flags.h"
diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index 66baaddda1c3..8bf217f68652 100644
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -36,7 +36,6 @@ along with GCC; see the file COPYING3.	If not see
 #include "recog.h"
 #include "output.h"
 #include "regs.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "flags.h"
diff --git a/gcc/lra-remat.c b/gcc/lra-remat.c
index b4f83d14f040..20c510642c23 100644
--- a/gcc/lra-remat.c
+++ b/gcc/lra-remat.c
@@ -65,7 +65,6 @@ along with GCC; see the file COPYING3.	If not see
 #include "recog.h"
 #include "output.h"
 #include "regs.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "flags.h"
diff --git a/gcc/lra-spills.c b/gcc/lra-spills.c
index 2b3e088b2786..d9996a58df9b 100644
--- a/gcc/lra-spills.c
+++ b/gcc/lra-spills.c
@@ -67,7 +67,6 @@ along with GCC; see the file COPYING3.	If not see
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "flags.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "alias.h"
diff --git a/gcc/lra.c b/gcc/lra.c
index e44cec0dd627..15e65f7b02f8 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -114,7 +114,6 @@ along with GCC; see the file COPYING3.	If not see
 #include "output.h"
 #include "addresses.h"
 #include "flags.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 42db4d8181af..1068b465ac1c 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -37,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/lto-compress.c b/gcc/lto-compress.c
index f2b780b4f0a4..2fb00e2401c5 100644
--- a/gcc/lto-compress.c
+++ b/gcc/lto-compress.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
    system.h.  */
 #include <zlib.h>
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -36,13 +35,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "diagnostic-core.h"
 #include "langhooks.h"
diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c
index 2b2a61fa6dea..ffc8a3fac51b 100644
--- a/gcc/lto-opts.c
+++ b/gcc/lto-opts.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -31,13 +30,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "bitmap.h"
 #include "flags.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index 99a293099670..1574649c1457 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -35,7 +34,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 "is-a.h"
 #include "gimple.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index b8db26c9c6c1..66b2fcde99b9 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -35,7 +34,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 "is-a.h"
 #include "gimple.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 7729b6cf6978..895c18c86653 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "toplev.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -52,7 +51,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index f3492c14c1f5..88c2e80dfcc1 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -52,7 +51,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index 4f506b1b9d0d..1ac4ce1736ba 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -26,20 +26,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "toplev.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "bitmap.h"
 #include "diagnostic-core.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index af12a06a3fd9..b089bbf5d2d3 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* lto-lang.c: Do not include input.h, line-map.h or is-a.h.
+	* lto-object.c: Likewise.
+	* lto-partition.c: Likewise.
+	* lto-symtab.c: Likewise.
+	* lto.c: Likewise.
+
 2015-06-14  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR ipa/66181
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 349abef5b86a..5a2ea1349328 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "flags.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -39,13 +38,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-inline.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "diagnostic-core.h"
 #include "toplev.h"
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index 6a4d5ca8be34..b8a720fdf864 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,13 +29,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "diagnostic-core.h"
 #include "lto.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 52a791cc56dd..3ef0ad4e00a8 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "toplev.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,13 +29,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index a6393c822a81..b45dcada8cc1 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic-core.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -31,13 +30,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 2001bf3e486f..323c4f134aea 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "opts.h"
 #include "toplev.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -34,10 +33,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/mcf.c b/gcc/mcf.c
index 81c12651b13f..6bba0facea5f 100644
--- a/gcc/mcf.c
+++ b/gcc/mcf.c
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index be26d15d6aeb..4ffdc7e303b2 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "insn-config.h"
 #include "recog.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index 94b79c35f930..db76095fb65b 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -28,7 +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 "input.h"
 #include "function.h"
 #include "profile.h"
 #include "flags.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index a7525af9deab..0450a3dc4406 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,14 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* objc-act.c: Do not include input.h, line-map.h or is-a.h.
+	* 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  Andrew MacLeod  <amacleod@redhat.com>
 
 	* objc-act.c : Adjust include files.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index f536437228e2..58f4760134a3 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -47,7 +46,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "objc-act.h"
 #include "objc-map.h"
-#include "input.h"
 #include "hard-reg-set.h"
 #include "function.h"
 #include "toplev.h"
@@ -55,7 +53,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-family/c-target.h"
 #include "diagnostic-core.h"
 #include "intl.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/objc/objc-encoding.c b/gcc/objc/objc-encoding.c
index 1928de3a5a7a..17c0b2177101 100644
--- a/gcc/objc/objc-encoding.c
+++ b/gcc/objc/objc-encoding.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objc/objc-gnu-runtime-abi-01.c b/gcc/objc/objc-gnu-runtime-abi-01.c
index 1937bafac38e..55d6ed7964b0 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.c
+++ b/gcc/objc/objc-gnu-runtime-abi-01.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index fe50c38009eb..d74655bac78b 100644
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objc/objc-map.c b/gcc/objc/objc-map.c
index ebadf6a9f4b4..fd894126a18c 100644
--- a/gcc/objc/objc-map.c
+++ b/gcc/objc/objc-map.c
@@ -20,7 +20,6 @@ Boston, MA 02110-1301, USA.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objc/objc-next-runtime-abi-01.c b/gcc/objc/objc-next-runtime-abi-01.c
index 1e7522e491de..27978031e470 100644
--- a/gcc/objc/objc-next-runtime-abi-01.c
+++ b/gcc/objc/objc-next-runtime-abi-01.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index fa6c0a2e349c..3bf951c3a643 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objc/objc-runtime-shared-support.c b/gcc/objc/objc-runtime-shared-support.c
index a2d5c4524bf4..a6ad2301f396 100644
--- a/gcc/objc/objc-runtime-shared-support.c
+++ b/gcc/objc/objc-runtime-shared-support.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index fd0ddb537637..4deea7b4bc82 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* objcp-decl.c: Do not include input.h, line-map.h or is-a.h.
+	* objcp-lang.c: Likewise.
+	
 2015-06-08  Andrew MacLeod  <amacleod@redhat.com>
 
 	* objcp-decl.c : Adjust include files.
diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c
index 1f84731da05d..c1357a6f7773 100644
--- a/gcc/objcp/objcp-decl.c
+++ b/gcc/objcp/objcp-decl.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c
index bfb4eb6df269..4e5ede22ceb6 100644
--- a/gcc/objcp/objcp-lang.c
+++ b/gcc/objcp/objcp-lang.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/omega.c b/gcc/omega.c
index f940da51d2af..4654df8cccd0 100644
--- a/gcc/omega.c
+++ b/gcc/omega.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 72c431e3e9f4..64b5c66e933d 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -45,7 +44,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/optabs.c b/gcc/optabs.c
index da5dfa48a5fd..94739a945bc6 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
    is properly defined.  */
 #include "insn-config.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index ff872521d73e..af71c375ea26 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic.h"
 #include "opts.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h" /* Required by langhooks.h.  */
@@ -32,13 +31,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "langhooks.h"
 #include "rtl.h"
diff --git a/gcc/opts.h b/gcc/opts.h
index 5bf815b03a60..3cfd151fb620 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_OPTS_H
 #define GCC_OPTS_H
 
-#include "input.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 1bc8a360f008..c66741e45b41 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -26,8 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "line-map.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -72,7 +70,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "tree-cfg.h"
diff --git a/gcc/plugin.c b/gcc/plugin.c
index 1be60e7ca0e9..15756f3bd43e 100644
--- a/gcc/plugin.c
+++ b/gcc/plugin.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic-core.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c
index 746d306f22fe..39c8c3959d1d 100644
--- a/gcc/postreload-gcse.c
+++ b/gcc/postreload-gcse.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "diagnostic-core.h"
 
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/postreload.c b/gcc/postreload.c
index f83da4a5f0f2..704428a67960 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "obstack.h"
 #include "insn-config.h"
 #include "flags.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "alias.h"
diff --git a/gcc/predict.c b/gcc/predict.c
index fdfb8efab5b9..4317bd9cb7d5 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -68,7 +67,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h
index 6143423ac6e8..6e8a300fbebb 100644
--- a/gcc/pretty-print.h
+++ b/gcc/pretty-print.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #define GCC_PRETTY_PRINT_H
 
 #include "obstack.h"
-#include "input.h"
 #include "wide-int-print.h"
 
 /* Maximum number of format string arguments.  */
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 644dde830d87..36182d349ce4 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -33,7 +33,6 @@ 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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -41,7 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "diagnostic.h"
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 19a0aa56218e..94b4d7db7dac 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -33,10 +32,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-iterator.h"
 #include "diagnostic.h"
 #include "gimple-pretty-print.h" /* FIXME */
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index 7c4e1502bc28..75b418d16573 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -56,7 +56,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "regs.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "alias.h"
 #include "tree.h"
@@ -81,7 +80,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-cfg.h"
diff --git a/gcc/real.c b/gcc/real.c
index 18c01aaf7696..2d34b6202790 100644
--- a/gcc/real.c
+++ b/gcc/real.c
@@ -23,7 +23,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/realmpfr.c b/gcc/realmpfr.c
index 2edc0abfcf21..d86f23aeeadf 100644
--- a/gcc/realmpfr.c
+++ b/gcc/realmpfr.c
@@ -21,7 +21,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "realmpfr.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/recog.c b/gcc/recog.c
index 73592de891b7..3fbfe076ed8b 100644
--- a/gcc/recog.c
+++ b/gcc/recog.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/ree.c b/gcc/ree.c
index 8c1d4bbb8716..46f7d2edff11 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -220,7 +220,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -253,7 +252,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "params.h"
 #include "tree-pass.h"
 #include "df.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index a73c7ec02934..997851c3798b 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -153,7 +153,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -161,7 +160,6 @@
 #include "rtl-error.h"
 #include "tm_p.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "insn-config.h"
 #include "regs.h"
diff --git a/gcc/regcprop.c b/gcc/regcprop.c
index 8e6452ef5158..5326838b92a5 100644
--- a/gcc/regcprop.c
+++ b/gcc/regcprop.c
@@ -28,7 +28,6 @@
 #include "addresses.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index fde13c420690..09c2f33f1c0f 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/regrename.c b/gcc/regrename.c
index d4b04694d688..0cba8ded8c2e 100644
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -28,7 +28,6 @@
 #include "addresses.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/regstat.c b/gcc/regstat.c
index 7de499155075..0ae78e9b00d5 100644
--- a/gcc/regstat.c
+++ b/gcc/regstat.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "except.h"
 #include "hard-reg-set.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/reload.c b/gcc/reload.c
index 079f0aaa3fb1..03354deb6059 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -97,7 +97,6 @@ a register with any other reload.  */
 #include "insn-config.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "rtl.h"
 #include "flags.h"
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 1e29a49561a7..a86084a8e297 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "obstack.h"
 #include "insn-config.h"
 #include "flags.h"
-#include "input.h"
 #include "function.h"
 #include "symtab.h"
 #include "rtl.h"
diff --git a/gcc/reorg.c b/gcc/reorg.c
index bca5c60ca7be..15f513cd3a78 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -109,7 +109,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "alias.h"
diff --git a/gcc/resource.c b/gcc/resource.c
index 5ee680422b6c..1f2f6b8e4f6a 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -25,7 +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 "input.h"
 #include "function.h"
 #include "regs.h"
 #include "flags.h"
diff --git a/gcc/rtl-chkp.c b/gcc/rtl-chkp.c
index 60713c97467a..0ad832386c0f 100644
--- a/gcc/rtl-chkp.c
+++ b/gcc/rtl-chkp.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "symtab.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "rtl.h"
 #include "flags.h"
@@ -42,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
-#include "is-a.h"
 #include "predict.h"
 #include "basic-block.h"
 #include "fold-const.h"
diff --git a/gcc/rtl-error.c b/gcc/rtl-error.c
index c6745e4e2f40..8b9b391e6140 100644
--- a/gcc/rtl-error.c
+++ b/gcc/rtl-error.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl-error.h"
 #include "insn-attr.h"
 #include "insn-config.h"
-#include "input.h"
 #include "intl.h"
 #include "diagnostic.h"
 
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 967175cd6e62..5b4a525cd9b7 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -34,12 +34,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "vec.h"
 #include "hash-table.h"
 #include "hash-set.h"
+#include "input.h"
+#include "is-a.h"
 #endif  /* GENERATOR_FILE */
 
-#include "input.h"
 #include "alias.h"
 #include "flags.h"
-#include "is-a.h"
 
 /* Value used by some passes to "recognize" noop moves as valid
  instructions.  */
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 56873365856a..d4a9eda26297 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "flags.h"
 #include "regs.h"
-#include "input.h"
 #include "function.h"
 #include "predict.h"
 #include "basic-block.h"
diff --git a/gcc/rtlhooks.c b/gcc/rtlhooks.c
index c1e2dcd0d3fa..8202f291b812 100644
--- a/gcc/rtlhooks.c
+++ b/gcc/rtlhooks.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtlhooks-def.h"
 #include "symtab.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "alias.h"
diff --git a/gcc/sanopt.c b/gcc/sanopt.c
index bfb722a39d5f..e1c30e1d7659 100644
--- a/gcc/sanopt.c
+++ b/gcc/sanopt.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -37,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index a0f09da07d32..b62dc00a583a 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -26,14 +26,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "diagnostic-core.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"		/* FIXME: Used by call_may_noreturn_p.  */
 #include "tm_p.h"
 #include "hard-reg-set.h"
 #include "regs.h"
-#include "input.h"
 #include "function.h"
 #include "flags.h"
 #include "insn-config.h"
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index 47660c9778d5..03767e6c841b 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -28,7 +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 "input.h"
 #include "function.h"
 #include "profile.h"
 #include "flags.h"
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 0f970a0c44c6..b3ece760f698 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -52,7 +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 "input.h"
 #include "function.h"
 #include "profile.h"
 #include "flags.h"
diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index d7124e3ca009..8b77238e9d8e 100644
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -28,13 +28,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"	/* FIXME: To dump INSN_VAR_LOCATION_DECL.  */
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/sdbout.c b/gcc/sdbout.c
index 033886a675e8..84823d6598b3 100644
--- a/gcc/sdbout.c
+++ b/gcc/sdbout.c
@@ -44,7 +44,6 @@ AT&T C compiler.  From the example below I would conclude the following:
 #include "coretypes.h"
 #include "tm.h"
 #include "debug.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/sel-sched-dump.c b/gcc/sel-sched-dump.c
index 17f2a20ecd4a..87d4dc5727dd 100644
--- a/gcc/sel-sched-dump.c
+++ b/gcc/sel-sched-dump.c
@@ -26,7 +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 "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index ae6f637fe1e1..bb55e3ddfa8a 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -26,7 +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 "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index f706fb71c087..be5d1d12e899 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -25,7 +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 "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
diff --git a/gcc/sese.c b/gcc/sese.c
index 6e64477da114..45deda1a4fa2 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -32,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -42,7 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index e83c34b82eb5..7cb68fdae76b 100644
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl-error.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index a572ff016cf2..a5731e83595b 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/stack-ptr-mod.c b/gcc/stack-ptr-mod.c
index 9b5df3974615..469722ea204f 100644
--- a/gcc/stack-ptr-mod.c
+++ b/gcc/stack-ptr-mod.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/statistics.c b/gcc/statistics.c
index e76ad95189ec..233926d53a61 100644
--- a/gcc/statistics.c
+++ b/gcc/statistics.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-dump.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "context.h"
 #include "pass_manager.h"
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 00705872dcdf..7c40e124334d 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "rtl.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -62,7 +61,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 "is-a.h"
 #include "gimple.h"
 #include "regs.h"
 #include "alloc-pool.h"
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 30f97a836d4c..604e4fca95bd 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -49,7 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "regs.h"
 #include "params.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index aeed299c0a76..32bf0216d70f 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "toplev.h"
 
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/streamer-hooks.c b/gcc/streamer-hooks.c
index 71746d1143e8..e34237f8e96c 100644
--- a/gcc/streamer-hooks.c
+++ b/gcc/streamer-hooks.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "streamer-hooks.h"
 
 /* Streamer hooks.  */
diff --git a/gcc/stringpool.c b/gcc/stringpool.c
index 054f71cece3a..393834afcd5b 100644
--- a/gcc/stringpool.c
+++ b/gcc/stringpool.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "ggc-internal.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/symtab.c b/gcc/symtab.c
index 9dc07f5b655e..9aae61d5ad55 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -31,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "print-tree.h"
 #include "varasm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "emit-rtl.h"
 #include "predict.h"
@@ -39,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "tree-inline.h"
 #include "langhooks.h"
diff --git a/gcc/target-globals.c b/gcc/target-globals.c
index 6edb5827f4cf..608601edb445 100644
--- a/gcc/target-globals.c
+++ b/gcc/target-globals.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "insn-config.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index e6deaaac3622..c80e63be6675 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -51,7 +51,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/toplev.c b/gcc/toplev.c
index b1ccc18adf35..2f43a89cd636 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -26,8 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "line-map.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -74,7 +72,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hosthooks.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/tracer.c b/gcc/tracer.c
index 308927a7376e..79cfd8d4dcf1 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -37,7 +37,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -46,7 +45,6 @@
 #include "hard-reg-set.h"
 #include "profile.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -59,7 +57,6 @@
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-cfg.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index b820a6bf9ec1..29e56288510a 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -29,7 +28,6 @@
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -38,7 +36,6 @@
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "calls.h"
 #include "rtl.h"
diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index ae45ea2b18e1..4ec801218ab2 100644
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -47,7 +46,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "dumpfile.h"
diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
index 76526d6ac478..bd2e0fa24b8a 100644
--- a/gcc/tree-browser.c
+++ b/gcc/tree-browser.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index b07fbd6d0132..03a8b1e22773 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -38,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 9430151fdf6c..adc56bab388a 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -45,7 +44,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 47eb0991b376..07e2d7465b00 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -42,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-chkp-opt.c b/gcc/tree-chkp-opt.c
index 59a0b405bf17..4f9d8803e3ad 100644
--- a/gcc/tree-chkp-opt.c
+++ b/gcc/tree-chkp-opt.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "tree-cfg.h"
 #include "tree-pass.h"
-#include "is-a.h"
 #include "cfgloop.h"
 #include "stringpool.h"
 #include "tree-ssa-alias.h"
diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c
index 8edef488a03d..bee63cd013b8 100644
--- a/gcc/tree-chkp.c
+++ b/gcc/tree-chkp.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -35,7 +34,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "tree-pass.h"
 #include "diagnostic.h"
-#include "is-a.h"
 #include "cfgloop.h"
 #include "stringpool.h"
 #include "tree-ssa-alias.h"
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index b356da4ddab8..b179e5224682 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -37,7 +36,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index 3d600d1df5ed..a2bacc6bda98 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -38,7 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 5b4f0928ffe1..cc79a7f6fb58 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -76,7 +76,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -104,7 +103,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop-niter.h"
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index f685cf2ff3f5..8bc968a073f7 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -41,7 +40,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/tree-diagnostic.c b/gcc/tree-diagnostic.c
index 31920f801dc9..09ffe0c4221c 100644
--- a/gcc/tree-diagnostic.c
+++ b/gcc/tree-diagnostic.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c
index 46a3d55165aa..9b3494f7ba81 100644
--- a/gcc/tree-dump.c
+++ b/gcc/tree-dump.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 0f4d17a44024..7c141ad5f731 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -50,7 +49,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index a4ceeb368b5d..ea6309000690 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -31,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -39,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 050287ee65da..a5e17b85b082 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -84,7 +84,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -102,7 +101,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 1fa5dabb56a5..ce9495de2ef3 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "diagnostic-core.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -49,7 +48,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 44f5267bf1a4..4c4a34010580 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -41,7 +40,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-iterator.c b/gcc/tree-iterator.c
index e7faaed8ce16..d42ae440752c 100644
--- a/gcc/tree-iterator.c
+++ b/gcc/tree-iterator.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 5c203dbb1344..96fbc3620f59 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -44,7 +44,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -53,7 +52,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -62,7 +60,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 12992f2852f3..f680e26a99bd 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -21,7 +21,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -38,7 +37,6 @@
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 4eeab41d46c3..a75e22f788ea 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -21,13 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
@@ -37,7 +35,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index f3d7cf154ac9..e48ee6445798 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -33,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -42,7 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index 93ac258dc074..f985f4d1c243 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -43,7 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index 3495ac19f26f..48c143d69111 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -31,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -39,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index 4b37a718f5e3..a2eba221bf47 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -21,20 +21,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index 4415fe3ab4d6..341bcc77a8eb 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -188,7 +188,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -205,7 +204,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index 76baf437ba5e..13587e6b04a6 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -43,7 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pretty-print.h"
 #include "gimple-expr.h"
 #include "predict.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 377ab0d27508..e22e29449c9a 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "flags.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "predict.h"
 #include "dominance.h"
@@ -38,7 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "diagnostic-core.h"
 #include "coverage.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -46,7 +44,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 "is-a.h"
 #include "gimple.h"
 #include "varasm.h"
 #include "tree-nested.h"
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 52d2c9dd464b..1abefea69b46 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -256,7 +256,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -284,7 +283,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 9bfcd9854a6f..8e342440e0b2 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -76,7 +76,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "alloc-pool.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -91,7 +90,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "stor-layout.h"
 #include "gimplify.h"
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index c4aba104d994..367c9f4265d1 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index b2d29cad0941..d9aae421fbce 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -44,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "stringpool.h"
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 68d861f88958..34c3ad612913 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -122,7 +122,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -132,7 +131,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -143,7 +141,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index 0504aeb7f045..b6ee224e2093 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -33,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "dumpfile.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -41,7 +39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index ea6528986457..68fd5d64ee35 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -39,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index 2fbaec8e7f32..ef11f6870548 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -36,7 +35,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "flags.h"
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index 562ad8abd52a..181626cf979d 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -46,7 +46,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -64,7 +63,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index d0030b1eda4c..8cded4c78c1d 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -32,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -45,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index a7b70f5c09c8..35fd16ae199d 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -38,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 7ae4ea442e2a..bd7c9fa8f121 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -40,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index a22455148161..650624e49f3b 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
    BRANCH_COST.  */
 #include "rtl.h"
 #include "tm_p.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -34,7 +33,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "stor-layout.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -45,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 204e70b6f441..510e45b06e0c 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index 6ece78b92807..98534ba8f6ca 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -29,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -37,7 +35,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 5ae5c4739e26..8f0cc804a6d4 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -29,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -40,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 4e21dce600e3..73fbac8f825d 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -48,7 +47,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "profile.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -59,7 +57,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index e94a0bca69a5..cb5f054720d9 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -65,7 +65,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -83,7 +82,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 0aa25ddf4683..29f701c21f51 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -29,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -38,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index 7104e60cf95a..64c9a73e03f2 100644
--- a/gcc/tree-ssa-loop-niter.c
+++ b/gcc/tree-ssa-loop-niter.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -50,7 +49,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index 0f6cb8b5dec5..69968454c46b 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -38,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index a49c9ce7b8ad..0be9142561e0 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -29,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -37,7 +35,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index d03ff054f8b5..f2a3460eaa0a 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -29,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -37,7 +35,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "tree-ssa-loop-ivopts.h"
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index d46839cc5e3a..96361a6f1960 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -89,7 +89,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -104,7 +103,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify.h"
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index 0d0a2a754f98..f3abe54aba81 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "print-tree.h"
 #include "flags.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "gimple-pretty-print.h"
 #include "bitmap.h"
@@ -39,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "tree-phinodes.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index e26e686db5a6..098a02868e27 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -39,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index 17d26e719148..ba2c05f85bb5 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -40,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index d21849279532..e8a670e5730e 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -42,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index 1db0e86b1c6d..c38bb281c689 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -31,7 +30,6 @@
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -45,7 +43,6 @@
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index b502ff179eb8..3eb098eca5a1 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "rtl.h"
 #include "tm_p.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -44,7 +43,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 238cf306dd1c..3db42b03bbbe 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -42,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-scopedtables.c b/gcc/tree-ssa-scopedtables.c
index 16f279da5879..4c3e04360649 100644
--- a/gcc/tree-ssa-scopedtables.c
+++ b/gcc/tree-ssa-scopedtables.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index 0bc7eaff08ff..069fae4ffa57 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "stor-layout.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -41,7 +39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 044fb0385293..fc848ea41b91 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -41,7 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 1ed0bc4fbf9b..cef73fa38e7c 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -28,7 +28,6 @@
 #include "flags.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -42,7 +41,6 @@
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index e73feec099ab..f13ded0823a1 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -189,7 +189,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -199,7 +198,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -211,7 +209,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index 9cc9f2250345..ed8d4bfd9419 100644
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -32,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "bitmap.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -40,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 01c8aa35b352..f2e70cfe0b31 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -31,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "basic-block.h"
@@ -41,7 +39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 8514696a7680..2b018f8cdec8 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -30,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -39,7 +37,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index 0ae8bee98070..4e7730d4ba99 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -31,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -40,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index 95d1e9cb586e..405da31f9c23 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -31,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -41,7 +39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 026b23a5ae6a..cab627daa153 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -33,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -43,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "gimple-fold.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index 5a25c73cbbac..98f7375b30b3 100644
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -29,13 +28,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "stor-layout.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-ssa.h"
 #include "tree-phinodes.h"
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 65fe9f9e767b..f3f41349f842 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -22,13 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "langhooks.h"
 #include "gimple-pretty-print.h"
@@ -41,7 +39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 9b2d1432aaa6..1a8c8e413782 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "diagnostic.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -33,13 +32,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 6543d409bc2c..84ebb6497741 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "diagnostic.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -32,13 +31,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "stor-layout.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c
index c1203fd7233b..ad1510df0e82 100644
--- a/gcc/tree-streamer.c
+++ b/gcc/tree-streamer.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -32,13 +31,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "basic-block.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "streamer-hooks.h"
 #include "plugin-api.h"
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index e09942f13ba5..3c1ca2c6bda7 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -26,10 +26,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "line-map.h"
 #include "params.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -46,7 +44,6 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 6f0d6ccfd2fa..37179c11fd14 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -37,7 +36,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 36d9ff1eb04d..3fc122671809 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "dumpfile.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -43,7 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index 822ddfb7517e..1d20842827cb 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -39,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify-me.h"
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 4132ece1f087..790cc984f5e6 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -24,14 +24,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "dumpfile.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -41,7 +39,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 9edb0d12e992..584a32cb79bf 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "dumpfile.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -41,7 +40,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 786adf29ee05..1b6043cad337 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -39,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 880b245c9271..e44396af6295 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "dumpfile.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -39,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 99e25f88f91b..7ba0d8f64b76 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "dumpfile.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -42,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index b18b513c4042..ff46a52fc82c 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -59,7 +59,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "dumpfile.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -68,7 +67,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pretty-print.h"
 #include "predict.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -76,7 +74,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index b517363ec975..a7e66f14f2bf 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -42,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-fold.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index 6c194a6953dc..feeba1612b67 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "flags.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -61,7 +60,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimplify.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index 27d5fb60d025..9b7d9069b726 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -50,7 +49,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 "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 4e2214d66188..3809728ce467 100644
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -34,7 +33,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfg.h"
 #include "cfganal.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "tm.h"
 #include "hard-reg-set.h"
diff --git a/gcc/valtrack.c b/gcc/valtrack.c
index b1101756a470..80a004319693 100644
--- a/gcc/valtrack.c
+++ b/gcc/valtrack.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "valtrack.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "regs.h"
 #include "emit-rtl.h"
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 462659b56957..74f53754052b 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -53,7 +52,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "internal-fn.h"
 #include "tree-eh.h"
 #include "gimple-expr.h"
-#include "is-a.h"
 #include "gimple.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index c3adf51d1341..dbf090e21b5a 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -90,7 +90,6 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index b2ad7951a1ad..381f99cdd193 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "rtl.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -62,7 +61,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "dominance.h"
 #include "cfg.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 284aae3cd126..9a97f77b389c 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.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 "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -30,10 +29,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "varasm.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "is-a.h"
 #include "plugin-api.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "ipa-ref.h"
 #include "cgraph.h"
diff --git a/gcc/vec.c b/gcc/vec.c
index b6c31785cc4b..48b10c464855 100644
--- a/gcc/vec.c
+++ b/gcc/vec.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "system.h"
 #include "coretypes.h"
-#include "diagnostic-core.h"
 #include "hash-table.h"
 
 /* vNULL is an empty type with a template cast operation that returns
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index 8c917e07d797..bd2ccf1da4d4 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 
 #ifdef VMS_DEBUGGING_INFO
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
@@ -38,7 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "debug.h"
 #include "langhooks.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "target.h"
 
diff --git a/gcc/vtable-verify.c b/gcc/vtable-verify.c
index 5dc72a4796d1..7af54c022f13 100644
--- a/gcc/vtable-verify.c
+++ b/gcc/vtable-verify.c
@@ -135,7 +135,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "options.h"
@@ -144,7 +143,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "predict.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
@@ -152,7 +150,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 "is-a.h"
 #include "gimple.h"
 #include "gimple-iterator.h"
 #include "gimple-ssa.h"
diff --git a/gcc/web.c b/gcc/web.c
index 1e6e1217a1c8..7ffe63399ced 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -44,7 +44,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "flags.h"
 #include "obstack.h"
 #include "predict.h"
-#include "input.h"
 #include "function.h"
 #include "dominance.h"
 #include "cfg.h"
diff --git a/gcc/wide-int.cc b/gcc/wide-int.cc
index f4f84bc9f615..199206f41e05 100644
--- a/gcc/wide-int.cc
+++ b/gcc/wide-int.cc
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "hwint.h"
 #include "vec.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "inchash.h"
diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c
index 07b8257a3f04..73e3d23827d5 100644
--- a/gcc/xcoffout.c
+++ b/gcc/xcoffout.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "input.h"
 #include "alias.h"
 #include "symtab.h"
 #include "tree.h"
-- 
GitLab