summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authoramacleod <amacleod@138bc75d-0d04-0410-961f-82ee72b054a4>2015-06-04 17:49:54 +0000
committeramacleod <amacleod@138bc75d-0d04-0410-961f-82ee72b054a4>2015-06-04 17:49:54 +0000
commitf77c02926928c803f747ad72efadbf1ad7f9a85f (patch)
tree24a8a7f5aed7aba190f9b859ec611023daa1fffa /gcc
parent499e2be8a43f0dc11f13e1d3e7a86cf93df5962c (diff)
downloadgcc-f77c02926928c803f747ad72efadbf1ad7f9a85f.tar.gz
2015-06-04 Andrew MacLeod <amacleod@redhat.com>
* coretypes.h: Include machmode.h, signop.h, wide-int.h, double-int.h, real.h, and fixed-value.h when included in host source files. * double-int.h: Remove redundant #includes listed above. * fixed-value.h: Likewise. * real.h: Likewise. * wide-int.h: Likewise. * inchash.h: Likewise. * rtl.h: Add some include files When included from a generator file. * target.h: Remove wide-int.h and insn-modes.h from the include list. * internal-fn.h: Don't include coretypes.h. * alias.c: Adjust includes for restructured coretypes.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. * dojump.c: Likewise. * dominance.c: Likewise. * domwalk.c: Likewise. * double-int.c: Likewise. * dse.c: Likewise. * dumpfile.c: Likewise. * dwarf2asm.c: Likewise. * dwarf2cfi.c: Likewise. * dwarf2out.c: Likewise. * dwarf2out.h: 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. * hooks.h: Likewise. * hw-doloop.c: Likewise. * ifcvt.c: Likewise. * incpath.c: Likewise. * init-regs.c: Likewise. * internal-fn.c: Likewise. * ipa-chkp.c: Likewise. * ipa-comdats.c: Likewise. * ipa-cp.c: Likewise. * ipa-devirt.c: Likewise. * ipa-icf-gimple.c: Likewise. * ipa-icf.c: Likewise. * ipa-inline-analysis.c: Likewise. * ipa-inline-transform.c: Likewise. * ipa-inline.c: Likewise. * ipa-polymorphic-call.c: Likewise. * ipa-profile.c: Likewise. * ipa-prop.c: Likewise. * ipa-pure-const.c: Likewise. * ipa-ref.c: Likewise. * ipa-reference.c: Likewise. * ipa-split.c: Likewise. * ipa-utils.c: Likewise. * ipa-visibility.c: Likewise. * ipa.c: Likewise. * ira-build.c: Likewise. * ira-color.c: Likewise. * ira-conflicts.c: Likewise. * ira-costs.c: Likewise. * ira-emit.c: Likewise. * ira-lives.c: Likewise. * ira.c: Likewise. * jump.c: Likewise. * langhooks.c: Likewise. * lcm.c: Likewise. * loop-doloop.c: Likewise. * loop-init.c: Likewise. * loop-invariant.c: Likewise. * loop-iv.c: Likewise. * loop-unroll.c: Likewise. * lower-subreg.c: Likewise. * lra-assigns.c: Likewise. * lra-coalesce.c: Likewise. * lra-constraints.c: Likewise. * lra-eliminations.c: Likewise. * lra-lives.c: Likewise. * lra-remat.c: Likewise. * lra-spills.c: Likewise. * lra.c: Likewise. * lto-cgraph.c: Likewise. * lto-compress.c: Likewise. * lto-opts.c: Likewise. * lto-section-in.c: Likewise. * lto-section-out.c: Likewise. * lto-streamer-in.c: Likewise. * lto-streamer-out.c: Likewise. * lto-streamer.c: Likewise. * mcf.c: Likewise. * mode-switching.c: Likewise. * modulo-sched.c: Likewise. * omega.c: Likewise. * omp-low.c: Likewise. * optabs.c: Likewise. * opts-global.c: Likewise. * passes.c: Likewise. * plugin.c: Likewise. * postreload-gcse.c: Likewise. * postreload.c: Likewise. * predict.c: Likewise. * print-rtl.c: Likewise. * print-tree.c: Likewise. * profile.c: Likewise. * real.c: Likewise. * realmpfr.c: Likewise. * realmpfr.h: Likewise. * recog.c: Likewise. * ree.c: Likewise. * reg-stack.c: Likewise. * regcprop.c: Likewise. * reginfo.c: Likewise. * regrename.c: Likewise. * regs.h: Likewise. * regstat.c: Likewise. * reload.c: Likewise. * reload1.c: Likewise. * reorg.c: Likewise. * resource.c: Likewise. * rtl-chkp.c: Likewise. * rtlanal.c: Likewise. * rtlhooks.c: Likewise. * sanopt.c: Likewise. * sched-deps.c: Likewise. * sched-ebb.c: Likewise. * sched-rgn.c: Likewise. * sched-vis.c: Likewise. * sdbout.c: Likewise. * sel-sched-dump.c: Likewise. * sel-sched-ir.c: Likewise. * sel-sched.c: Likewise. * sese.c: Likewise. * shrink-wrap.c: Likewise. * shrink-wrap.h: Likewise. * simplify-rtx.c: Likewise. * stack-ptr-mod.c: Likewise. * statistics.c: Likewise. * stmt.c: Likewise. * stor-layout.c: Likewise. * store-motion.c: Likewise. * stringpool.c: Likewise. * symtab.c: Likewise. * target-globals.c: Likewise. * targhooks.c: Likewise. * toplev.c: Likewise. * tracer.c: Likewise. * trans-mem.c: Likewise. * tree-affine.c: Likewise. * tree-affine.h: Likewise. * tree-browser.c: Likewise. * tree-call-cdce.c: Likewise. * tree-cfg.c: Likewise. * tree-cfgcleanup.c: Likewise. * tree-chkp-opt.c: Likewise. * tree-chkp.c: Likewise. * tree-chrec.c: Likewise. * tree-complex.c: Likewise. * tree-data-ref.c: Likewise. * tree-dfa.c: Likewise. * tree-diagnostic.c: Likewise. * tree-dump.c: Likewise. * tree-eh.c: Likewise. * tree-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-pretty-print.h: 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-loop.h: 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-print.cc: Likewise. * wide-int-print.h: Likewise. * wide-int.cc: Likewise. * xcoffout.c: Likewise. * config/aarch64/aarch64-builtins.c: Likewise. * config/aarch64/aarch64.c: Likewise. * config/aarch64/cortex-a57-fma-steering.c: Likewise. * config/alpha/alpha.c: Likewise. * config/arc/arc.c: Likewise. * config/arm/aarch-common.c: Likewise. * config/arm/arm-builtins.c: Likewise. * config/arm/arm-c.c: Likewise. * config/arm/arm.c: Likewise. * config/avr/avr-c.c: Likewise. * config/avr/avr-log.c: Likewise. * config/avr/avr.c: Likewise. * config/bfin/bfin.c: Likewise. * config/c6x/c6x.c: Likewise. * config/cr16/cr16.c: Likewise. * config/cris/cris.c: Likewise. * config/darwin-c.c: Likewise. * config/darwin.c: Likewise. * config/default-c.c: Likewise. * config/epiphany/epiphany.c: Likewise. * config/epiphany/mode-switch-use.c: Likewise. * config/epiphany/resolve-sw-modes.c: Likewise. * config/fr30/fr30.c: Likewise. * config/frv/frv.c: Likewise. * config/ft32/ft32.c: Likewise. * config/glibc-c.c: Likewise. * config/h8300/h8300.c: Likewise. * config/i386/i386-c.c: Likewise. * config/i386/i386.c: Likewise. * config/i386/msformat-c.c: Likewise. * config/i386/winnt-cxx.c: Likewise. * config/i386/winnt-stubs.c: Likewise. * config/i386/winnt.c: Likewise. * config/ia64/ia64-c.c: Likewise. * config/ia64/ia64.c: Likewise. * config/iq2000/iq2000.c: Likewise. * config/lm32/lm32.c: Likewise. * config/m32c/m32c-pragma.c: Likewise. * config/m32c/m32c.c: Likewise. * config/m32r/m32r.c: Likewise. * config/m68k/m68k.c: Likewise. * config/mcore/mcore.c: Likewise. * config/mep/mep-pragma.c: Likewise. * config/mep/mep.c: Likewise. * config/microblaze/microblaze-c.c: Likewise. * config/microblaze/microblaze.c: Likewise. * config/mips/mips.c: Likewise. * config/mmix/mmix.c: Likewise. * config/mn10300/mn10300.c: Likewise. * config/moxie/moxie.c: Likewise. * config/msp430/msp430-c.c: Likewise. * config/msp430/msp430.c: Likewise. * config/nds32/nds32-cost.c: Likewise. * config/nds32/nds32-fp-as-gp.c: Likewise. * config/nds32/nds32-intrinsic.c: Likewise. * config/nds32/nds32-isr.c: Likewise. * config/nds32/nds32-md-auxiliary.c: Likewise. * config/nds32/nds32-memory-manipulation.c: Likewise. * config/nds32/nds32-pipelines-auxiliary.c: Likewise. * config/nds32/nds32-predicates.c: Likewise. * config/nds32/nds32.c: Likewise. * config/nios2/nios2.c: Likewise. * config/nvptx/nvptx.c: Likewise. * config/pa/pa.c: Likewise. * config/pdp11/pdp11.c: Likewise. * config/rl78/rl78-c.c: Likewise. * config/rl78/rl78.c: Likewise. * config/rs6000/rs6000-c.c: Likewise. * config/rs6000/rs6000.c: Likewise. * config/rx/rx.c: Likewise. * config/s390/s390-c.c: Likewise. * config/s390/s390.c: Likewise. * config/sh/sh-c.c: Likewise. * config/sh/sh-mem.cc: Likewise. * config/sh/sh.c: Likewise. * config/sh/sh_optimize_sett_clrt.cc: Likewise. * config/sh/sh_treg_combine.cc: Likewise. * config/sol2-c.c: Likewise. * config/sol2-cxx.c: Likewise. * config/sol2-stubs.c: Likewise. * config/sol2.c: Likewise. * config/sparc/sparc-c.c: Likewise. * config/sparc/sparc.c: Likewise. * config/spu/spu-c.c: Likewise. * config/spu/spu.c: Likewise. * config/stormy16/stormy16.c: Likewise. * config/tilegx/mul-tables.c: Likewise. * config/tilegx/tilegx-c.c: Likewise. * config/tilegx/tilegx.c: Likewise. * config/tilepro/mul-tables.c: Likewise. * config/tilepro/tilepro-c.c: Likewise. * config/tilepro/tilepro.c: Likewise. * config/v850/v850-c.c: Likewise. * config/v850/v850.c: Likewise. * config/vax/vax.c: Likewise. * config/visium/visium.c: Likewise. * config/vms/vms-c.c: Likewise. * config/vms/vms.c: Likewise. * config/vxworks.c: Likewise. * config/winnt-c.c: Likewise. * config/xtensa/xtensa.c: Likewise. * common/config/bfin/bfin-common.c: Likewise. ada 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * gcc-interface/cuintp.c: Adjust includes for restructured coretypes.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. c 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * c-array-notation.c: Adjust includes for restructured coretypes.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. c-family 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * array-notation-common.c: Adjust includes for restructured coretypes.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. cp 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * call.c: Adjust includes for restructured coretypes.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. fortran 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * convert.c: Adjust includes for restructured coretypes.h. * cpp.c: Likewise. * decl.c: Likewise. * f95-lang.c: Likewise. * iresolve.c: Likewise. * match.c: Likewise. * module.c: Likewise. * options.c: Likewise. * target-memory.c: Likewise. * trans-array.c: Likewise. * trans-common.c: Likewise. * trans-const.c: Likewise. * trans-decl.c: Likewise. * trans-expr.c: Likewise. * trans-intrinsic.c: Likewise. * trans-io.c: Likewise. * trans-openmp.c: Likewise. * trans-stmt.c: Likewise. * trans-types.c: Likewise. * trans.c: Likewise. go 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * go-backend.c: Adjust includes for restructured coretypes.h. * go-c.h: Likewise. * go-gcc.cc: Likewise. * go-lang.c: Likewise. java 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * boehm.c: Adjust includes for restructured coretypes.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. jit 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * dummy-frontend.c: Adjust includes for restructured coretypes.h. * jit-common.h: Likewise. * jit-playback.c: Likewise. lto 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * lto-lang.c: Adjust includes for restructured coretypes.h. * lto-object.c: Likewise. * lto-partition.c: Likewise. * lto-symtab.c: Likewise. * lto.c: Likewise. objc 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * objc-act.c: Adjust includes for restructured coretypes.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. objcp 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * objcp-decl.c: Adjust includes for restructured coretypes.h. * objcp-lang.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224136 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog436
-rw-r--r--gcc/ada/ChangeLog10
-rw-r--r--gcc/ada/gcc-interface/cuintp.c3
-rw-r--r--gcc/ada/gcc-interface/decl.c3
-rw-r--r--gcc/ada/gcc-interface/misc.c5
-rw-r--r--gcc/ada/gcc-interface/targtyps.c3
-rw-r--r--gcc/ada/gcc-interface/trans.c4
-rw-r--r--gcc/ada/gcc-interface/utils.c3
-rw-r--r--gcc/ada/gcc-interface/utils2.c3
-rw-r--r--gcc/alias.c5
-rw-r--r--gcc/asan.c5
-rw-r--r--gcc/attribs.c2
-rw-r--r--gcc/auto-inc-dec.c5
-rw-r--r--gcc/auto-profile.c4
-rw-r--r--gcc/bb-reorder.c5
-rw-r--r--gcc/bt-load.c5
-rw-r--r--gcc/builtins.c5
-rw-r--r--gcc/c-family/ChangeLog24
-rw-r--r--gcc/c-family/array-notation-common.c3
-rw-r--r--gcc/c-family/c-ada-spec.c4
-rw-r--r--gcc/c-family/c-cilkplus.c3
-rw-r--r--gcc/c-family/c-common.c1
-rw-r--r--gcc/c-family/c-common.h5
-rw-r--r--gcc/c-family/c-cppbuiltin.c3
-rw-r--r--gcc/c-family/c-dump.c3
-rw-r--r--gcc/c-family/c-format.c4
-rw-r--r--gcc/c-family/c-gimplify.c4
-rw-r--r--gcc/c-family/c-indentation.c3
-rw-r--r--gcc/c-family/c-lex.c4
-rw-r--r--gcc/c-family/c-omp.c3
-rw-r--r--gcc/c-family/c-opts.c3
-rw-r--r--gcc/c-family/c-pch.c3
-rw-r--r--gcc/c-family/c-ppoutput.c3
-rw-r--r--gcc/c-family/c-pragma.c4
-rw-r--r--gcc/c-family/c-pretty-print.c3
-rw-r--r--gcc/c-family/c-semantics.c3
-rw-r--r--gcc/c-family/c-ubsan.c4
-rw-r--r--gcc/c-family/cilk.c4
-rw-r--r--gcc/c-family/stub-objc.c2
-rw-r--r--gcc/c/ChangeLog12
-rw-r--r--gcc/c/c-array-notation.c2
-rw-r--r--gcc/c/c-aux-info.c2
-rw-r--r--gcc/c/c-convert.c2
-rw-r--r--gcc/c/c-decl.c3
-rw-r--r--gcc/c/c-errors.c2
-rw-r--r--gcc/c/c-lang.c1
-rw-r--r--gcc/c/c-objc-common.c2
-rw-r--r--gcc/c/c-parser.c3
-rw-r--r--gcc/c/c-typeck.c6
-rw-r--r--gcc/caller-save.c5
-rw-r--r--gcc/calls.c5
-rw-r--r--gcc/ccmp.c5
-rw-r--r--gcc/cfg.c4
-rw-r--r--gcc/cfganal.c1
-rw-r--r--gcc/cfgbuild.c5
-rw-r--r--gcc/cfgcleanup.c5
-rw-r--r--gcc/cfgexpand.c5
-rw-r--r--gcc/cfghooks.c4
-rw-r--r--gcc/cfgloop.c1
-rw-r--r--gcc/cfgloop.h3
-rw-r--r--gcc/cfgloopanal.c5
-rw-r--r--gcc/cfgloopmanip.c1
-rw-r--r--gcc/cfgrtl.c5
-rw-r--r--gcc/cgraph.c5
-rw-r--r--gcc/cgraphbuild.c3
-rw-r--r--gcc/cgraphclones.c3
-rw-r--r--gcc/cgraphunit.c3
-rw-r--r--gcc/cilk-common.c5
-rw-r--r--gcc/combine-stack-adj.c5
-rw-r--r--gcc/combine.c5
-rw-r--r--gcc/common/config/bfin/bfin-common.c1
-rw-r--r--gcc/compare-elim.c1
-rw-r--r--gcc/config/aarch64/aarch64-builtins.c5
-rw-r--r--gcc/config/aarch64/aarch64.c5
-rw-r--r--gcc/config/aarch64/cortex-a57-fma-steering.c1
-rw-r--r--gcc/config/alpha/alpha.c5
-rw-r--r--gcc/config/arc/arc.c5
-rw-r--r--gcc/config/arm/aarch-common.c3
-rw-r--r--gcc/config/arm/arm-builtins.c5
-rw-r--r--gcc/config/arm/arm-c.c3
-rw-r--r--gcc/config/arm/arm.c5
-rw-r--r--gcc/config/avr/avr-c.c3
-rw-r--r--gcc/config/avr/avr-log.c3
-rw-r--r--gcc/config/avr/avr.c5
-rw-r--r--gcc/config/bfin/bfin.c5
-rw-r--r--gcc/config/c6x/c6x.c5
-rw-r--r--gcc/config/cr16/cr16.c5
-rw-r--r--gcc/config/cris/cris.c5
-rw-r--r--gcc/config/darwin-c.c4
-rw-r--r--gcc/config/darwin.c5
-rw-r--r--gcc/config/default-c.c3
-rw-r--r--gcc/config/epiphany/epiphany.c5
-rw-r--r--gcc/config/epiphany/mode-switch-use.c1
-rw-r--r--gcc/config/epiphany/resolve-sw-modes.c1
-rw-r--r--gcc/config/fr30/fr30.c5
-rw-r--r--gcc/config/frv/frv.c5
-rw-r--r--gcc/config/ft32/ft32.c3
-rw-r--r--gcc/config/glibc-c.c3
-rw-r--r--gcc/config/h8300/h8300.c5
-rw-r--r--gcc/config/i386/i386-c.c3
-rw-r--r--gcc/config/i386/i386.c5
-rw-r--r--gcc/config/i386/msformat-c.c3
-rw-r--r--gcc/config/i386/winnt-cxx.c3
-rw-r--r--gcc/config/i386/winnt-stubs.c3
-rw-r--r--gcc/config/i386/winnt.c3
-rw-r--r--gcc/config/ia64/ia64-c.c3
-rw-r--r--gcc/config/ia64/ia64.c5
-rw-r--r--gcc/config/iq2000/iq2000.c5
-rw-r--r--gcc/config/lm32/lm32.c5
-rw-r--r--gcc/config/m32c/m32c-pragma.c3
-rw-r--r--gcc/config/m32c/m32c.c5
-rw-r--r--gcc/config/m32r/m32r.c5
-rw-r--r--gcc/config/m68k/m68k.c5
-rw-r--r--gcc/config/mcore/mcore.c5
-rw-r--r--gcc/config/mep/mep-pragma.c3
-rw-r--r--gcc/config/mep/mep.c5
-rw-r--r--gcc/config/microblaze/microblaze-c.c3
-rw-r--r--gcc/config/microblaze/microblaze.c5
-rw-r--r--gcc/config/mips/mips.c5
-rw-r--r--gcc/config/mmix/mmix.c5
-rw-r--r--gcc/config/mn10300/mn10300.c5
-rw-r--r--gcc/config/moxie/moxie.c5
-rw-r--r--gcc/config/msp430/msp430-c.c3
-rw-r--r--gcc/config/msp430/msp430.c5
-rw-r--r--gcc/config/nds32/nds32-cost.c5
-rw-r--r--gcc/config/nds32/nds32-fp-as-gp.c5
-rw-r--r--gcc/config/nds32/nds32-intrinsic.c5
-rw-r--r--gcc/config/nds32/nds32-isr.c5
-rw-r--r--gcc/config/nds32/nds32-md-auxiliary.c5
-rw-r--r--gcc/config/nds32/nds32-memory-manipulation.c5
-rw-r--r--gcc/config/nds32/nds32-pipelines-auxiliary.c5
-rw-r--r--gcc/config/nds32/nds32-predicates.c5
-rw-r--r--gcc/config/nds32/nds32.c5
-rw-r--r--gcc/config/nios2/nios2.c5
-rw-r--r--gcc/config/nvptx/nvptx.c5
-rw-r--r--gcc/config/pa/pa.c5
-rw-r--r--gcc/config/pdp11/pdp11.c5
-rw-r--r--gcc/config/rl78/rl78-c.c3
-rw-r--r--gcc/config/rl78/rl78.c5
-rw-r--r--gcc/config/rs6000/rs6000-c.c4
-rw-r--r--gcc/config/rs6000/rs6000.c5
-rw-r--r--gcc/config/rx/rx.c5
-rw-r--r--gcc/config/s390/s390-c.c3
-rw-r--r--gcc/config/s390/s390.c5
-rw-r--r--gcc/config/sh/sh-c.c3
-rw-r--r--gcc/config/sh/sh-mem.cc5
-rw-r--r--gcc/config/sh/sh.c5
-rw-r--r--gcc/config/sh/sh_optimize_sett_clrt.cc1
-rw-r--r--gcc/config/sh/sh_treg_combine.cc5
-rw-r--r--gcc/config/sol2-c.c3
-rw-r--r--gcc/config/sol2-cxx.c3
-rw-r--r--gcc/config/sol2-stubs.c3
-rw-r--r--gcc/config/sol2.c3
-rw-r--r--gcc/config/sparc/sparc-c.c3
-rw-r--r--gcc/config/sparc/sparc.c5
-rw-r--r--gcc/config/spu/spu-c.c3
-rw-r--r--gcc/config/spu/spu.c5
-rw-r--r--gcc/config/stormy16/stormy16.c5
-rw-r--r--gcc/config/tilegx/mul-tables.c5
-rw-r--r--gcc/config/tilegx/tilegx-c.c4
-rw-r--r--gcc/config/tilegx/tilegx.c5
-rw-r--r--gcc/config/tilepro/mul-tables.c5
-rw-r--r--gcc/config/tilepro/tilepro-c.c4
-rw-r--r--gcc/config/tilepro/tilepro.c5
-rw-r--r--gcc/config/v850/v850-c.c3
-rw-r--r--gcc/config/v850/v850.c5
-rw-r--r--gcc/config/vax/vax.c5
-rw-r--r--gcc/config/visium/visium.c5
-rw-r--r--gcc/config/vms/vms-c.c3
-rw-r--r--gcc/config/vms/vms.c3
-rw-r--r--gcc/config/vxworks.c3
-rw-r--r--gcc/config/winnt-c.c3
-rw-r--r--gcc/config/xtensa/xtensa.c5
-rw-r--r--gcc/convert.c5
-rw-r--r--gcc/coretypes.h10
-rw-r--r--gcc/coverage.c5
-rw-r--r--gcc/cp/ChangeLog38
-rw-r--r--gcc/cp/call.c4
-rw-r--r--gcc/cp/class.c4
-rw-r--r--gcc/cp/constexpr.c3
-rw-r--r--gcc/cp/cp-array-notation.c3
-rw-r--r--gcc/cp/cp-gimplify.c3
-rw-r--r--gcc/cp/cp-lang.c3
-rw-r--r--gcc/cp/cp-objcp-common.c3
-rw-r--r--gcc/cp/cp-tree.h1
-rw-r--r--gcc/cp/cp-ubsan.c3
-rw-r--r--gcc/cp/cvt.c3
-rw-r--r--gcc/cp/decl.c4
-rw-r--r--gcc/cp/decl2.c3
-rw-r--r--gcc/cp/dump.c3
-rw-r--r--gcc/cp/error.c3
-rw-r--r--gcc/cp/except.c3
-rw-r--r--gcc/cp/expr.c3
-rw-r--r--gcc/cp/friend.c3
-rw-r--r--gcc/cp/init.c4
-rw-r--r--gcc/cp/lambda.c3
-rw-r--r--gcc/cp/lex.c3
-rw-r--r--gcc/cp/mangle.c4
-rw-r--r--gcc/cp/method.c3
-rw-r--r--gcc/cp/name-lookup.c3
-rw-r--r--gcc/cp/optimize.c3
-rw-r--r--gcc/cp/parser.c3
-rw-r--r--gcc/cp/pt.c3
-rw-r--r--gcc/cp/ptree.c3
-rw-r--r--gcc/cp/repo.c3
-rw-r--r--gcc/cp/rtti.c3
-rw-r--r--gcc/cp/search.c3
-rw-r--r--gcc/cp/semantics.c3
-rw-r--r--gcc/cp/tree.c4
-rw-r--r--gcc/cp/typeck.c3
-rw-r--r--gcc/cp/typeck2.c4
-rw-r--r--gcc/cp/vtable-class-hierarchy.c1
-rw-r--r--gcc/cppbuiltin.c3
-rw-r--r--gcc/cprop.c5
-rw-r--r--gcc/cse.c5
-rw-r--r--gcc/cselib.c3
-rw-r--r--gcc/data-streamer-in.c3
-rw-r--r--gcc/data-streamer-out.c3
-rw-r--r--gcc/data-streamer.c3
-rw-r--r--gcc/dbxout.c5
-rw-r--r--gcc/dce.c3
-rw-r--r--gcc/ddg.c5
-rw-r--r--gcc/debug.c3
-rw-r--r--gcc/df-core.c1
-rw-r--r--gcc/df-problems.c1
-rw-r--r--gcc/df-scan.c3
-rw-r--r--gcc/df.h1
-rw-r--r--gcc/dfp.c5
-rw-r--r--gcc/dojump.c5
-rw-r--r--gcc/dominance.c1
-rw-r--r--gcc/domwalk.c1
-rw-r--r--gcc/double-int.c4
-rw-r--r--gcc/double-int.h2
-rw-r--r--gcc/dse.c5
-rw-r--r--gcc/dumpfile.c4
-rw-r--r--gcc/dwarf2asm.c4
-rw-r--r--gcc/dwarf2cfi.c5
-rw-r--r--gcc/dwarf2out.c5
-rw-r--r--gcc/dwarf2out.h1
-rw-r--r--gcc/emit-rtl.c5
-rw-r--r--gcc/et-forest.c1
-rw-r--r--gcc/except.c5
-rw-r--r--gcc/explow.c5
-rw-r--r--gcc/expmed.c5
-rw-r--r--gcc/expr.c5
-rw-r--r--gcc/final.c5
-rw-r--r--gcc/fixed-value.c5
-rw-r--r--gcc/fixed-value.h4
-rw-r--r--gcc/fold-const.c5
-rw-r--r--gcc/fortran/ChangeLog23
-rw-r--r--gcc/fortran/convert.c3
-rw-r--r--gcc/fortran/cpp.c3
-rw-r--r--gcc/fortran/decl.c3
-rw-r--r--gcc/fortran/f95-lang.c3
-rw-r--r--gcc/fortran/iresolve.c3
-rw-r--r--gcc/fortran/match.c3
-rw-r--r--gcc/fortran/module.c3
-rw-r--r--gcc/fortran/options.c3
-rw-r--r--gcc/fortran/target-memory.c3
-rw-r--r--gcc/fortran/trans-array.c4
-rw-r--r--gcc/fortran/trans-common.c3
-rw-r--r--gcc/fortran/trans-const.c5
-rw-r--r--gcc/fortran/trans-decl.c3
-rw-r--r--gcc/fortran/trans-expr.c3
-rw-r--r--gcc/fortran/trans-intrinsic.c4
-rw-r--r--gcc/fortran/trans-io.c3
-rw-r--r--gcc/fortran/trans-openmp.c3
-rw-r--r--gcc/fortran/trans-stmt.c3
-rw-r--r--gcc/fortran/trans-types.c4
-rw-r--r--gcc/fortran/trans.c3
-rw-r--r--gcc/function.c5
-rw-r--r--gcc/fwprop.c1
-rw-r--r--gcc/gcc-plugin.h5
-rw-r--r--gcc/gcse.c5
-rw-r--r--gcc/generic-match-head.c5
-rw-r--r--gcc/ggc-page.c4
-rw-r--r--gcc/gimple-builder.c3
-rw-r--r--gcc/gimple-expr.c3
-rw-r--r--gcc/gimple-fold.c5
-rw-r--r--gcc/gimple-iterator.c3
-rw-r--r--gcc/gimple-low.c3
-rw-r--r--gcc/gimple-match-head.c5
-rw-r--r--gcc/gimple-pretty-print.c3
-rw-r--r--gcc/gimple-ssa-isolate-paths.c3
-rw-r--r--gcc/gimple-ssa-strength-reduction.c5
-rw-r--r--gcc/gimple-streamer-in.c3
-rw-r--r--gcc/gimple-streamer-out.c3
-rw-r--r--gcc/gimple-streamer.h1
-rw-r--r--gcc/gimple-walk.c1
-rw-r--r--gcc/gimple.c3
-rw-r--r--gcc/gimplify-me.c3
-rw-r--r--gcc/gimplify.c5
-rw-r--r--gcc/go/ChangeLog7
-rw-r--r--gcc/go/go-backend.c3
-rw-r--r--gcc/go/go-c.h1
-rw-r--r--gcc/go/go-gcc.cc4
-rw-r--r--gcc/go/go-lang.c3
-rw-r--r--gcc/godump.c3
-rw-r--r--gcc/graph.c1
-rw-r--r--gcc/graphite-blocking.c3
-rw-r--r--gcc/graphite-dependences.c3
-rw-r--r--gcc/graphite-interchange.c3
-rw-r--r--gcc/graphite-isl-ast-to-gimple.c3
-rw-r--r--gcc/graphite-optimize-isl.c3
-rw-r--r--gcc/graphite-poly.c3
-rw-r--r--gcc/graphite-scop-detection.c3
-rw-r--r--gcc/graphite-sese-to-poly.c5
-rw-r--r--gcc/graphite.c3
-rw-r--r--gcc/haifa-sched.c1
-rw-r--r--gcc/hooks.h2
-rw-r--r--gcc/hw-doloop.c5
-rw-r--r--gcc/ifcvt.c5
-rw-r--r--gcc/inchash.h7
-rw-r--r--gcc/incpath.c1
-rw-r--r--gcc/init-regs.c5
-rw-r--r--gcc/internal-fn.c5
-rw-r--r--gcc/internal-fn.h2
-rw-r--r--gcc/ipa-chkp.c3
-rw-r--r--gcc/ipa-comdats.c3
-rw-r--r--gcc/ipa-cp.c3
-rw-r--r--gcc/ipa-devirt.c5
-rw-r--r--gcc/ipa-icf-gimple.c5
-rw-r--r--gcc/ipa-icf.c5
-rw-r--r--gcc/ipa-inline-analysis.c4
-rw-r--r--gcc/ipa-inline-transform.c3
-rw-r--r--gcc/ipa-inline.c3
-rw-r--r--gcc/ipa-polymorphic-call.c5
-rw-r--r--gcc/ipa-profile.c3
-rw-r--r--gcc/ipa-prop.c5
-rw-r--r--gcc/ipa-pure-const.c3
-rw-r--r--gcc/ipa-ref.c3
-rw-r--r--gcc/ipa-reference.c3
-rw-r--r--gcc/ipa-split.c5
-rw-r--r--gcc/ipa-utils.c3
-rw-r--r--gcc/ipa-visibility.c3
-rw-r--r--gcc/ipa.c3
-rw-r--r--gcc/ira-build.c1
-rw-r--r--gcc/ira-color.c5
-rw-r--r--gcc/ira-conflicts.c1
-rw-r--r--gcc/ira-costs.c5
-rw-r--r--gcc/ira-emit.c5
-rw-r--r--gcc/ira-lives.c1
-rw-r--r--gcc/ira.c5
-rw-r--r--gcc/java/ChangeLog22
-rw-r--r--gcc/java/boehm.c3
-rw-r--r--gcc/java/builtins.c5
-rw-r--r--gcc/java/class.c3
-rw-r--r--gcc/java/constants.c3
-rw-r--r--gcc/java/decl.c4
-rw-r--r--gcc/java/except.c3
-rw-r--r--gcc/java/expr.c4
-rw-r--r--gcc/java/java-gimplify.c3
-rw-r--r--gcc/java/jcf-dump.c3
-rw-r--r--gcc/java/jcf-io.c3
-rw-r--r--gcc/java/jcf-parse.c5
-rw-r--r--gcc/java/jvgenmain.c3
-rw-r--r--gcc/java/lang.c3
-rw-r--r--gcc/java/mangle.c3
-rw-r--r--gcc/java/mangle_name.c3
-rw-r--r--gcc/java/resource.c3
-rw-r--r--gcc/java/typeck.c3
-rw-r--r--gcc/java/verify-glue.c3
-rw-r--r--gcc/java/verify-impl.c3
-rw-r--r--gcc/jit/ChangeLog6
-rw-r--r--gcc/jit/dummy-frontend.c3
-rw-r--r--gcc/jit/jit-common.h1
-rw-r--r--gcc/jit/jit-playback.c5
-rw-r--r--gcc/jump.c5
-rw-r--r--gcc/langhooks.c3
-rw-r--r--gcc/lcm.c1
-rw-r--r--gcc/loop-doloop.c5
-rw-r--r--gcc/loop-init.c3
-rw-r--r--gcc/loop-invariant.c5
-rw-r--r--gcc/loop-iv.c5
-rw-r--r--gcc/loop-unroll.c5
-rw-r--r--gcc/lower-subreg.c5
-rw-r--r--gcc/lra-assigns.c5
-rw-r--r--gcc/lra-coalesce.c5
-rw-r--r--gcc/lra-constraints.c5
-rw-r--r--gcc/lra-eliminations.c5
-rw-r--r--gcc/lra-lives.c5
-rw-r--r--gcc/lra-remat.c5
-rw-r--r--gcc/lra-spills.c5
-rw-r--r--gcc/lra.c5
-rw-r--r--gcc/lto-cgraph.c5
-rw-r--r--gcc/lto-compress.c3
-rw-r--r--gcc/lto-opts.c3
-rw-r--r--gcc/lto-section-in.c5
-rw-r--r--gcc/lto-section-out.c5
-rw-r--r--gcc/lto-streamer-in.c5
-rw-r--r--gcc/lto-streamer-out.c5
-rw-r--r--gcc/lto-streamer.c3
-rw-r--r--gcc/lto/ChangeLog8
-rw-r--r--gcc/lto/lto-lang.c3
-rw-r--r--gcc/lto/lto-object.c3
-rw-r--r--gcc/lto/lto-partition.c3
-rw-r--r--gcc/lto/lto-symtab.c3
-rw-r--r--gcc/lto/lto.c5
-rw-r--r--gcc/mcf.c1
-rw-r--r--gcc/mode-switching.c1
-rw-r--r--gcc/modulo-sched.c5
-rw-r--r--gcc/objc/ChangeLog11
-rw-r--r--gcc/objc/objc-act.c4
-rw-r--r--gcc/objc/objc-encoding.c3
-rw-r--r--gcc/objc/objc-gnu-runtime-abi-01.c3
-rw-r--r--gcc/objc/objc-lang.c3
-rw-r--r--gcc/objc/objc-map.c3
-rw-r--r--gcc/objc/objc-next-runtime-abi-01.c3
-rw-r--r--gcc/objc/objc-next-runtime-abi-02.c3
-rw-r--r--gcc/objc/objc-runtime-shared-support.c3
-rw-r--r--gcc/objcp/ChangeLog5
-rw-r--r--gcc/objcp/objcp-decl.c3
-rw-r--r--gcc/objcp/objcp-lang.c3
-rw-r--r--gcc/omega.c3
-rw-r--r--gcc/omp-low.c5
-rw-r--r--gcc/optabs.c5
-rw-r--r--gcc/opts-global.c3
-rw-r--r--gcc/passes.c5
-rw-r--r--gcc/plugin.c3
-rw-r--r--gcc/postreload-gcse.c5
-rw-r--r--gcc/postreload.c5
-rw-r--r--gcc/predict.c5
-rw-r--r--gcc/print-rtl.c3
-rw-r--r--gcc/print-tree.c5
-rw-r--r--gcc/profile.c5
-rw-r--r--gcc/real.c5
-rw-r--r--gcc/real.h5
-rw-r--r--gcc/realmpfr.c3
-rw-r--r--gcc/realmpfr.h1
-rw-r--r--gcc/recog.c5
-rw-r--r--gcc/ree.c5
-rw-r--r--gcc/reg-stack.c3
-rw-r--r--gcc/regcprop.c1
-rw-r--r--gcc/reginfo.c5
-rw-r--r--gcc/regrename.c1
-rw-r--r--gcc/regs.h1
-rw-r--r--gcc/regstat.c1
-rw-r--r--gcc/reload.c5
-rw-r--r--gcc/reload1.c5
-rw-r--r--gcc/reorg.c5
-rw-r--r--gcc/resource.c1
-rw-r--r--gcc/rtl-chkp.c5
-rw-r--r--gcc/rtl.h16
-rw-r--r--gcc/rtlanal.c2
-rw-r--r--gcc/rtlhooks.c5
-rw-r--r--gcc/sanopt.c3
-rw-r--r--gcc/sched-deps.c3
-rw-r--r--gcc/sched-ebb.c1
-rw-r--r--gcc/sched-rgn.c1
-rw-r--r--gcc/sched-vis.c4
-rw-r--r--gcc/sdbout.c3
-rw-r--r--gcc/sel-sched-dump.c1
-rw-r--r--gcc/sel-sched-ir.c2
-rw-r--r--gcc/sel-sched.c2
-rw-r--r--gcc/sese.c3
-rw-r--r--gcc/shrink-wrap.c5
-rw-r--r--gcc/shrink-wrap.h1
-rw-r--r--gcc/simplify-rtx.c5
-rw-r--r--gcc/stack-ptr-mod.c5
-rw-r--r--gcc/statistics.c1
-rw-r--r--gcc/stmt.c5
-rw-r--r--gcc/stor-layout.c5
-rw-r--r--gcc/store-motion.c5
-rw-r--r--gcc/stringpool.c3
-rw-r--r--gcc/symtab.c3
-rw-r--r--gcc/target-globals.c5
-rw-r--r--gcc/target.h2
-rw-r--r--gcc/targhooks.c5
-rw-r--r--gcc/toplev.c5
-rw-r--r--gcc/tracer.c3
-rw-r--r--gcc/trans-mem.c3
-rw-r--r--gcc/tree-affine.c5
-rw-r--r--gcc/tree-affine.h1
-rw-r--r--gcc/tree-browser.c3
-rw-r--r--gcc/tree-call-cdce.c4
-rw-r--r--gcc/tree-cfg.c5
-rw-r--r--gcc/tree-cfgcleanup.c5
-rw-r--r--gcc/tree-chkp-opt.c5
-rw-r--r--gcc/tree-chkp.c5
-rw-r--r--gcc/tree-chrec.c4
-rw-r--r--gcc/tree-complex.c5
-rw-r--r--gcc/tree-data-ref.c5
-rw-r--r--gcc/tree-dfa.c5
-rw-r--r--gcc/tree-diagnostic.c3
-rw-r--r--gcc/tree-dump.c5
-rw-r--r--gcc/tree-eh.c5
-rw-r--r--gcc/tree-emutls.c3
-rw-r--r--gcc/tree-if-conv.c5
-rw-r--r--gcc/tree-inline.c5
-rw-r--r--gcc/tree-into-ssa.c5
-rw-r--r--gcc/tree-iterator.c3
-rw-r--r--gcc/tree-loop-distribution.c3
-rw-r--r--gcc/tree-nested.c5
-rw-r--r--gcc/tree-nrv.c3
-rw-r--r--gcc/tree-object-size.c3
-rw-r--r--gcc/tree-outof-ssa.c5
-rw-r--r--gcc/tree-parloops.c3
-rw-r--r--gcc/tree-phinodes.c3
-rw-r--r--gcc/tree-predcom.c5
-rw-r--r--gcc/tree-pretty-print.c5
-rw-r--r--gcc/tree-pretty-print.h1
-rw-r--r--gcc/tree-profile.c3
-rw-r--r--gcc/tree-scalar-evolution.c5
-rw-r--r--gcc/tree-sra.c5
-rw-r--r--gcc/tree-ssa-address.c5
-rw-r--r--gcc/tree-ssa-alias.c5
-rw-r--r--gcc/tree-ssa-ccp.c4
-rw-r--r--gcc/tree-ssa-coalesce.c3
-rw-r--r--gcc/tree-ssa-copy.c3
-rw-r--r--gcc/tree-ssa-copyrename.c5
-rw-r--r--gcc/tree-ssa-dce.c5
-rw-r--r--gcc/tree-ssa-dom.c4
-rw-r--r--gcc/tree-ssa-dse.c5
-rw-r--r--gcc/tree-ssa-forwprop.c5
-rw-r--r--gcc/tree-ssa-ifcombine.c3
-rw-r--r--gcc/tree-ssa-live.c5
-rw-r--r--gcc/tree-ssa-loop-ch.c3
-rw-r--r--gcc/tree-ssa-loop-im.c3
-rw-r--r--gcc/tree-ssa-loop-ivcanon.c3
-rw-r--r--gcc/tree-ssa-loop-ivopts.c5
-rw-r--r--gcc/tree-ssa-loop-manip.c3
-rw-r--r--gcc/tree-ssa-loop-niter.c5
-rw-r--r--gcc/tree-ssa-loop-prefetch.c5
-rw-r--r--gcc/tree-ssa-loop-unswitch.c3
-rw-r--r--gcc/tree-ssa-loop.c3
-rw-r--r--gcc/tree-ssa-loop.h1
-rw-r--r--gcc/tree-ssa-math-opts.c5
-rw-r--r--gcc/tree-ssa-operands.c3
-rw-r--r--gcc/tree-ssa-phiopt.c5
-rw-r--r--gcc/tree-ssa-phiprop.c3
-rw-r--r--gcc/tree-ssa-pre.c5
-rw-r--r--gcc/tree-ssa-propagate.c3
-rw-r--r--gcc/tree-ssa-reassoc.c5
-rw-r--r--gcc/tree-ssa-sccvn.c5
-rw-r--r--gcc/tree-ssa-scopedtables.c4
-rw-r--r--gcc/tree-ssa-sink.c3
-rw-r--r--gcc/tree-ssa-strlen.c5
-rw-r--r--gcc/tree-ssa-structalias.c5
-rw-r--r--gcc/tree-ssa-tail-merge.c4
-rw-r--r--gcc/tree-ssa-ter.c4
-rw-r--r--gcc/tree-ssa-threadedge.c3
-rw-r--r--gcc/tree-ssa-threadupdate.c3
-rw-r--r--gcc/tree-ssa-uncprop.c4
-rw-r--r--gcc/tree-ssa-uninit.c3
-rw-r--r--gcc/tree-ssa.c3
-rw-r--r--gcc/tree-ssanames.c3
-rw-r--r--gcc/tree-stdarg.c3
-rw-r--r--gcc/tree-streamer-in.c5
-rw-r--r--gcc/tree-streamer-out.c5
-rw-r--r--gcc/tree-streamer.c3
-rw-r--r--gcc/tree-switch-conversion.c5
-rw-r--r--gcc/tree-tailcall.c5
-rw-r--r--gcc/tree-vect-data-refs.c5
-rw-r--r--gcc/tree-vect-generic.c5
-rw-r--r--gcc/tree-vect-loop-manip.c3
-rw-r--r--gcc/tree-vect-loop.c5
-rw-r--r--gcc/tree-vect-patterns.c5
-rw-r--r--gcc/tree-vect-slp.c5
-rw-r--r--gcc/tree-vect-stmts.c5
-rw-r--r--gcc/tree-vectorizer.c3
-rw-r--r--gcc/tree-vrp.c5
-rw-r--r--gcc/tree.c5
-rw-r--r--gcc/tsan.c5
-rw-r--r--gcc/ubsan.c5
-rw-r--r--gcc/valtrack.c1
-rw-r--r--gcc/value-prof.c5
-rw-r--r--gcc/var-tracking.c5
-rw-r--r--gcc/varasm.c5
-rw-r--r--gcc/varpool.c3
-rw-r--r--gcc/vmsdbgout.c3
-rw-r--r--gcc/vtable-verify.c3
-rw-r--r--gcc/web.c1
-rw-r--r--gcc/wide-int-print.cc1
-rw-r--r--gcc/wide-int-print.h1
-rw-r--r--gcc/wide-int.cc3
-rw-r--r--gcc/wide-int.h5
-rw-r--r--gcc/xcoffout.c3
577 files changed, 624 insertions, 2086 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a5ca74fa784..75516bc705f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,439 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * coretypes.h: Include machmode.h, signop.h, wide-int.h, double-int.h,
+ real.h, and fixed-value.h when included in host source files.
+ * double-int.h: Remove redundant #includes listed above.
+ * fixed-value.h: Likewise.
+ * real.h: Likewise.
+ * wide-int.h: Likewise.
+ * inchash.h: Likewise.
+ * rtl.h: Add some include files When included from a generator file.
+ * target.h: Remove wide-int.h and insn-modes.h from the include list.
+ * internal-fn.h: Don't include coretypes.h.
+ * alias.c: Adjust includes for restructured coretypes.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.
+ * dojump.c: Likewise.
+ * dominance.c: Likewise.
+ * domwalk.c: Likewise.
+ * double-int.c: Likewise.
+ * dse.c: Likewise.
+ * dumpfile.c: Likewise.
+ * dwarf2asm.c: Likewise.
+ * dwarf2cfi.c: Likewise.
+ * dwarf2out.c: Likewise.
+ * dwarf2out.h: 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.
+ * hooks.h: Likewise.
+ * hw-doloop.c: Likewise.
+ * ifcvt.c: Likewise.
+ * incpath.c: Likewise.
+ * init-regs.c: Likewise.
+ * internal-fn.c: Likewise.
+ * ipa-chkp.c: Likewise.
+ * ipa-comdats.c: Likewise.
+ * ipa-cp.c: Likewise.
+ * ipa-devirt.c: Likewise.
+ * ipa-icf-gimple.c: Likewise.
+ * ipa-icf.c: Likewise.
+ * ipa-inline-analysis.c: Likewise.
+ * ipa-inline-transform.c: Likewise.
+ * ipa-inline.c: Likewise.
+ * ipa-polymorphic-call.c: Likewise.
+ * ipa-profile.c: Likewise.
+ * ipa-prop.c: Likewise.
+ * ipa-pure-const.c: Likewise.
+ * ipa-ref.c: Likewise.
+ * ipa-reference.c: Likewise.
+ * ipa-split.c: Likewise.
+ * ipa-utils.c: Likewise.
+ * ipa-visibility.c: Likewise.
+ * ipa.c: Likewise.
+ * ira-build.c: Likewise.
+ * ira-color.c: Likewise.
+ * ira-conflicts.c: Likewise.
+ * ira-costs.c: Likewise.
+ * ira-emit.c: Likewise.
+ * ira-lives.c: Likewise.
+ * ira.c: Likewise.
+ * jump.c: Likewise.
+ * langhooks.c: Likewise.
+ * lcm.c: Likewise.
+ * loop-doloop.c: Likewise.
+ * loop-init.c: Likewise.
+ * loop-invariant.c: Likewise.
+ * loop-iv.c: Likewise.
+ * loop-unroll.c: Likewise.
+ * lower-subreg.c: Likewise.
+ * lra-assigns.c: Likewise.
+ * lra-coalesce.c: Likewise.
+ * lra-constraints.c: Likewise.
+ * lra-eliminations.c: Likewise.
+ * lra-lives.c: Likewise.
+ * lra-remat.c: Likewise.
+ * lra-spills.c: Likewise.
+ * lra.c: Likewise.
+ * lto-cgraph.c: Likewise.
+ * lto-compress.c: Likewise.
+ * lto-opts.c: Likewise.
+ * lto-section-in.c: Likewise.
+ * lto-section-out.c: Likewise.
+ * lto-streamer-in.c: Likewise.
+ * lto-streamer-out.c: Likewise.
+ * lto-streamer.c: Likewise.
+ * mcf.c: Likewise.
+ * mode-switching.c: Likewise.
+ * modulo-sched.c: Likewise.
+ * omega.c: Likewise.
+ * omp-low.c: Likewise.
+ * optabs.c: Likewise.
+ * opts-global.c: Likewise.
+ * passes.c: Likewise.
+ * plugin.c: Likewise.
+ * postreload-gcse.c: Likewise.
+ * postreload.c: Likewise.
+ * predict.c: Likewise.
+ * print-rtl.c: Likewise.
+ * print-tree.c: Likewise.
+ * profile.c: Likewise.
+ * real.c: Likewise.
+ * realmpfr.c: Likewise.
+ * realmpfr.h: Likewise.
+ * recog.c: Likewise.
+ * ree.c: Likewise.
+ * reg-stack.c: Likewise.
+ * regcprop.c: Likewise.
+ * reginfo.c: Likewise.
+ * regrename.c: Likewise.
+ * regs.h: Likewise.
+ * regstat.c: Likewise.
+ * reload.c: Likewise.
+ * reload1.c: Likewise.
+ * reorg.c: Likewise.
+ * resource.c: Likewise.
+ * rtl-chkp.c: Likewise.
+ * rtlanal.c: Likewise.
+ * rtlhooks.c: Likewise.
+ * sanopt.c: Likewise.
+ * sched-deps.c: Likewise.
+ * sched-ebb.c: Likewise.
+ * sched-rgn.c: Likewise.
+ * sched-vis.c: Likewise.
+ * sdbout.c: Likewise.
+ * sel-sched-dump.c: Likewise.
+ * sel-sched-ir.c: Likewise.
+ * sel-sched.c: Likewise.
+ * sese.c: Likewise.
+ * shrink-wrap.c: Likewise.
+ * shrink-wrap.h: Likewise.
+ * simplify-rtx.c: Likewise.
+ * stack-ptr-mod.c: Likewise.
+ * statistics.c: Likewise.
+ * stmt.c: Likewise.
+ * stor-layout.c: Likewise.
+ * store-motion.c: Likewise.
+ * stringpool.c: Likewise.
+ * symtab.c: Likewise.
+ * target-globals.c: Likewise.
+ * targhooks.c: Likewise.
+ * toplev.c: Likewise.
+ * tracer.c: Likewise.
+ * trans-mem.c: Likewise.
+ * tree-affine.c: Likewise.
+ * tree-affine.h: Likewise.
+ * tree-browser.c: Likewise.
+ * tree-call-cdce.c: Likewise.
+ * tree-cfg.c: Likewise.
+ * tree-cfgcleanup.c: Likewise.
+ * tree-chkp-opt.c: Likewise.
+ * tree-chkp.c: Likewise.
+ * tree-chrec.c: Likewise.
+ * tree-complex.c: Likewise.
+ * tree-data-ref.c: Likewise.
+ * tree-dfa.c: Likewise.
+ * tree-diagnostic.c: Likewise.
+ * tree-dump.c: Likewise.
+ * tree-eh.c: Likewise.
+ * tree-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-pretty-print.h: 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-loop.h: 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-print.cc: Likewise.
+ * wide-int-print.h: Likewise.
+ * wide-int.cc: Likewise.
+ * xcoffout.c: Likewise.
+ * config/aarch64/aarch64-builtins.c: Likewise.
+ * config/aarch64/aarch64.c: Likewise.
+ * config/aarch64/cortex-a57-fma-steering.c: Likewise.
+ * config/alpha/alpha.c: Likewise.
+ * config/arc/arc.c: Likewise.
+ * config/arm/aarch-common.c: Likewise.
+ * config/arm/arm-builtins.c: Likewise.
+ * config/arm/arm-c.c: Likewise.
+ * config/arm/arm.c: Likewise.
+ * config/avr/avr-c.c: Likewise.
+ * config/avr/avr-log.c: Likewise.
+ * config/avr/avr.c: Likewise.
+ * config/bfin/bfin.c: Likewise.
+ * config/c6x/c6x.c: Likewise.
+ * config/cr16/cr16.c: Likewise.
+ * config/cris/cris.c: Likewise.
+ * config/darwin-c.c: Likewise.
+ * config/darwin.c: Likewise.
+ * config/default-c.c: Likewise.
+ * config/epiphany/epiphany.c: Likewise.
+ * config/epiphany/mode-switch-use.c: Likewise.
+ * config/epiphany/resolve-sw-modes.c: Likewise.
+ * config/fr30/fr30.c: Likewise.
+ * config/frv/frv.c: Likewise.
+ * config/ft32/ft32.c: Likewise.
+ * config/glibc-c.c: Likewise.
+ * config/h8300/h8300.c: Likewise.
+ * config/i386/i386-c.c: Likewise.
+ * config/i386/i386.c: Likewise.
+ * config/i386/msformat-c.c: Likewise.
+ * config/i386/winnt-cxx.c: Likewise.
+ * config/i386/winnt-stubs.c: Likewise.
+ * config/i386/winnt.c: Likewise.
+ * config/ia64/ia64-c.c: Likewise.
+ * config/ia64/ia64.c: Likewise.
+ * config/iq2000/iq2000.c: Likewise.
+ * config/lm32/lm32.c: Likewise.
+ * config/m32c/m32c-pragma.c: Likewise.
+ * config/m32c/m32c.c: Likewise.
+ * config/m32r/m32r.c: Likewise.
+ * config/m68k/m68k.c: Likewise.
+ * config/mcore/mcore.c: Likewise.
+ * config/mep/mep-pragma.c: Likewise.
+ * config/mep/mep.c: Likewise.
+ * config/microblaze/microblaze-c.c: Likewise.
+ * config/microblaze/microblaze.c: Likewise.
+ * config/mips/mips.c: Likewise.
+ * config/mmix/mmix.c: Likewise.
+ * config/mn10300/mn10300.c: Likewise.
+ * config/moxie/moxie.c: Likewise.
+ * config/msp430/msp430-c.c: Likewise.
+ * config/msp430/msp430.c: Likewise.
+ * config/nds32/nds32-cost.c: Likewise.
+ * config/nds32/nds32-fp-as-gp.c: Likewise.
+ * config/nds32/nds32-intrinsic.c: Likewise.
+ * config/nds32/nds32-isr.c: Likewise.
+ * config/nds32/nds32-md-auxiliary.c: Likewise.
+ * config/nds32/nds32-memory-manipulation.c: Likewise.
+ * config/nds32/nds32-pipelines-auxiliary.c: Likewise.
+ * config/nds32/nds32-predicates.c: Likewise.
+ * config/nds32/nds32.c: Likewise.
+ * config/nios2/nios2.c: Likewise.
+ * config/nvptx/nvptx.c: Likewise.
+ * config/pa/pa.c: Likewise.
+ * config/pdp11/pdp11.c: Likewise.
+ * config/rl78/rl78-c.c: Likewise.
+ * config/rl78/rl78.c: Likewise.
+ * config/rs6000/rs6000-c.c: Likewise.
+ * config/rs6000/rs6000.c: Likewise.
+ * config/rx/rx.c: Likewise.
+ * config/s390/s390-c.c: Likewise.
+ * config/s390/s390.c: Likewise.
+ * config/sh/sh-c.c: Likewise.
+ * config/sh/sh-mem.cc: Likewise.
+ * config/sh/sh.c: Likewise.
+ * config/sh/sh_optimize_sett_clrt.cc: Likewise.
+ * config/sh/sh_treg_combine.cc: Likewise.
+ * config/sol2-c.c: Likewise.
+ * config/sol2-cxx.c: Likewise.
+ * config/sol2-stubs.c: Likewise.
+ * config/sol2.c: Likewise.
+ * config/sparc/sparc-c.c: Likewise.
+ * config/sparc/sparc.c: Likewise.
+ * config/spu/spu-c.c: Likewise.
+ * config/spu/spu.c: Likewise.
+ * config/stormy16/stormy16.c: Likewise.
+ * config/tilegx/mul-tables.c: Likewise.
+ * config/tilegx/tilegx-c.c: Likewise.
+ * config/tilegx/tilegx.c: Likewise.
+ * config/tilepro/mul-tables.c: Likewise.
+ * config/tilepro/tilepro-c.c: Likewise.
+ * config/tilepro/tilepro.c: Likewise.
+ * config/v850/v850-c.c: Likewise.
+ * config/v850/v850.c: Likewise.
+ * config/vax/vax.c: Likewise.
+ * config/visium/visium.c: Likewise.
+ * config/vms/vms-c.c: Likewise.
+ * config/vms/vms.c: Likewise.
+ * config/vxworks.c: Likewise.
+ * config/winnt-c.c: Likewise.
+ * config/xtensa/xtensa.c: Likewise.
+ * common/config/bfin/bfin-common.c: Likewise.
+
2015-06-04 Jan Hubicka <hubicka@ucw.cz>
* tree.h (tree_code_for_canonical_type_merging): New function.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c71731f35a4..c4c0e0c4e93 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * gcc-interface/cuintp.c: Adjust includes for restructured coretypes.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-04 Pierre-Marie de Rodat <derodat@adacore.com>
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Function>: If
diff --git a/gcc/ada/gcc-interface/cuintp.c b/gcc/ada/gcc-interface/cuintp.c
index fbecbd1f062..5245cd5fbc4 100644
--- a/gcc/ada/gcc-interface/cuintp.c
+++ b/gcc/ada/gcc-interface/cuintp.c
@@ -31,13 +31,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 5eaab17b6e8..f1ff6fc4f0c 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -28,13 +28,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index 9f931dc8aa6..4c2e949b220 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -30,13 +30,10 @@
#include "options.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -51,11 +48,9 @@
#include "langhooks.h"
#include "langhooks-def.h"
#include "plugin.h"
-#include "real.h"
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h" /* For pass_by_reference. */
diff --git a/gcc/ada/gcc-interface/targtyps.c b/gcc/ada/gcc-interface/targtyps.c
index b9a6e20f78d..1c740154554 100644
--- a/gcc/ada/gcc-interface/targtyps.c
+++ b/gcc/ada/gcc-interface/targtyps.c
@@ -29,13 +29,10 @@
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "options.h"
#include "tree.h"
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index eeb5b4e707d..538aba39d3e 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -28,15 +28,11 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 697b92eca61..f3d44e9c673 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -28,13 +28,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c
index 12d9ea95d7c..63ef1f2bc69 100644
--- a/gcc/ada/gcc-interface/utils2.c
+++ b/gcc/ada/gcc-interface/utils2.c
@@ -28,13 +28,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/alias.c b/gcc/alias.c
index ea539c5e580..6fa98b52e8e 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -40,8 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/asan.c b/gcc/asan.c
index ed5bc9e3824..38d6c562c63 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -68,8 +65,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/attribs.c b/gcc/attribs.c
index 7b7e2a9af1b..8cf99dc0c9b 100644
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -26,8 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index 7e3dd89affe..c760358c44e 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "recog.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index 1936487242f..a16ef0bec70 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -27,14 +27,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -44,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index cbf63438a4b..82db746bf23 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -83,13 +83,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -103,8 +100,6 @@
#include "tm_p.h"
#include "obstack.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index ae0db9d778a..166ba030208 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -30,16 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index ec31e0e7f3e..f20608b29e9 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -21,15 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "machmode.h"
#include "rtl.h"
#include "hash-set.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -55,8 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "insn-config.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index f1501bcb335..702eb48c30c 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,27 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * array-notation-common.c: Adjust includes for restructured coretypes.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-02 David Malcolm <dmalcolm@redhat.com>
PR c/66220:
diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c
index 8a2f36fc139..c79ccb4b539 100644
--- a/gcc/c-family/array-notation-common.c
+++ b/gcc/c-family/array-notation-common.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index 9bef52256c7..561a0a6b123 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "cpplib.h"
#include "c-pragma.h"
#include "cpp-id-data.h"
-#include "wide-int.h"
/* Local functions, macros and variables. */
static int dump_generic_ada_node (pretty_printer *, tree, tree, int, int,
diff --git a/gcc/c-family/c-cilkplus.c b/gcc/c-family/c-cilkplus.c
index 4f039d35f79..d2aa2e88fcd 100644
--- a/gcc/c-family/c-cilkplus.c
+++ b/gcc/c-family/c-cilkplus.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-common.h"
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 36c984cd18f..8528fe46eb4 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -54,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "plugin-api.h"
#include "vec.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 61900db490f..eaab97faf9f 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -25,17 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "statistics.h"
#include "vec.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index a8e6310efbd..c44a1493d48 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/c-family/c-dump.c b/gcc/c-family/c-dump.c
index 47aaeb4c3dc..b2dd77aed82 100644
--- a/gcc/c-family/c-dump.c
+++ b/gcc/c-family/c-dump.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tree-dump.h"
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index a6c2500e16e..719b3a921cf 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -22,15 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "stringpool.h"
#include "flags.h"
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index 4e7a96f2be7..dfa558787e0 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -28,13 +28,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/c-family/c-indentation.c b/gcc/c-family/c-indentation.c
index 1e3a6d82f27..5c78e188904 100644
--- a/gcc/c-family/c-indentation.c
+++ b/gcc/c-family/c-indentation.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index 85775014bf8..52a8ecc92ea 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
@@ -43,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "splay-tree.h"
#include "debug.h"
#include "target.h"
-#include "wide-int.h"
#include "attribs.h"
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index 168cae985d9..4d181dcfaf5 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-common.h"
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 8996fe3a9e6..8f8e22b9864 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "options.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-common.h"
diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c
index 0ede92ab7cc..693444cadde 100644
--- a/gcc/c-family/c-pch.c
+++ b/gcc/c-family/c-pch.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "cpplib.h"
#include "options.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index e936d5d26d2..b7feea632f7 100644
--- a/gcc/c-family/c-ppoutput.c
+++ b/gcc/c-family/c-ppoutput.c
@@ -22,14 +22,11 @@
#include "cpplib.h"
#include "../libcpp/internal.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-common.h" /* For flags. */
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index b82ca9f4f04..fafde83d866 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
@@ -38,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h" /* For cfun. FIXME: Does the parser know
diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c
index 4ca6420c3ff..34b98a10b1a 100644
--- a/gcc/c-family/c-pretty-print.c
+++ b/gcc/c-family/c-pretty-print.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/c-family/c-semantics.c b/gcc/c-family/c-semantics.c
index f6b8d227bf5..1d6bb54b64c 100644
--- a/gcc/c-family/c-semantics.c
+++ b/gcc/c-family/c-semantics.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index 8fbc66c36eb..99abc4a6707 100644
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "alloc-pool.h"
@@ -39,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index fc694be459e..6cf68d285a8 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index b67c74c8d37..782344f0270 100644
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.c
@@ -24,11 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "vec.h"
#include "hash-set.h"
-#include "machmode.h"
#include "alias.h"
#include "input.h"
#include "symtab.h"
-#include "double-int.h"
#include "flags.h"
#include "inchash.h"
#include "tree.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index d6be87f0742..b933e5bc003 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,15 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-array-notation.c: Adjust includes for restructured coretypes.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-04 Marek Polacek <polacek@redhat.com>
PR c/66341
diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index c77e751d093..766252b58ec 100644
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -73,8 +73,6 @@
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "flags.h"
#include "inchash.h"
#include "tree.h"
diff --git a/gcc/c/c-aux-info.c b/gcc/c/c-aux-info.c
index d80418e0b2d..93814d5f6eb 100644
--- a/gcc/c/c-aux-info.c
+++ b/gcc/c/c-aux-info.c
@@ -30,8 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "inchash.h"
#include "tree.h"
#include "c-tree.h"
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index 27fc3fc0e8e..ef87303e4a8 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -32,8 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "inchash.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index efb978b97e1..8a0be2857a6 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -35,8 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "function.h"
#include "c-tree.h"
diff --git a/gcc/c/c-errors.c b/gcc/c/c-errors.c
index 78c3dfd3b27..c640bb24c35 100644
--- a/gcc/c/c-errors.c
+++ b/gcc/c/c-errors.c
@@ -27,8 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "inchash.h"
#include "tree.h"
#include "c-tree.h"
diff --git a/gcc/c/c-lang.c b/gcc/c/c-lang.c
index 1d572854b1f..e4b283dfaab 100644
--- a/gcc/c/c-lang.c
+++ b/gcc/c/c-lang.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
#include "inchash.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 2730565e94e..d77e9c23d6e 100644
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -25,8 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "flags.h"
#include "inchash.h"
#include "tree.h"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 965b4b9e5f3..c691e76bcf6 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -44,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "flags.h"
#include "inchash.h"
#include "tree.h"
@@ -73,7 +71,6 @@ along with GCC; see the file COPYING3. If not see
#include "plugin-api.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "function.h"
#include "ipa-ref.h"
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 6b313f30b08..d473e6a5cc7 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -32,11 +32,7 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "input.h"
#include "alias.h"
-#include "double-int.h"
-#include "machmode.h"
#include "inchash.h"
-#include "real.h"
-#include "fixed-value.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -55,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -67,7 +62,6 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-common.h"
#include "c-family/c-ubsan.h"
#include "cilk.h"
-#include "wide-int.h"
#include "gomp-constants.h"
/* Possible cases of implicit bad conversions. Used to select
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index be7be7d7399..82ad533eab6 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -41,11 +40,7 @@ along with GCC; see the file COPYING3. If not see
#include "reload.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index 2158ebad0b4..bb4c6a7f7ed 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ccmp.c b/gcc/ccmp.c
index 5d1755402d1..d51b03a6967 100644
--- a/gcc/ccmp.c
+++ b/gcc/ccmp.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -42,8 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cfg.c b/gcc/cfg.c
index ddfecdcd6fa..a28b0a7b8b7 100644
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -54,21 +54,17 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "alloc-pool.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "predict.h"
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index b8d67bcdb0f..5856e883dd5 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 7cbed500632..de41422e083 100644
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -47,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "except.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index fc2ed31d0bf..1b5c5c52dfd 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -35,13 +35,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
@@ -62,8 +59,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index b190f913fd7..89c0e95296a 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "hard-reg-set.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -54,8 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index 02fc1ae649f..b9e94cfba8b 100644
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -38,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index 57674946bfe..a279046e7ee 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "symtab.h"
#include "inchash.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index b0116786d49..d811c561e0a 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -20,14 +20,11 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CFGLOOP_H
#define GCC_CFGLOOP_H
-#include "double-int.h"
-#include "wide-int.h"
#include "bitmap.h"
#include "sbitmap.h"
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index 35c1e8d6ba2..21ba9f4b20e 100644
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -38,11 +37,7 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c
index 45cc85da863..a4f13c20c36 100644
--- a/gcc/cfgloopmanip.c
+++ b/gcc/cfgloopmanip.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "hash-set.h"
#include "symtab.h"
#include "inchash.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 11ba5c02553..122d926e5ef 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -42,13 +42,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
@@ -73,8 +70,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 039ce150fd8..22b71d9a8cf 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -28,13 +28,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -84,8 +81,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "gimple-pretty-print.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index f2f04c34ca0..7bab872e1eb 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index b587ff2cb76..7d8271d97f7 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -70,13 +70,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 8d97163cf99..29b653d1e11 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -162,13 +162,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/cilk-common.c b/gcc/cilk-common.c
index ab097c41df7..412094a915d 100644
--- a/gcc/cilk-common.c
+++ b/gcc/cilk-common.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -45,8 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index 4d40e4ea062..ec10f48bc85 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -52,16 +52,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index 55a2e35ba48..01f43b1defe 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -81,13 +81,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -106,8 +103,6 @@ along with GCC; see the file COPYING3. If not see
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/common/config/bfin/bfin-common.c b/gcc/common/config/bfin/bfin-common.c
index 6262defa74f..17d6cb7888d 100644
--- a/gcc/common/config/bfin/bfin-common.c
+++ b/gcc/common/config/bfin/bfin-common.c
@@ -22,7 +22,6 @@
#include "coretypes.h"
#include "diagnostic-core.h"
#include "tm.h"
-#include "machmode.h"
#include "tm_p.h"
#include "common/common-target.h"
#include "common/common-target-def.h"
diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c
index 25b4cc858b0..7acc19c3e43 100644
--- a/gcc/compare-elim.c
+++ b/gcc/compare-elim.c
@@ -67,7 +67,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index 8a9fff8720d..5c324b8dd7e 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -24,13 +24,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -42,8 +39,6 @@
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index bbb044cc9bf..bef6877712c 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -26,13 +26,10 @@
#include "rtl.h"
#include "insn-attr.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -57,8 +54,6 @@
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/aarch64/cortex-a57-fma-steering.c b/gcc/config/aarch64/cortex-a57-fma-steering.c
index 5228b57199d..e55ffce17f1 100644
--- a/gcc/config/aarch64/cortex-a57-fma-steering.c
+++ b/gcc/config/aarch64/cortex-a57-fma-steering.c
@@ -31,7 +31,6 @@
#include "predict.h"
#include "basic-block.h"
#include "insn-attr.h"
-#include "machmode.h"
#include "recog.h"
#include "output.h"
#include "vec.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 857c9ac77eb..f6ce9eb7c40 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index afcbc29832c..c3a50c793eb 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -33,13 +33,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "regs.h"
#include "hard-reg-set.h"
-#include "real.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
@@ -64,7 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/arm/aarch-common.c b/gcc/config/arm/aarch-common.c
index b2bb859f7d8..0b39d179f92 100644
--- a/gcc/config/arm/aarch-common.c
+++ b/gcc/config/arm/aarch-common.c
@@ -28,13 +28,10 @@
#include "tm_p.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c
index 7a451133f86..36c90ea30fd 100644
--- a/gcc/config/arm/arm-builtins.c
+++ b/gcc/config/arm/arm-builtins.c
@@ -23,13 +23,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -39,8 +36,6 @@
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
index 8f9a867a989..c2a75b5d722 100644
--- a/gcc/config/arm/arm-c.c
+++ b/gcc/config/arm/arm-c.c
@@ -22,13 +22,10 @@
#include "tm.h"
#include "tm_p.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index ea1ed43b6ac..ee556160c3f 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -27,13 +27,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -53,8 +50,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/avr/avr-c.c b/gcc/config/avr/avr-c.c
index 351982f1179..ad41e294702 100644
--- a/gcc/config/avr/avr-c.c
+++ b/gcc/config/avr/avr-c.c
@@ -26,13 +26,10 @@
#include "tm_p.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/config/avr/avr-log.c b/gcc/config/avr/avr-log.c
index e84d579a7ae..8c163b9dc32 100644
--- a/gcc/config/avr/avr-log.c
+++ b/gcc/config/avr/avr-log.c
@@ -24,13 +24,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 365fedf918c..c22a0930dfb 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -32,13 +32,10 @@
#include "flags.h"
#include "reload.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -51,8 +48,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 37f4ded7947..914a02400bb 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -32,13 +32,10 @@
#include "output.h"
#include "insn-attr.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -51,8 +48,6 @@
#include "target-def.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index db85b5333d8..3c0c5b1acd8 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -25,13 +25,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -48,8 +45,6 @@
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index f6c5a0bf518..64ede05f880 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -24,13 +24,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,8 +47,6 @@
#include "recog.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 7c7d6257170..8a30be1ffa5 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -30,13 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -47,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 6d49f05b0db..953b3d0047b 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "target.h"
@@ -60,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index ea7eec112fb..2ffac7e57b7 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -32,13 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -48,8 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/default-c.c b/gcc/config/default-c.c
index 549382248df..305fe68bc08 100644
--- a/gcc/config/default-c.c
+++ b/gcc/config/default-c.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "c-family/c-target.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "c-family/c-target-def.h"
diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
index e1f77c2a5a1..c655e326049 100644
--- a/gcc/config/epiphany/epiphany.c
+++ b/gcc/config/epiphany/epiphany.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "regs.h"
#include "hard-reg-set.h"
-#include "real.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
@@ -51,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "hashtab.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/epiphany/mode-switch-use.c b/gcc/config/epiphany/mode-switch-use.c
index ad107157738..abc9971582f 100644
--- a/gcc/config/epiphany/mode-switch-use.c
+++ b/gcc/config/epiphany/mode-switch-use.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/config/epiphany/resolve-sw-modes.c b/gcc/config/epiphany/resolve-sw-modes.c
index fc8ccf94b9c..05346279450 100644
--- a/gcc/config/epiphany/resolve-sw-modes.c
+++ b/gcc/config/epiphany/resolve-sw-modes.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 "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "tm_p.h"
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index 4fbe5490bc1..7134f67c8b9 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -33,13 +33,10 @@
#include "flags.h"
#include "recog.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index e01fd1af2a7..d90986a482d 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/ft32/ft32.c b/gcc/config/ft32/ft32.c
index 7c7dbd5374c..85c4cbab3df 100644
--- a/gcc/config/ft32/ft32.c
+++ b/gcc/config/ft32/ft32.c
@@ -36,13 +36,10 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/config/glibc-c.c b/gcc/config/glibc-c.c
index 4e7b5fc07e2..1bd9d39fd47 100644
--- a/gcc/config/glibc-c.c
+++ b/gcc/config/glibc-c.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "c-family/c-target.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "c-family/c-target-def.h"
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index e6141d48fd9..f5fccc6af49 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/i386/i386-c.c b/gcc/config/i386/i386-c.c
index 03045fb7238..4cd56e650a7 100644
--- a/gcc/config/i386/i386-c.c
+++ b/gcc/config/i386/i386-c.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index de8ce37cb0f..8aa4fdbd70c 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -52,8 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/i386/msformat-c.c b/gcc/config/i386/msformat-c.c
index 1aca93e298e..64cb86e7412 100644
--- a/gcc/config/i386/msformat-c.c
+++ b/gcc/config/i386/msformat-c.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/config/i386/winnt-cxx.c b/gcc/config/i386/winnt-cxx.c
index 1d1a29b083e..8b60bb3f2f8 100644
--- a/gcc/config/i386/winnt-cxx.c
+++ b/gcc/config/i386/winnt-cxx.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/i386/winnt-stubs.c b/gcc/config/i386/winnt-stubs.c
index b5d3bce71d8..7d17ccbf617 100644
--- a/gcc/config/i386/winnt-stubs.c
+++ b/gcc/config/i386/winnt-stubs.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "output.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 4e07f03c470..dfcc5b0f688 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "output.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/config/ia64/ia64-c.c b/gcc/config/ia64/ia64-c.c
index 7bf50327e61..162e00c4d39 100644
--- a/gcc/config/ia64/ia64-c.c
+++ b/gcc/config/ia64/ia64-c.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 45ad97a10a4..8b4a02a6f24 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,8 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index 28f9fc91989..3bdcfadb9fd 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -46,8 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c
index df58eebb090..06f0724002a 100644
--- a/gcc/config/lm32/lm32.c
+++ b/gcc/config/lm32/lm32.c
@@ -30,7 +30,6 @@
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -49,16 +48,12 @@
#include "recog.h"
#include "output.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "calls.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/m32c/m32c-pragma.c b/gcc/config/m32c/m32c-pragma.c
index 6d8c762a46f..f37365adc9b 100644
--- a/gcc/config/m32c/m32c-pragma.c
+++ b/gcc/config/m32c/m32c-pragma.c
@@ -23,13 +23,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-pragma.h"
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index ad627750100..efef08ccd5b 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -36,13 +36,10 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -52,8 +49,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 4c33b93eb18..075227d890e 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -22,13 +22,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -47,8 +44,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 87d9ef9307d..94cac2b3d63 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -48,8 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index e229609ce63..529e67299a2 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -23,13 +23,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,8 +47,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/mep/mep-pragma.c b/gcc/config/mep/mep-pragma.c
index f5bd20c2806..90cc44490ae 100644
--- a/gcc/config/mep/mep-pragma.c
+++ b/gcc/config/mep/mep-pragma.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index fb54f307a8c..724d84d6ec4 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -51,8 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/microblaze/microblaze-c.c b/gcc/config/microblaze/microblaze-c.c
index a879ac666c7..ac2ffe4f551 100644
--- a/gcc/config/microblaze/microblaze-c.c
+++ b/gcc/config/microblaze/microblaze-c.c
@@ -25,13 +25,10 @@
#include "tm.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 8f0f4085965..3cd13029828 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -26,20 +26,16 @@
#include "rtl.h"
#include "regs.h"
#include "hard-reg-set.h"
-#include "real.h"
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
#include "insn-attr.h"
#include "recog.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
@@ -49,7 +45,6 @@
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index c3755f57adf..9e0e8fd0090 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -34,13 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -52,8 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index e0699854e25..6706bbe9ba8 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "predict.h"
#include "vec.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -44,16 +43,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "flags.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 5bf2c03684a..7f38555b4d7 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -24,13 +24,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -48,8 +45,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c
index 2450a827a63..e19daff8afc 100644
--- a/gcc/config/moxie/moxie.c
+++ b/gcc/config/moxie/moxie.c
@@ -36,13 +36,10 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -51,8 +48,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/msp430/msp430-c.c b/gcc/config/msp430/msp430-c.c
index 036050c2c7c..2bb9c457293 100644
--- a/gcc/config/msp430/msp430-c.c
+++ b/gcc/config/msp430/msp430-c.c
@@ -23,13 +23,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 58d0efea1de..f99cb60a65b 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -23,13 +23,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -46,8 +43,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/nds32/nds32-cost.c b/gcc/config/nds32/nds32-cost.c
index c6ec5ab845a..02d02929de1 100644
--- a/gcc/config/nds32/nds32-cost.c
+++ b/gcc/config/nds32/nds32-cost.c
@@ -25,13 +25,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -50,8 +47,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32-fp-as-gp.c b/gcc/config/nds32/nds32-fp-as-gp.c
index e7b7c7071b1..ab8e2178757 100644
--- a/gcc/config/nds32/nds32-fp-as-gp.c
+++ b/gcc/config/nds32/nds32-fp-as-gp.c
@@ -25,13 +25,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -50,8 +47,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32-intrinsic.c b/gcc/config/nds32/nds32-intrinsic.c
index 9f0851d9f77..5ce3370e53c 100644
--- a/gcc/config/nds32/nds32-intrinsic.c
+++ b/gcc/config/nds32/nds32-intrinsic.c
@@ -25,13 +25,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -50,8 +47,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32-isr.c b/gcc/config/nds32/nds32-isr.c
index 1896fde9f1e..e27907dfed9 100644
--- a/gcc/config/nds32/nds32-isr.c
+++ b/gcc/config/nds32/nds32-isr.c
@@ -25,13 +25,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -50,8 +47,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32-md-auxiliary.c b/gcc/config/nds32/nds32-md-auxiliary.c
index 0a3e773c55f..321ccf3d449 100644
--- a/gcc/config/nds32/nds32-md-auxiliary.c
+++ b/gcc/config/nds32/nds32-md-auxiliary.c
@@ -26,13 +26,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -51,8 +48,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32-memory-manipulation.c b/gcc/config/nds32/nds32-memory-manipulation.c
index 9dc52f20de0..1256b317724 100644
--- a/gcc/config/nds32/nds32-memory-manipulation.c
+++ b/gcc/config/nds32/nds32-memory-manipulation.c
@@ -26,13 +26,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -51,8 +48,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32-pipelines-auxiliary.c b/gcc/config/nds32/nds32-pipelines-auxiliary.c
index 6cc95939d2f..3cf400ca4ea 100644
--- a/gcc/config/nds32/nds32-pipelines-auxiliary.c
+++ b/gcc/config/nds32/nds32-pipelines-auxiliary.c
@@ -26,13 +26,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -51,8 +48,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32-predicates.c b/gcc/config/nds32/nds32-predicates.c
index 209b25f4c74..516e48d7b93 100644
--- a/gcc/config/nds32/nds32-predicates.c
+++ b/gcc/config/nds32/nds32-predicates.c
@@ -25,13 +25,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -50,8 +47,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index e617bbf26b5..1ef76a95227 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -25,13 +25,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -50,8 +47,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index d83c393ed60..597a0464cce 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -26,13 +26,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -47,8 +44,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index e7fc66631aa..daf6a217265 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -25,13 +25,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-flags.h"
@@ -43,8 +40,6 @@
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index bb4d7b386d6..34d02a9c7d2 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -30,13 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,8 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index cb805d3b35c..831f1a3ce6a 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "output.h"
@@ -38,16 +37,12 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "recog.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
#include "calls.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/rl78/rl78-c.c b/gcc/config/rl78/rl78-c.c
index c8410cdb4cc..02c3ecedc87 100644
--- a/gcc/config/rl78/rl78-c.c
+++ b/gcc/config/rl78/rl78-c.c
@@ -23,13 +23,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index c6a0d57e354..bde03aad87a 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -23,13 +23,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -47,8 +44,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index 9f22b4c428f..494aa46754e 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -26,19 +26,15 @@
#include "tm.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "stringpool.h"
-#include "wide-int.h"
#include "c-family/c-common.h"
#include "c-family/c-pragma.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index bed53489a61..66caa47ca2c 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -32,13 +32,10 @@
#include "recog.h"
#include "obstack.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,8 +47,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index 4c1c5d161f1..5262fbf84ca 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -27,13 +27,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
@@ -50,8 +47,6 @@
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index ed81b0f86b4..8ad42f1e967 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -33,13 +33,10 @@
#include "tm.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 47cb9e76eb2..d6ed179a2b0 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -54,8 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/sh/sh-c.c b/gcc/config/sh/sh-c.c
index 8aa056dda43..b3ea87f6ae8 100644
--- a/gcc/config/sh/sh-c.c
+++ b/gcc/config/sh/sh-c.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/sh/sh-mem.cc b/gcc/config/sh/sh-mem.cc
index d09209004a6..860189f614e 100644
--- a/gcc/config/sh/sh-mem.cc
+++ b/gcc/config/sh/sh-mem.cc
@@ -21,15 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "machmode.h"
#include "rtl.h"
#include "hash-set.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "hashtab.h"
@@ -37,8 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 285aa1808ed..d77154c0658 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -48,8 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index 4324506ce79..f403d63dfb8 100644
--- a/gcc/config/sh/sh_optimize_sett_clrt.cc
+++ b/gcc/config/sh/sh_optimize_sett_clrt.cc
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "machmode.h"
#include "predict.h"
#include "vec.h"
#include "hashtab.h"
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index e5ed77cbbec..02e13e85e46 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "machmode.h"
#include "predict.h"
#include "vec.h"
#include "hashtab.h"
@@ -52,11 +51,7 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/sol2-c.c b/gcc/config/sol2-c.c
index a73384c0f34..0275adec475 100644
--- a/gcc/config/sol2-c.c
+++ b/gcc/config/sol2-c.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/sol2-cxx.c b/gcc/config/sol2-cxx.c
index 69212b21ff7..d2f5ea0ff10 100644
--- a/gcc/config/sol2-cxx.c
+++ b/gcc/config/sol2-cxx.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/sol2-stubs.c b/gcc/config/sol2-stubs.c
index d35613c4c9e..8d9a9801591 100644
--- a/gcc/config/sol2-stubs.c
+++ b/gcc/config/sol2-stubs.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm.h"
diff --git a/gcc/config/sol2.c b/gcc/config/sol2.c
index d87c7b4a7df..faaf17f4885 100644
--- a/gcc/config/sol2.c
+++ b/gcc/config/sol2.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/sparc/sparc-c.c b/gcc/config/sparc/sparc-c.c
index b49599d7252..a614328ff50 100644
--- a/gcc/config/sparc/sparc-c.c
+++ b/gcc/config/sparc/sparc-c.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 094287f5c11..3939b1aa86d 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -52,8 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/spu/spu-c.c b/gcc/config/spu/spu-c.c
index 03b818c4a31..b68dbf47c14 100644
--- a/gcc/config/spu/spu-c.c
+++ b/gcc/config/spu/spu-c.c
@@ -20,13 +20,10 @@
#include "tm.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 7a29df8bce1..a6bf78200c1 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -28,13 +28,10 @@
#include "recog.h"
#include "obstack.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -45,8 +42,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index b97b230edfd..3de727f9a4c 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -35,13 +35,10 @@
#include "diagnostic-core.h"
#include "obstack.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -52,8 +49,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/tilegx/mul-tables.c b/gcc/config/tilegx/mul-tables.c
index 6f5df4730b8..cd78c239edb 100644
--- a/gcc/config/tilegx/mul-tables.c
+++ b/gcc/config/tilegx/mul-tables.c
@@ -28,7 +28,6 @@
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
@@ -36,11 +35,7 @@
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/config/tilegx/tilegx-c.c b/gcc/config/tilegx/tilegx-c.c
index c358d7306a3..2850f2bc63c 100644
--- a/gcc/config/tilegx/tilegx-c.c
+++ b/gcc/config/tilegx/tilegx-c.c
@@ -21,18 +21,14 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "machmode.h"
#include "tm.h"
#include "tm_p.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index 129ac8a6aee..5832eff31f2 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -31,18 +31,13 @@
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/config/tilepro/mul-tables.c b/gcc/config/tilepro/mul-tables.c
index 29ec5551587..680f3b0c8a4 100644
--- a/gcc/config/tilepro/mul-tables.c
+++ b/gcc/config/tilepro/mul-tables.c
@@ -28,7 +28,6 @@
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
@@ -36,11 +35,7 @@
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/config/tilepro/tilepro-c.c b/gcc/config/tilepro/tilepro-c.c
index fc2afdac834..f47c6ca4062 100644
--- a/gcc/config/tilepro/tilepro-c.c
+++ b/gcc/config/tilepro/tilepro-c.c
@@ -21,18 +21,14 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "machmode.h"
#include "tm.h"
#include "tm_p.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c
index 6ed4a04df9f..ac0751934b9 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -31,18 +31,13 @@
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/config/v850/v850-c.c b/gcc/config/v850/v850-c.c
index a5480232b08..8af245db596 100644
--- a/gcc/config/v850/v850-c.c
+++ b/gcc/config/v850/v850-c.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 58f6601a632..53dbf4522ca 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -23,13 +23,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
@@ -48,8 +45,6 @@
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 0b0d21be50b..9ea214d05e6 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -33,13 +33,10 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "df.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "calls.h"
@@ -55,8 +52,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c
index 313f06e61bc..7a023b588f9 100644
--- a/gcc/config/visium/visium.c
+++ b/gcc/config/visium/visium.c
@@ -24,18 +24,13 @@
#include "tm.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "statistics.h"
#include "vec.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
#include "tree-core.h"
-#include "wide-int.h"
#include "inchash.h"
#include "fold-const.h"
#include "tree-check.h"
diff --git a/gcc/config/vms/vms-c.c b/gcc/config/vms/vms-c.c
index 540dc0955f9..b56a7e66182 100644
--- a/gcc/config/vms/vms-c.c
+++ b/gcc/config/vms/vms-c.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c-family/c-pragma.h"
diff --git a/gcc/config/vms/vms.c b/gcc/config/vms/vms.c
index 306379f01a7..e16a330772f 100644
--- a/gcc/config/vms/vms.c
+++ b/gcc/config/vms/vms.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/config/vxworks.c b/gcc/config/vxworks.c
index e29dc69376d..fd38576dc1e 100644
--- a/gcc/config/vxworks.c
+++ b/gcc/config/vxworks.c
@@ -27,12 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/config/winnt-c.c b/gcc/config/winnt-c.c
index 3b9e542ddd0..8c690610cd6 100644
--- a/gcc/config/winnt-c.c
+++ b/gcc/config/winnt-c.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "c-family/c-target.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "options.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "c-family/c-target-def.h"
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index 1f71117f453..db39f3fc49c 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -48,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -58,9 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/convert.c b/gcc/convert.c
index 0aa58ab0547..79e3a7e6d13 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -26,16 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
-#include "fixed-value.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index 0ee8633c727..447edd75ae4 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -299,4 +299,14 @@ typedef void (*gt_pointer_operator) (void *, void *);
typedef unsigned char uchar;
#endif
+/* Most host source files will require the following headers. */
+#if !defined (GENERATOR_FILE) && !defined (USED_FOR_TARGET)
+#include "machmode.h"
+#include "signop.h"
+#include "wide-int.h"
+#include "double-int.h"
+#include "real.h"
+#include "fixed-value.h"
+#endif
+
#endif /* coretypes.h */
diff --git a/gcc/coverage.c b/gcc/coverage.c
index ff7249acaa7..3fd54c405dd 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -30,13 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 83071db733e..5a77b30eb88 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,41 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * call.c: Adjust includes for restructured coretypes.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-04 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
PR c++/66192
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 71f7e06013c..da5cfbb7ca9 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -57,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "wide-int.h"
#include "internal-fn.h"
/* The various kinds of conversion. */
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 41607055493..09de9cf8d96 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tm.h"
#include "tree.h"
@@ -56,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "splay-tree.h"
#include "gimplify.h"
-#include "wide-int.h"
/* The number of nested classes being processed. If we are not in the
scope of any class, this is zero. */
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index d05372a5ac1..49d0fe4e308 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index c64f7e233bc..e8cf337e97d 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -54,14 +54,11 @@
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 69fd53b5b28..d8dc1c72cee 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 825005a241f..c4e80e6a3b5 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index dd8e7c59814..8f40ce40206 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index efaf1bd879b..26b6cb667dc 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index ce122631770..1cdee8632d4 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "alloc-pool.h"
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index ae0326eaba2..2ab7b41c029 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2b57c47904b..e63098f0767 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
@@ -76,7 +73,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-ref.h"
#include "cgraph.h"
#include "cilk.h"
-#include "wide-int.h"
#include "builtins.h"
/* Possible cases of bad specifiers type used by bad_specifiers. */
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index e733e3498d5..a6a628da2d4 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index a318a230d46..21a27e06608 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 690cb0c50d3..83efad52874 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 614f2e914b7..67eb5a2226a 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index dc7b2777f0d..1ea873a3a42 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 20781cb6df0..564ced6e0b0 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 30774070d3c..3f177b6f1cf 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "target.h"
#include "gimplify.h"
-#include "wide-int.h"
#include "c-family/c-ubsan.h"
static bool begin_init_stmts (tree *, tree *);
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 174700ffa4e..3a4824b10a4 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index bde15bcb2d6..3e8ce355596 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "input.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index cc5faf7755e..f6ec65e139c 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -49,13 +49,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
@@ -74,7 +71,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "wide-int.h"
#include "attribs.h"
/* Debugging support. */
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index d41e1125aaa..9187eeb1665 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 9e4e0e3adf5..62424e0b523 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 2d20e096f7c..d902871a08b 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 9ae555c1354..ae9d3f04e9c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "cpplib.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a0c5d7cd586..ec33d96fc6f 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index fd71bb44089..d105be366d3 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index f417e4b56f1..e98dace3200 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 8200d308829..d01de92ef8a 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 0031acdd848..fff36195e88 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index b1c280f6748..dd53758cde4 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -28,13 +28,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stmt.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index eebb41544fb..9d9956b046e 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -54,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "gimple-expr.h"
#include "gimplify.h"
-#include "wide-int.h"
#include "attribs.h"
static tree bot_manip (tree *, int *, void *);
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 4da6275f0df..96371a44ab0 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 076f9a03498..5d90806192e 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -30,13 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -45,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "cp-tree.h"
#include "flags.h"
#include "diagnostic-core.h"
-#include "wide-int.h"
static tree
process_init_constructor (tree type, tree init, tsubst_flags_t complain);
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index a138ee4e43b..1a94ce225e1 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -121,7 +121,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cppbuiltin.c b/gcc/cppbuiltin.c
index d9e9ab40030..7c5163a3791 100644
--- a/gcc/cppbuiltin.c
+++ b/gcc/cppbuiltin.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "version.h"
diff --git a/gcc/cprop.c b/gcc/cprop.c
index 6a756f3fced..a0e7989dedd 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
@@ -51,8 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgcleanup.h"
#include "basic-block.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/cse.c b/gcc/cse.c
index aa65b1e72d0..434c331471a 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -43,11 +42,7 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/cselib.c b/gcc/cselib.c
index 624d0a9724e..e611d94072f 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"/* FIXME: For hashing DEBUG_EXPR & friends. */
#include "tm_p.h"
diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index 424d52295fa..841831e9cf3 100644
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index caee0c6a464..65804e39b3b 100644
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/data-streamer.c b/gcc/data-streamer.c
index e3a1b41ad70..634bc9a1dba 100644
--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 758c1c439fa..c873e85b6d1 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -71,13 +71,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -103,8 +100,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "obstack.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/dce.c b/gcc/dce.c
index 99f62715562..4fa52dc93d6 100644
--- a/gcc/dce.c
+++ b/gcc/dce.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "regs.h"
diff --git a/gcc/ddg.c b/gcc/ddg.c
index e6966f3823c..0e40cdbcd9d 100644
--- a/gcc/ddg.c
+++ b/gcc/ddg.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "flags.h"
@@ -47,11 +46,7 @@ along with GCC; see the file COPYING3. If not see
#include "sbitmap.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/debug.c b/gcc/debug.c
index 7d18c0aa868..121f3da9d1f 100644
--- a/gcc/debug.c
+++ b/gcc/debug.c
@@ -20,13 +20,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "debug.h"
diff --git a/gcc/df-core.c b/gcc/df-core.c
index 67040a10d39..68e7163a6f8 100644
--- a/gcc/df-core.c
+++ b/gcc/df-core.c
@@ -385,7 +385,6 @@ are write-only operations.
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index 7700157515d..ac2118dd83b 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index 74f7375e3e0..78ebb39ff70 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/df.h b/gcc/df.h
index 8a5b21fa275..4c6856a6437 100644
--- a/gcc/df.h
+++ b/gcc/df.h
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/dfp.c b/gcc/dfp.c
index a55e3598e89..f483e989783 100644
--- a/gcc/dfp.c
+++ b/gcc/dfp.c
@@ -22,19 +22,14 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "tm_p.h"
#include "dfp.h"
-#include "wide-int.h"
/* The order of the following headers is important for making sure
decNumber structure is large enough to hold decimal128 digits. */
diff --git a/gcc/dojump.c b/gcc/dojump.c
index d788fe09056..0fedfffcd89 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -23,15 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -43,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
#include "hashtab.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/dominance.c b/gcc/dominance.c
index f3c99ba9f1c..173e479ff1c 100644
--- a/gcc/dominance.c
+++ b/gcc/dominance.c
@@ -43,7 +43,6 @@
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/domwalk.c b/gcc/domwalk.c
index 62a2fcf2e02..48aa1c4bba7 100644
--- a/gcc/domwalk.c
+++ b/gcc/domwalk.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/double-int.c b/gcc/double-int.c
index 301622eb442..6e457c2fc37 100644
--- a/gcc/double-int.c
+++ b/gcc/double-int.c
@@ -22,15 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h" /* For BITS_PER_UNIT and *_BIG_ENDIAN. */
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
static int add_double_with_sign (unsigned HOST_WIDE_INT, HOST_WIDE_INT,
diff --git a/gcc/double-int.h b/gcc/double-int.h
index 6db4b9e9ffc..44b168dd084 100644
--- a/gcc/double-int.h
+++ b/gcc/double-int.h
@@ -20,8 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef DOUBLE_INT_H
#define DOUBLE_INT_H
-#include "wide-int.h"
-
/* A large integer is currently represented as a pair of HOST_WIDE_INTs.
It therefore represents a number with precision of
2 * HOST_BITS_PER_WIDE_INT bits (it is however possible that the
diff --git a/gcc/dse.c b/gcc/dse.c
index fae63af5ce6..7f489c03837 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -29,15 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -59,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c
index 743344e5e15..28a195a6124 100644
--- a/gcc/dumpfile.c
+++ b/gcc/dumpfile.c
@@ -23,16 +23,12 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "gimple-pretty-print.h"
#include "context.h"
diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c
index ba1b543b806..d4458e31857 100644
--- a/gcc/dwarf2asm.c
+++ b/gcc/dwarf2asm.c
@@ -24,15 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 4b6929e4bc8..ac2196e9901 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -25,15 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "stor-layout.h"
#include "hard-reg-set.h"
@@ -52,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h" /* expand_builtin_dwarf_sp_column */
#include "hashtab.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 1116f86a137..55364a26632 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -61,15 +61,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -88,7 +84,6 @@ along with GCC; see the file COPYING3. If not see
#include "reload.h"
#include "output.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/dwarf2out.h b/gcc/dwarf2out.h
index a4d7df8cbea..7777251e88e 100644
--- a/gcc/dwarf2out.h
+++ b/gcc/dwarf2out.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#define GCC_DWARF2OUT_H 1
#include "dwarf2.h" /* ??? Remove this once only used by dwarf2foo.c. */
-#include "wide-int.h"
typedef struct die_struct *dw_die_ref;
typedef const struct die_struct *const_dw_die_ref;
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 49a15090fc1..e6327109804 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -38,15 +38,11 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "varasm.h"
@@ -61,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "hashtab.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/et-forest.c b/gcc/et-forest.c
index 4e55b634daa..c0af9948c05 100644
--- a/gcc/et-forest.c
+++ b/gcc/et-forest.c
@@ -35,7 +35,6 @@ License along with libiberty; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/except.c b/gcc/except.c
index 074f36107eb..9a06fdc4933 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -115,15 +115,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
@@ -135,7 +131,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "hashtab.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/explow.c b/gcc/explow.c
index 8745aea8cdb..47d12505ed3 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -25,15 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "stor-layout.h"
#include "tm_p.h"
@@ -43,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 4b2b02659e7..d381f58d219 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -44,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index 5a931dc35ae..02b226b61e8 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -21,15 +21,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "machmode.h"
#include "rtl.h"
#include "hash-set.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -46,8 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/final.c b/gcc/final.c
index c8f059b17c0..c4a8a0da448 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -47,13 +47,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
@@ -83,8 +80,6 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/fixed-value.c b/gcc/fixed-value.c
index 689794584a6..8f07884cf33 100644
--- a/gcc/fixed-value.c
+++ b/gcc/fixed-value.c
@@ -22,18 +22,13 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "fixed-value.h"
#include "tree.h"
#include "diagnostic-core.h"
-#include "wide-int.h"
/* Compare two fixed objects for bitwise identity. */
diff --git a/gcc/fixed-value.h b/gcc/fixed-value.h
index bf30c1a099d..bf421883ef7 100644
--- a/gcc/fixed-value.h
+++ b/gcc/fixed-value.h
@@ -20,10 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_FIXED_VALUE_H
#define GCC_FIXED_VALUE_H
-#include "machmode.h"
-#include "real.h"
-#include "double-int.h"
-
struct GTY(()) fixed_value
{
double_int data; /* Store data up to 2 wide integers. */
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 55196b54c6b..519c2d1ed81 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -46,13 +46,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -65,8 +62,6 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2dec1d4ec3a..33cdf8f91df 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,26 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * convert.c: Adjust includes for restructured coretypes.h.
+ * cpp.c: Likewise.
+ * decl.c: Likewise.
+ * f95-lang.c: Likewise.
+ * iresolve.c: Likewise.
+ * match.c: Likewise.
+ * module.c: Likewise.
+ * options.c: Likewise.
+ * target-memory.c: Likewise.
+ * trans-array.c: Likewise.
+ * trans-common.c: Likewise.
+ * trans-const.c: Likewise.
+ * trans-decl.c: Likewise.
+ * trans-expr.c: Likewise.
+ * trans-intrinsic.c: Likewise.
+ * trans-io.c: Likewise.
+ * trans-openmp.c: Likewise.
+ * trans-stmt.c: Likewise.
+ * trans-types.c: Likewise.
+ * trans.c: Likewise.
+
2015-06-02 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66380
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index 261083dcf6e..c2ab96461ae 100644
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -26,14 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index e0e1f74205e..ac1ef6d8b82 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "version.h"
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index e2fd670de39..d8cc7680868 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "constructor.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 28eaa6aebac..fbfc72d2417 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -29,14 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index 32ef0719ead..735dcc766e9 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -30,14 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 2e15af29df6..b51d18a2925 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "match.h"
#include "parse.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 1abfc46d7a5..4122c956d3e 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -74,14 +74,11 @@ along with GCC; see the file COPYING3. If not see
#include "constructor.h"
#include "cpp.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index d47cf2acc1c..c7833c76c63 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index 187682acf34..ec18b4a3491 100644
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index c8fab454249..f552ff90f02 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -80,14 +80,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -101,7 +98,6 @@ along with GCC; see the file COPYING3. If not see
#include "trans-array.h"
#include "trans-const.h"
#include "dependency.h"
-#include "wide-int.h"
static bool gfc_get_array_constructor_size (mpz_t *, gfc_constructor_base);
diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c
index a2bc089cb11..ca01b0bf9a0 100644
--- a/gcc/fortran/trans-common.c
+++ b/gcc/fortran/trans-common.c
@@ -98,13 +98,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 76463449522..30c65358277 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -25,22 +25,17 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "real.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
#include "realmpfr.h"
#include "diagnostic-core.h" /* For fatal_error. */
-#include "double-int.h"
#include "trans.h"
#include "trans-const.h"
#include "trans-types.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 4c189200658..a92e4d86baa 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "gfortran.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 9be8a4206fa..5a704cf2bbc 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -26,14 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index 323c600c99c..2c16357fdb4 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -26,15 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h" /* For UNITS_PER_WORD. */
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index aa147066fd1..cdbd0e6d3cf 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 9d95e86aa23..7facfb77329 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 81943b0142a..e51cf150eb3 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index c8be256f0d0..fcfe7b1c151 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -34,15 +34,11 @@ along with GCC; see the file COPYING3. If not see
FLOAT_TYPE_SIZE, DOUBLE_TYPE_SIZE and
LONG_DOUBLE_TYPE_SIZE. */
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index 2dabf0827b3..def4ffb85b7 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "gfortran.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/function.c b/gcc/function.c
index 7d2d7e4abca..42774be96c6 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -37,13 +37,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl-error.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -57,8 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index fc64ec95e6b..40180d46bb5 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index 3dd52ee316a..5fbc46cc2e1 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -49,15 +48,11 @@ along with GCC; see the file COPYING3. If not see
#include "plugin-api.h"
#include "ipa-ref.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
#include "tree-core.h"
#include "hash-set.h"
-#include "wide-int.h"
#include "inchash.h"
#include "fold-const.h"
#include "tree-check.h"
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 28476fb41a6..56714bdab38 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -141,13 +141,10 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
@@ -167,8 +164,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/generic-match-head.c b/gcc/generic-match-head.c
index 40dc53f5bf8..eb90986c903 100644
--- a/gcc/generic-match-head.c
+++ b/gcc/generic-match-head.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -52,8 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 7fceeba2a51..ce18a7b346f 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -45,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/gimple-builder.c b/gcc/gimple-builder.c
index 32088201a6b..dcb22c026de 100644
--- a/gcc/gimple-builder.c
+++ b/gcc/gimple-builder.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index 4d683d6d7e4..022437e3a3e 100644
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index b2ce851d489..db612458bd5 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -40,8 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index df29123f538..bce29fd8552 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index 7ae1330eafe..f1ba3d72507 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-match-head.c b/gcc/gimple-match-head.c
index cac037b31df..a1ef4158049 100644
--- a/gcc/gimple-match-head.c
+++ b/gcc/gimple-match-head.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -52,8 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index 2f9671f163b..40ea43aea92 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-ssa-isolate-paths.c b/gcc/gimple-ssa-isolate-paths.c
index de318f34831..61879b1258a 100644
--- a/gcc/gimple-ssa-isolate-paths.c
+++ b/gcc/gimple-ssa-isolate-paths.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index afd3215de85..adc4565db51 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -37,14 +37,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -67,8 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index eef076634ec..5face585092 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c
index 110caf19b2c..0116c24a80b 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimple-streamer.h b/gcc/gimple-streamer.h
index 440bce7b91c..1fef4d73a39 100644
--- a/gcc/gimple-streamer.h
+++ b/gcc/gimple-streamer.h
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/gimple-walk.c b/gcc/gimple-walk.c
index 53462b50201..cdaf31e1474 100644
--- a/gcc/gimple-walk.c
+++ b/gcc/gimple-walk.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "hash-set.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
diff --git a/gcc/gimple.c b/gcc/gimple.c
index 8b3b3229c3f..25d0e8a303a 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
#include "target.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimplify-me.c b/gcc/gimplify-me.c
index 2e3337c6408..89741e15994 100644
--- a/gcc/gimplify-me.c
+++ b/gcc/gimplify-me.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 721afd1c86d..da5fb1946fb 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -42,8 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index da6c9ef7c2e..da13f9493c3 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * go-backend.c: Adjust includes for restructured coretypes.h.
+ * go-c.h: Likewise.
+ * go-gcc.cc: Likewise.
+ * go-lang.c: Likewise.
+
2015-04-30 Chris Manghane <cmang@google.com>
* go-gcc.cc (Gcc_backend::stack_allocation_expression): New
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index 66ecee75ce9..7f452f51344 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "simple-object.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/go/go-c.h b/gcc/go/go-c.h
index 35a20e9bbe5..ea3aa382936 100644
--- a/gcc/go/go-c.h
+++ b/gcc/go/go-c.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#define GO_EXTERN_C
-#include "machmode.h"
/* Functions defined in the Go frontend proper called by the GCC
interface. */
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 82ce3ee6d2e..77e1a2ec9eb 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -25,14 +25,11 @@
#include <gmp.h>
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -55,7 +52,6 @@
#include "langhooks.h"
#include "toplev.h"
#include "output.h"
-#include "real.h"
#include "realmpfr.h"
#include "builtins.h"
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index fe5b583b51b..523131536e6 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "opts.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/godump.c b/gcc/godump.c
index 4147f754731..b3eceff196e 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -32,14 +32,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "ggc.h"
diff --git a/gcc/graph.c b/gcc/graph.c
index 5fb0d781bc2..5b368749e6a 100644
--- a/gcc/graph.c
+++ b/gcc/graph.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index dd3f03b72a7..9f3f924a68c 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -33,14 +33,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index edd357d870e..9fb0c9efca4 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -32,14 +32,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index 8c0d95d20bb..55cff163201 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -44,14 +44,11 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 90ce0c66e7a..8ccd87b7320 100644
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -39,14 +39,11 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index 8bdf7443018..eabb5c0bc85 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -33,14 +33,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index ae90c29f018..5b5af02e836 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -44,14 +44,11 @@ extern "C" {
#include "coretypes.h"
#include "diagnostic-core.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 02e9e502eae..d6b07971b7f 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -30,14 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 23b63ad1f5e..356f0a53733 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -41,14 +41,11 @@ extern "C" {
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -91,8 +88,6 @@ extern "C" {
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/graphite.c b/gcc/graphite.c
index c8f0617a5fb..245c336aff3 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -45,14 +45,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index bf8ce0bb7c4..bc1d8808b4f 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -134,7 +134,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "flags.h"
diff --git a/gcc/hooks.h b/gcc/hooks.h
index 02c24ce9da6..3d69f6d9fff 100644
--- a/gcc/hooks.h
+++ b/gcc/hooks.h
@@ -22,8 +22,6 @@
#ifndef GCC_HOOKS_H
#define GCC_HOOKS_H
-#include "machmode.h"
-#include "wide-int.h"
extern bool hook_bool_void_false (void);
extern bool hook_bool_void_true (void);
diff --git a/gcc/hw-doloop.c b/gcc/hw-doloop.c
index ff2cb7bac45..a6ba6b62796 100644
--- a/gcc/hw-doloop.c
+++ b/gcc/hw-doloop.c
@@ -28,16 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index f413fb78107..1e6c9cf3279 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -27,7 +27,6 @@
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -44,11 +43,7 @@
#include "basic-block.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/inchash.h b/gcc/inchash.h
index 4bb1272c1a9..03a25b46711 100644
--- a/gcc/inchash.h
+++ b/gcc/inchash.h
@@ -20,13 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef INCHASH_H
#define INCHASH_H 1
-#ifdef GENERATOR_FILE
-#include "bconfig.h"
-#else
-#include "config.h"
-#endif
-#include "system.h"
-#include "coretypes.h"
#include "hashtab.h"
/* This file implements an incremential hash function ADT, to be used
diff --git a/gcc/incpath.c b/gcc/incpath.c
index c4e0574cbf6..6bdc4f1445b 100644
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -20,7 +20,6 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "machmode.h"
#include "vec.h"
#include "target.h"
#include "tm.h"
diff --git a/gcc/init-regs.c b/gcc/init-regs.c
index 14b56f1f16b..9c41574c318 100644
--- a/gcc/init-regs.c
+++ b/gcc/init-regs.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -38,8 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c
index 2a64d9a5aff..a93698e3f23 100644
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -41,8 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/internal-fn.h b/gcc/internal-fn.h
index a80732096d3..2ff3347241f 100644
--- a/gcc/internal-fn.h
+++ b/gcc/internal-fn.h
@@ -20,8 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_INTERNAL_FN_H
#define GCC_INTERNAL_FN_H
-#include "coretypes.h"
-
/* Initialize internal function tables. */
extern void init_internal_fns ();
diff --git a/gcc/ipa-chkp.c b/gcc/ipa-chkp.c
index 87e21cae83c..391b0d9fce4 100644
--- a/gcc/ipa-chkp.c
+++ b/gcc/ipa-chkp.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-comdats.c b/gcc/ipa-comdats.c
index 3e6fc1d030e..659ab6d5838 100644
--- a/gcc/ipa-comdats.c
+++ b/gcc/ipa-comdats.c
@@ -53,13 +53,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "hash-map.h"
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 9f812fa5f5d..43b7559ba60 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -104,15 +104,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
#include "hash-map.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 29438740db3..b281f6ceac0 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -110,14 +110,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hash-map.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -135,8 +132,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c
index 9efdea465c2..8f885b04c58 100644
--- a/gcc/ipa-icf-gimple.c
+++ b/gcc/ipa-icf-gimple.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -48,8 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 190cd4c43d9..207a00d53de 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -56,14 +56,11 @@ along with GCC; see the file COPYING3. If not see
#include <list>
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -83,8 +80,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 7d8edee355e..2363786a0e5 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -69,15 +69,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 5a628f39dd6..9416fc7b8d4 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -33,13 +33,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 7fd2374bc52..e976e897dd0 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -94,13 +94,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index 1a82bb7fddb..22c90caf76e 100644
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -41,8 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c
index 7c967f9435e..a05e0534f67 100644
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@@ -49,13 +49,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index e90502bca5a..d9db13fa040 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -50,8 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index a4cdae9508b..71bb73dc53a 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -36,13 +36,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-ref.c b/gcc/ipa-ref.c
index 91c2f89af25..4a35ebb1a19 100644
--- a/gcc/ipa-ref.c
+++ b/gcc/ipa-ref.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index a420cb2042b..2c51111433a 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -41,14 +41,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 5d6763d102d..9d9aab38e3f 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -78,14 +78,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -107,8 +104,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index 076d71dd0d9..70ba595fd60 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index 7614cfbee4b..ca811060822 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -77,13 +77,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "hash-map.h"
diff --git a/gcc/ipa.c b/gcc/ipa.c
index 0b4010c3388..8b5a1456608 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/ira-build.c b/gcc/ira-build.c
index 534d0bc257e..a4e31168b49 100644
--- a/gcc/ira-build.c
+++ b/gcc/ira-build.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 543440d919b..2a1eb8be390 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -43,11 +42,7 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c
index 3bd963628ad..6e8ded80326 100644
--- a/gcc/ira-conflicts.c
+++ b/gcc/ira-conflicts.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "basic-block.h"
diff --git a/gcc/ira-costs.c b/gcc/ira-costs.c
index b5c9bdd17c7..4c0a83d838c 100644
--- a/gcc/ira-costs.c
+++ b/gcc/ira-costs.c
@@ -29,16 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/ira-emit.c b/gcc/ira-emit.c
index 88375875beb..b8b8d253312 100644
--- a/gcc/ira-emit.c
+++ b/gcc/ira-emit.c
@@ -81,7 +81,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -91,11 +90,7 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index 307696a7730..8c375cc74f8 100644
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "basic-block.h"
diff --git a/gcc/ira.c b/gcc/ira.c
index 804d162f0f0..0511049d4a0 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -369,13 +369,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "regs.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -396,8 +393,6 @@ along with GCC; see the file COPYING3. If not see
#include "df.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 4e26aef7ebd..fd9e2b1dda7 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,25 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * boehm.c: Adjust includes for restructured coretypes.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-05-20 David Malcolm <dmalcolm@redhat.com>
* jcf-parse.c (set_source_filename): Replace write through
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c
index 897f07d6125..027305aa345 100644
--- a/gcc/java/boehm.c
+++ b/gcc/java/boehm.c
@@ -26,16 +26,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "double-int.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index 067ce9fc5d0..fa1e12c53f8 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -31,14 +31,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -57,8 +54,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "hard-reg-set.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/java/class.c b/gcc/java/class.c
index d1adb581524..54aea3c4be0 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -27,14 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index 5b4b3fbd675..0b5dfcfb720 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -26,13 +26,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "tm.h"
#include "jcf.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 72133b4fcd2..8a2c66d1569 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -28,15 +28,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "real.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/java/except.c b/gcc/java/except.c
index 6dc01084698..5e141e300e0 100644
--- a/gcc/java/except.c
+++ b/gcc/java/except.c
@@ -26,13 +26,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 9af9e751275..16a788485cb 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -33,15 +33,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
PARM_BOUNDARY. */
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index 2a1ea7653ca..b84e115f96a 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -25,14 +25,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 52cfc588e1a..e527a656b05 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -55,14 +55,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 36ceb074cf3..0508fc66600 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -29,14 +29,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index d1c9fc45fc4..038f7f8b8ac 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -27,15 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "real.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
@@ -59,7 +55,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "cgraph.h"
#include "bitmap.h"
#include "target.h"
-#include "wide-int.h"
#ifdef HAVE_LOCALE_H
#include <locale.h>
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index fa31937dd39..9b55aa6d665 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -29,14 +29,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "obstack.h"
#include "jcf.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index dac322d512d..8caa28ea723 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -28,13 +28,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "input.h"
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index 8c0c00906b9..76ab3de045a 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -29,14 +29,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "jcf.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c
index 53eb926b7ae..70799b102d9 100644
--- a/gcc/java/mangle_name.c
+++ b/gcc/java/mangle_name.c
@@ -29,14 +29,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "coretypes.h"
#include "jcf.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "java-tree.h"
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 537bdb23483..9c8ef2cea66 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -25,14 +25,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index 0da6380c4c2..5e781c79199 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -27,14 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c
index b682dfe41fd..18e1ff3d02f 100644
--- a/gcc/java/verify-glue.c
+++ b/gcc/java/verify-glue.c
@@ -28,14 +28,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c
index bbd4097b037..eef7967ab33 100644
--- a/gcc/java/verify-impl.c
+++ b/gcc/java/verify-impl.c
@@ -16,14 +16,11 @@ details. */
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "verify.h"
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 279377c2580..8cd7823f5a8 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * dummy-frontend.c: Adjust includes for restructured coretypes.h.
+ * jit-common.h: Likewise.
+ * jit-playback.c: Likewise.
+
2015-05-12 David Malcolm <dmalcolm@redhat.com>
* jit-builtins.c: Include vec.h before target.h.
diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index 8f7d06afabf..38aa18268ba 100644
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -21,9 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "opts.h"
-#include "signop.h"
#include "hash-set.h"
-#include "fixed-value.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
@@ -39,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "plugin-api.h"
#include "vec.h"
#include "hashtab.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 8753651a2be..04f78165dc2 100644
--- a/gcc/jit/jit-common.h
+++ b/gcc/jit/jit-common.h
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "hash-set.h"
#include "input.h"
#include "vec.h"
-#include "double-int.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index c75c076a9be..0a812877d86 100644
--- a/gcc/jit/jit-playback.c
+++ b/gcc/jit/jit-playback.c
@@ -24,13 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "statistics.h"
#include "vec.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "flags.h"
#include "symtab.h"
@@ -42,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "plugin-api.h"
#include "vec.h"
#include "hashtab.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "function.h"
diff --git a/gcc/jump.c b/gcc/jump.c
index 66eb1d99a11..045b1f05f1b 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "predict.h"
@@ -58,11 +57,7 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 74f83519c54..a6824d375c8 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "toplev.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/lcm.c b/gcc/lcm.c
index 6188409c38b..9e8f5231f4d 100644
--- a/gcc/lcm.c
+++ b/gcc/lcm.c
@@ -62,7 +62,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index afd1da09336..0aa0709bf80 100644
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -28,16 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index 87e58ea677d..7a51611b29e 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "regs.h"
diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c
index c4321292b5e..1193283e32b 100644
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -46,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -57,11 +56,7 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/loop-iv.c b/gcc/loop-iv.c
index 8c3ef7784e6..d718b7c6106 100644
--- a/gcc/loop-iv.c
+++ b/gcc/loop-iv.c
@@ -58,7 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
@@ -68,11 +67,7 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c
index f1d2ea5c7b4..5beff1cb1ea 100644
--- a/gcc/loop-unroll.c
+++ b/gcc/loop-unroll.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "hard-reg-set.h"
@@ -48,8 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c
index 095b5696e71..0d2c729d70a 100644
--- a/gcc/lower-subreg.c
+++ b/gcc/lower-subreg.c
@@ -22,15 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "machmode.h"
#include "tm.h"
#include "hash-set.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -51,8 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "dce.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c
index 994b04fc643..0ad91d06fd5 100644
--- a/gcc/lra-assigns.c
+++ b/gcc/lra-assigns.c
@@ -90,17 +90,12 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/lra-coalesce.c b/gcc/lra-coalesce.c
index b38560323a3..f8692fa0c87 100644
--- a/gcc/lra-coalesce.c
+++ b/gcc/lra-coalesce.c
@@ -57,16 +57,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index a8d082022f8..e2c67e1e0c2 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -123,17 +123,12 @@
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c
index 4e5ba22e49f..920efc1b764 100644
--- a/gcc/lra-eliminations.c
+++ b/gcc/lra-eliminations.c
@@ -68,17 +68,12 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index 4dfe30f26b4..d3dce4674d2 100644
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -39,17 +39,12 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/lra-remat.c b/gcc/lra-remat.c
index a23cb5ba3e7..7e089d0a901 100644
--- a/gcc/lra-remat.c
+++ b/gcc/lra-remat.c
@@ -68,17 +68,12 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/lra-spills.c b/gcc/lra-spills.c
index caece9a043b..3cf54c3dccf 100644
--- a/gcc/lra-spills.c
+++ b/gcc/lra-spills.c
@@ -70,16 +70,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/lra.c b/gcc/lra.c
index 456f618203d..228f3632a18 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -117,18 +117,13 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "optabs.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index b5fd83ee7ab..b5557f8893b 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lto-compress.c b/gcc/lto-compress.c
index 07401129998..51d099163b5 100644
--- a/gcc/lto-compress.c
+++ b/gcc/lto-compress.c
@@ -28,14 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include <zlib.h>
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c
index 279107fdab3..8247b818d6b 100644
--- a/gcc/lto-opts.c
+++ b/gcc/lto-opts.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index 092b0e28923..bd7735ef436 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -47,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index 11b7cd0e978..1463216b330 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -47,8 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 4268bdeb823..1b836154d76 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "toplev.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -43,8 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index d36cfbcc3e5..9f282bada35 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -43,8 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index 542a81358e6..cb4d9897ebf 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 2d6ddf5cdc7..38442118969 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * lto-lang.c: Adjust includes for restructured coretypes.h.
+ * lto-object.c: Likewise.
+ * lto-partition.c: Likewise.
+ * lto-symtab.c: Likewise.
+ * lto.c: Likewise.
+
2015-06-04 Jan Hubicka <hubicka@ucw.cz>
* lto.c (hash_canonical_type): Use tree_code_for_canonical_type_merging.
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 073bf17cd10..5f20df5a386 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index 34dafb10dd2..714f8724b91 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index e7c22140802..823661a1339 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "toplev.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index 995c7c98c75..32d1b25d4de 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 498eb80450f..735a2e70c0c 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -24,17 +24,12 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "toplev.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
-#include "fixed-value.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/mcf.c b/gcc/mcf.c
index 9dacde2d783..077e14c5ea2 100644
--- a/gcc/mcf.c
+++ b/gcc/mcf.c
@@ -49,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 40d5b19c33c..5853e3a9ee4 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "predict.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index a6167c735f7..39e9bc3d8a8 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "profile.h"
@@ -48,17 +47,13 @@ along with GCC; see the file COPYING3. If not see
#include "sched-int.h"
#include "target.h"
#include "cfgloop.h"
-#include "double-int.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-codes.h"
#include "optabs.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 7445f0c6d52..4936900ecc0 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,14 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * objc-act.c: Adjust includes for restructured coretypes.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-04-27 Jim Wilson <jim.wilson@linaro.org>
* Make-lang.in (objc.mostlyclean): Remove cc1obj.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 718fdf08bcd..1d343ebce1f 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -68,7 +65,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "tree-iterator.h"
#include "hash-table.h"
-#include "wide-int.h"
#include "langhooks-def.h"
/* Different initialization, code gen and meta data generation for each
runtime. */
diff --git a/gcc/objc/objc-encoding.c b/gcc/objc/objc-encoding.c
index 31c44e8afca..f050ff03134 100644
--- a/gcc/objc/objc-encoding.c
+++ b/gcc/objc/objc-encoding.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/objc/objc-gnu-runtime-abi-01.c b/gcc/objc/objc-gnu-runtime-abi-01.c
index b096fb91f8f..7352c21837b 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.c
+++ b/gcc/objc/objc-gnu-runtime-abi-01.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index 62a91cd0de8..19a261b59ed 100644
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "c/c-tree.h"
diff --git a/gcc/objc/objc-map.c b/gcc/objc/objc-map.c
index c942cc25782..9c7330c952d 100644
--- a/gcc/objc/objc-map.c
+++ b/gcc/objc/objc-map.c
@@ -21,14 +21,11 @@ Boston, MA 02110-1301, USA. */
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "ggc.h"
diff --git a/gcc/objc/objc-next-runtime-abi-01.c b/gcc/objc/objc-next-runtime-abi-01.c
index 0e64694f142..0ae2dae6e23 100644
--- a/gcc/objc/objc-next-runtime-abi-01.c
+++ b/gcc/objc/objc-next-runtime-abi-01.c
@@ -27,14 +27,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index bc334f879e5..5a8abff79e0 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -30,14 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/objc/objc-runtime-shared-support.c b/gcc/objc/objc-runtime-shared-support.c
index 9a5d9c64837..d9b3c27af47 100644
--- a/gcc/objc/objc-runtime-shared-support.c
+++ b/gcc/objc/objc-runtime-shared-support.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index 2a3e4338ed8..9da818d93b1 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * objcp-decl.c: Adjust includes for restructured coretypes.h.
+ * objcp-lang.c: Likewise.
+
2015-04-27 Jim Wilson <jim.wilson@linaro.org>
* Make-lang.in (obj-c++.mostlyclean): Remove cc1objplus.
diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c
index 5df4b1a2f74..120f1899fcf 100644
--- a/gcc/objcp/objcp-decl.c
+++ b/gcc/objcp/objcp-decl.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c
index 0fc8a557978..cd5e4dce571 100644
--- a/gcc/objcp/objcp-lang.c
+++ b/gcc/objcp/objcp-lang.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
diff --git a/gcc/omega.c b/gcc/omega.c
index 436d9f7178b..9a8def930a5 100644
--- a/gcc/omega.c
+++ b/gcc/omega.c
@@ -34,14 +34,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "diagnostic-core.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 8290a651c9d..1236deb8162 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -74,8 +71,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 49e1c531c65..41e1f641fd8 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 1035b8d14c6..6edc11a89ad 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h" /* Required by langhooks.h. */
#include "fold-const.h"
diff --git a/gcc/passes.c b/gcc/passes.c
index 04ff04247ad..1ba56bdc617 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -29,12 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "line-map.h"
#include "input.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -53,8 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/plugin.c b/gcc/plugin.c
index ed4a2c5dc46..a770e6f766c 100644
--- a/gcc/plugin.c
+++ b/gcc/plugin.c
@@ -26,15 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "diagnostic-core.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
#include "flags.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tree-pass.h"
diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c
index 21ac6cd35f9..941f6cba9dd 100644
--- a/gcc/postreload-gcse.c
+++ b/gcc/postreload-gcse.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
@@ -50,8 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "profile.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/postreload.c b/gcc/postreload.c
index 06c49739ba7..7ecca15f759 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "rtl.h"
#include "tm_p.h"
@@ -36,11 +35,7 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "symtab.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/predict.c b/gcc/predict.c
index 1568633561e..47b3587deec 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -32,13 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -61,8 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 5e8838ae4cd..31d6d45ead5 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -34,13 +34,10 @@ along with GCC; see the file COPYING3. If not see
generator programs. */
#ifndef GENERATOR_FILE
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 6b36d0294bb..715dc859074 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -23,16 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
-#include "fixed-value.h"
#include "tree.h"
#include "varasm.h"
#include "print-rtl.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index abc1aadafd8..1971ecdb1de 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -58,16 +58,11 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/real.c b/gcc/real.c
index 43f124e05f7..f3f4a5f42e4 100644
--- a/gcc/real.c
+++ b/gcc/real.c
@@ -24,21 +24,16 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "diagnostic-core.h"
-#include "real.h"
#include "realmpfr.h"
#include "tm_p.h"
#include "dfp.h"
-#include "wide-int.h"
#include "rtl.h"
#include "options.h"
diff --git a/gcc/real.h b/gcc/real.h
index 37a8499baa1..bd2a864b59b 100644
--- a/gcc/real.h
+++ b/gcc/real.h
@@ -20,11 +20,6 @@
#ifndef GCC_REAL_H
#define GCC_REAL_H
-#include "machmode.h"
-#include "signop.h"
-#include "wide-int.h"
-#include "insn-modes.h"
-
/* An expanded form of the represented number. */
/* Enumerate the special cases of numbers that we encounter. */
diff --git a/gcc/realmpfr.c b/gcc/realmpfr.c
index 3ddb70446e8..ecca812c3b7 100644
--- a/gcc/realmpfr.c
+++ b/gcc/realmpfr.c
@@ -22,14 +22,11 @@
#include "coretypes.h"
#include "realmpfr.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h" /* For TYPE_MODE in real_from_mpfr. */
#include "stor-layout.h"
diff --git a/gcc/realmpfr.h b/gcc/realmpfr.h
index d1b12fd95e3..71497d7aff7 100644
--- a/gcc/realmpfr.h
+++ b/gcc/realmpfr.h
@@ -23,7 +23,6 @@
#include <mpfr.h>
#include <mpc.h>
-#include "real.h"
/* Convert between MPFR and REAL_VALUE_TYPE. The caller is
responsible for initializing and clearing the MPFR parameter. */
diff --git a/gcc/recog.c b/gcc/recog.c
index 39a5d1f89ff..ace0e9b3264 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl-error.h"
@@ -45,8 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/ree.c b/gcc/ree.c
index 031577abc62..78bef9b45f9 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -221,13 +221,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
@@ -243,8 +240,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 5c8b83b20cb..25fcf21e205 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -154,13 +154,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
diff --git a/gcc/regcprop.c b/gcc/regcprop.c
index 9bac11ac6a8..3311e816c54 100644
--- a/gcc/regcprop.c
+++ b/gcc/regcprop.c
@@ -31,7 +31,6 @@
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index e26520b9243..0e676e1607b 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "hard-reg-set.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -45,8 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/regrename.c b/gcc/regrename.c
index 3bcb9f08b24..1921831cb18 100644
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -31,7 +31,6 @@
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/regs.h b/gcc/regs.h
index 023d631ea46..8088d681f1a 100644
--- a/gcc/regs.h
+++ b/gcc/regs.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_REGS_H
#define GCC_REGS_H
-#include "machmode.h"
#include "hard-reg-set.h"
#include "rtl.h"
diff --git a/gcc/regstat.c b/gcc/regstat.c
index c683a49f0ff..de60f268d35 100644
--- a/gcc/regstat.c
+++ b/gcc/regstat.c
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/reload.c b/gcc/reload.c
index fe2ffe6ee5e..b3c18517fff 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -99,18 +99,13 @@ a register with any other reload. */
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 3ac8c2da764..88e96b7dbd2 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "rtl-error.h"
#include "tm_p.h"
@@ -38,11 +37,7 @@ along with GCC; see the file COPYING3. If not see
#include "symtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "expmed.h"
diff --git a/gcc/reorg.c b/gcc/reorg.c
index e0852907f3b..d1bc416438b 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -111,17 +111,12 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/resource.c b/gcc/resource.c
index ad644af9db7..f6ef01aeb9a 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "regs.h"
diff --git a/gcc/rtl-chkp.c b/gcc/rtl-chkp.c
index 5f12843adb7..321d05d8b92 100644
--- a/gcc/rtl-chkp.c
+++ b/gcc/rtl-chkp.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
@@ -33,11 +32,7 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/rtl.h b/gcc/rtl.h
index f9e1b27e4ce..863bfd42968 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -20,15 +20,23 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_RTL_H
#define GCC_RTL_H
+/* This file is occasionally included by generator files which expect
+ machmode.h and other files to exist and would not normally have been
+ included by coretypes.h. */
+#ifdef GENERATOR_FILE
+#include "machmode.h"
+#include "signop.h"
+#include "wide-int.h"
+#include "double-int.h"
+#include "real.h"
+#include "fixed-value.h"
+#endif /* GENERATOR_FILE */
+
#include "statistics.h"
-#include "machmode.h"
#include "input.h"
-#include "real.h"
#include "vec.h"
-#include "fixed-value.h"
#include "alias.h"
#include "hashtab.h"
-#include "wide-int.h"
#include "flags.h"
#include "is-a.h"
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index fce93abff82..544b57cc6a5 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -35,14 +35,12 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "predict.h"
#include "basic-block.h"
#include "df.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
diff --git a/gcc/rtlhooks.c b/gcc/rtlhooks.c
index 48cb7580478..938f37ea8be 100644
--- a/gcc/rtlhooks.c
+++ b/gcc/rtlhooks.c
@@ -27,17 +27,12 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "double-int.h"
-#include "real.h"
-#include "fixed-value.h"
#include "alias.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "insn-config.h"
diff --git a/gcc/sanopt.c b/gcc/sanopt.c
index 9689aef4f0a..7a5d102dda1 100644
--- a/gcc/sanopt.c
+++ b/gcc/sanopt.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 1671ccd501b..20da5f941f0 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h" /* FIXME: Used by call_may_noreturn_p. */
#include "tm_p.h"
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index aa4decc5ff0..c49e6ac973d 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "profile.h"
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index fd53a3f8621..ba78738752d 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "profile.h"
diff --git a/gcc/sched-vis.c b/gcc/sched-vis.c
index 31794e66f4c..f4717baa87f 100644
--- a/gcc/sched-vis.c
+++ b/gcc/sched-vis.c
@@ -29,20 +29,16 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h" /* FIXME: To dump INSN_VAR_LOCATION_DECL. */
#include "predict.h"
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/sdbout.c b/gcc/sdbout.c
index b4f7325ee3c..575113422ba 100644
--- a/gcc/sdbout.c
+++ b/gcc/sdbout.c
@@ -45,13 +45,10 @@ AT&T C compiler. From the example below I would conclude the following:
#include "tm.h"
#include "debug.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
diff --git a/gcc/sel-sched-dump.c b/gcc/sel-sched-dump.c
index 943fdd00ba2..362daacbbca 100644
--- a/gcc/sel-sched-dump.c
+++ b/gcc/sel-sched-dump.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "predict.h"
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index ffaba56de00..0e89c4883a8 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "predict.h"
@@ -49,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "sched-int.h"
#include "ggc.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index 668c433dab0..ae2ef91df10 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "predict.h"
@@ -47,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "sched-int.h"
#include "ggc.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "langhooks.h"
diff --git a/gcc/sese.c b/gcc/sese.c
index c274547c85a..25b59dd7a18 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "mem-stats.h"
#include "hash-map.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index 6c59da95133..52cc033d666 100644
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl-error.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -45,8 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h
index 8c9582d597b..4e86b4156a9 100644
--- a/gcc/shrink-wrap.h
+++ b/gcc/shrink-wrap.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "vec.h"
-#include "machmode.h"
#include "function.h"
/* In shrink-wrap.c. */
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 665421b79a2..0639a0e8298 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -46,8 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/stack-ptr-mod.c b/gcc/stack-ptr-mod.c
index 5db8fc0efa8..e1288bceedf 100644
--- a/gcc/stack-ptr-mod.c
+++ b/gcc/stack-ptr-mod.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "rtl.h"
@@ -38,8 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/statistics.c b/gcc/statistics.c
index 50b41d13d70..b3892c659cd 100644
--- a/gcc/statistics.c
+++ b/gcc/statistics.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/stmt.c b/gcc/stmt.c
index a04f69bc660..58bdaa0cb9f 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -30,13 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "hard-reg-set.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 82997ddc0bb..88ab36f55f2 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -44,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index fdd2f473908..f61daba90c8 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
@@ -52,8 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/stringpool.c b/gcc/stringpool.c
index d23868cafd0..10072fc7b0b 100644
--- a/gcc/stringpool.c
+++ b/gcc/stringpool.c
@@ -31,14 +31,11 @@ along with GCC; see the file COPYING3. If not see
#include "ggc.h"
#include "ggc-internal.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "cpplib.h"
diff --git a/gcc/symtab.c b/gcc/symtab.c
index 156fa3d9f28..c117a0ff3c2 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/target-globals.c b/gcc/target-globals.c
index 6983b5cc9b5..11c304c51c9 100644
--- a/gcc/target-globals.c
+++ b/gcc/target-globals.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "insn-config.h"
-#include "machmode.h"
#include "hash-set.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "ggc.h"
@@ -44,8 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "function.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "dojump.h"
#include "explow.h"
#include "calls.h"
diff --git a/gcc/target.h b/gcc/target.h
index c3fb89c7213..a79f424415e 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -48,9 +48,7 @@
#ifndef GCC_TARGET_H
#define GCC_TARGET_H
-#include "insn-modes.h"
#include "insn-codes.h"
-#include "wide-int.h"
#include "tm.h"
#include "hard-reg-set.h"
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 44fcd9b6a12..c858c84103e 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -50,15 +50,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "machmode.h"
#include "rtl.h"
#include "hash-set.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -69,8 +66,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 3b57b482c3d..f38fb32c0db 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -29,12 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "line-map.h"
#include "input.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -56,8 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/tracer.c b/gcc/tracer.c
index 87a8dc29424..d1ec6c96799 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -38,13 +38,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index d6cbd7611bb..9c7e5ad265d 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -22,14 +22,11 @@
#include "coretypes.h"
#include "hash-table.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index a8055d6485a..c2fd286aed9 100644
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -39,8 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-affine.h b/gcc/tree-affine.h
index a779da7e959..3afb6520be7 100644
--- a/gcc/tree-affine.h
+++ b/gcc/tree-affine.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#define GCC_TREE_AFFINE_H
#include "hash-map.h"
-#include "wide-int.h"
#define MAX_AFF_ELTS 8
diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c
index 70e93e6833d..1cd4ef80d2d 100644
--- a/gcc/tree-browser.c
+++ b/gcc/tree-browser.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "hash-table.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tree-pretty-print.h"
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index 5a6a4cfccf6..9ec11b21fa6 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -35,10 +34,7 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "symtab.h"
#include "alias.h"
-#include "double-int.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index c53cf3e76e9..b8a1c867dab 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "hash-map.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -73,8 +70,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 562f5923614..04e560dffc0 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -62,8 +59,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-chkp-opt.c b/gcc/tree-chkp-opt.c
index 3fa2380d4bf..4b8def4bda3 100644
--- a/gcc/tree-chkp-opt.c
+++ b/gcc/tree-chkp-opt.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -65,8 +62,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c
index 015df1139c7..1c81ba1af1a 100644
--- a/gcc/tree-chkp.c
+++ b/gcc/tree-chkp.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -72,8 +69,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index 9357a561739..c631d89f8d9 100644
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -27,16 +27,12 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-pretty-print.h"
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index c5b8688b66e..63f7f0c517c 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.c
@@ -22,15 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
@@ -59,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 368d3dfc72a..5f3a3d1cbc7 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -77,14 +77,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -95,8 +92,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 8ee46dc81f4..b974208b69c 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -59,8 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-diagnostic.c b/gcc/tree-diagnostic.c
index 7461a94d6ba..8640c0b318b 100644
--- a/gcc/tree-diagnostic.c
+++ b/gcc/tree-diagnostic.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "diagnostic.h"
diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c
index 620b3913654..8ee85617b44 100644
--- a/gcc/tree-dump.c
+++ b/gcc/tree-dump.c
@@ -23,17 +23,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
-#include "fixed-value.h"
#include "splay-tree.h"
#include "filenames.h"
#include "tree-dump.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 5d41cb42329..0529dfb244e 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -39,8 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index 4d7b4e96a85..b8c97632b5c 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 28e1c475c5f..8e9589fdfcc 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -85,13 +85,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -132,8 +129,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 71d75d9df51..28a7e11f089 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic-core.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -71,8 +68,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-into-ssa.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index e8b55c134de..b1130d4006b 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -61,8 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-iterator.c b/gcc/tree-iterator.c
index d62f272f589..a654e644646 100644
--- a/gcc/tree-iterator.c
+++ b/gcc/tree-iterator.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "tree-iterator.h"
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 904f4e8db60..3452cf98cfc 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -45,14 +45,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index f2e6d3acfd7..742b51cc8d9 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -22,13 +22,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -60,8 +57,6 @@
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index f4b162a6865..3a3c87886e2 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c
index 828a3d02dbc..e51f7831920 100644
--- a/gcc/tree-object-size.c
+++ b/gcc/tree-object-size.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index e23bc0bfc87..58dadc3c524 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -71,8 +68,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index 080d35ea527..80cdb864b27 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index d657907f938..efb58fcb926 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index 03a38b4de84..558c2cd72fb 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -189,13 +189,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -230,8 +227,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index cf875c88856..8df6dc65717 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -39,8 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-pretty-print.h b/gcc/tree-pretty-print.h
index 815afbb6eab..16fd0bdba50 100644
--- a/gcc/tree-pretty-print.h
+++ b/gcc/tree-pretty-print.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#define GCC_TREE_PRETTY_PRINT_H
#include "pretty-print.h"
-#include "double-int.h"
#define pp_unsupported_tree(PP, T) \
pp_verbatim (PP, "#%qs not supported by %s#", \
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 563610b3d63..5f9f0332611 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
@@ -42,11 +41,9 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "diagnostic-core.h"
#include "coverage.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 3a2c284b582..35a697dac65 100644
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -257,14 +257,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -275,8 +272,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index ae42c9ba645..90067cbc64a 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -80,13 +80,10 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -118,8 +115,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c
index d6afa2b8d66..3d87335e6d9 100644
--- a/gcc/tree-ssa-address.c
+++ b/gcc/tree-ssa-address.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -56,8 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 9184242a7ee..d954b8e13ae 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -58,8 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index ebd493d50e7..06e5ddefe52 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -123,15 +123,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index b05a86086ef..47742cecbf6 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index 5ae8e6c27e9..78537f60fc4 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index f3cb56ef5f9..d225631f85c 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -54,8 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index df306142804..98aa6486f8e 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -47,13 +47,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -86,8 +83,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 42324ee6214..7f7d70de596 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -24,15 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index ce4e60d7499..2315c59b68d 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -57,8 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 93f92f33a59..0d95b5f71b9 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -61,8 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index 4170c9be3af..fe9a220b9a9 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 2c7c0729870..8799109d329 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -58,8 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index 82340c48f5d..09ab48125c2 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 11fc699433d..3b680e6c044 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 0e1d75d3323..c561811cafb 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -40,13 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 1854b335bae..7d23b408f29 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -66,13 +66,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -113,8 +110,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 228fac665d6..5eb0755dcff 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
index 3f6bebe63dc..d2b5f24e608 100644
--- a/gcc/tree-ssa-loop-niter.c
+++ b/gcc/tree-ssa-loop-niter.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
@@ -40,8 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index a948d6842e3..9c50c18b775 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -73,8 +70,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index 7225acda302..a6d640837b4 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-loop.c b/gcc/tree-ssa-loop.c
index ccb8f9762bb..31d762e301e 100644
--- a/gcc/tree-ssa-loop.c
+++ b/gcc/tree-ssa-loop.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-loop.h b/gcc/tree-ssa-loop.h
index 836bad67728..0e637c916c1 100644
--- a/gcc/tree-ssa-loop.h
+++ b/gcc/tree-ssa-loop.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_SSA_LOOP_H
#define GCC_TREE_SSA_LOOP_H
-#include "wide-int.h"
/* Affine iv. */
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index 0df755b8d17..4f45f1a5fe3 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -90,13 +90,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -125,8 +122,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index 9d569212793..6d6f6d0b614 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index b8c77ab0816..ce6193833c6 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -60,8 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index 93da65117d1..57e13c6a909 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 082dbafc7de..192084f7b62 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -66,8 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index cc2b1c4f48f..497038f9a7a 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -23,13 +23,10 @@
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 367f0eb93e1..4d0120c004a 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -67,8 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index e7838ed4132..8eba4c3d328 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -61,8 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-scopedtables.c b/gcc/tree-ssa-scopedtables.c
index c336a902a05..a961d5f68c3 100644
--- a/gcc/tree-ssa-scopedtables.c
+++ b/gcc/tree-ssa-scopedtables.c
@@ -23,15 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "tree-pretty-print.h"
#include "tree-pass.h"
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index 1ed8a0e367a..77d8f211fea 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index 26641895d48..ddac444bd23 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -63,8 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 0cd881236f0..2b7d97723a1 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -30,17 +30,14 @@
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
-#include "double-int.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -63,8 +60,6 @@
#include "tree-into-ssa.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index 4ff029d2156..c348b3dbf6d 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -190,15 +190,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c
index fa096a6707e..abf442610ba 100644
--- a/gcc/tree-ssa-ter.c
+++ b/gcc/tree-ssa-ter.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 932b443d2cd..c627e513c13 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index ce1dcdb96a7..a0a9084f075 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index f75a7f1b8e0..f117040747c 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.c
@@ -22,15 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index 19a3e8231f3..d074002fc88 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 10d3314558e..b87016e5de8 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index 9c39f65e6b6..6bad037e613 100644
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 794b94a41ba..28fb58f371c 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 6d84efbffe9..fc5b639b96c 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -24,17 +24,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
-#include "fixed-value.h"
#include "tree.h"
#include "fold-const.h"
#include "stringpool.h"
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 0e5458b14f2..d7cada73fe0 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -25,16 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "diagnostic.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
-#include "real.h"
-#include "fixed-value.h"
#include "tree.h"
#include "fold-const.h"
#include "stor-layout.h"
diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c
index 2eb0305f3dc..0fcc43413ac 100644
--- a/gcc/tree-streamer.c
+++ b/gcc/tree-streamer.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 3440ca40b05..98c45c27ffb 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -30,13 +30,10 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "params.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -78,8 +75,6 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 013972dbfdd..06ee503e28e 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -57,8 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index a019dba3ebd..ca334466590 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -76,8 +73,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index a88b22f659d..885d6175859 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.c
@@ -21,14 +21,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -63,8 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index a344a49948b..6a2a9dd3f4c 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 71df11c0f6f..7756dc7f895 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -66,8 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c
index 42002c464d0..cb40596302a 100644
--- a/gcc/tree-vect-patterns.c
+++ b/gcc/tree-vect-patterns.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -59,8 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 5fd16352e39..b09c2c3300b 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -59,8 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 0eeebb0dafb..75832407d5b 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -67,8 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index e216114fb60..716f10f5716 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -60,13 +60,10 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 22587d00bc5..049d89e0f00 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -76,8 +73,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index b3244050d7a..f02eb19da9c 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -33,13 +33,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -82,8 +79,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "rtl.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index 2752182bb52..e6e93eb3abf 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -23,14 +23,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -41,8 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 96536c50881..5a7bab44ca3 100644
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -67,8 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/valtrack.c b/gcc/valtrack.c
index d5d4578ee5b..43d66d9182c 100644
--- a/gcc/valtrack.c
+++ b/gcc/valtrack.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 7252449d4ba..98267724d67 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -40,8 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "flags.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 0b240073bb3..8536747127b 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -91,13 +91,10 @@
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
@@ -121,8 +118,6 @@
#include "regs.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "expmed.h"
#include "dojump.h"
#include "explow.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 93b9699404d..18f3eace451 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
@@ -49,8 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "hashtab.h"
#include "statistics.h"
-#include "real.h"
-#include "fixed-value.h"
#include "insn-config.h"
#include "expmed.h"
#include "dojump.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 76148a584b3..d09b17243e9 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index 23d8365cb0c..4b184c729bf 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#ifdef VMS_DEBUGGING_INFO
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"
diff --git a/gcc/vtable-verify.c b/gcc/vtable-verify.c
index 8ced83518d9..29b9c68f7f8 100644
--- a/gcc/vtable-verify.c
+++ b/gcc/vtable-verify.c
@@ -136,14 +136,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
diff --git a/gcc/web.c b/gcc/web.c
index a922dc5b4c9..63f592fbfc5 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -47,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "input.h"
#include "function.h"
#include "dominance.h"
diff --git a/gcc/wide-int-print.cc b/gcc/wide-int-print.cc
index ead67714a36..3f70edefa1b 100644
--- a/gcc/wide-int-print.cc
+++ b/gcc/wide-int-print.cc
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hwint.h"
-#include "wide-int.h"
#include "wide-int-print.h"
/*
diff --git a/gcc/wide-int-print.h b/gcc/wide-int-print.h
index eb7f23f9e71..3c45d0a5430 100644
--- a/gcc/wide-int-print.h
+++ b/gcc/wide-int-print.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#define WIDE_INT_PRINT_H
#include <stdio.h>
-#include "wide-int.h"
#define WIDE_INT_PRINT_BUFFER_SIZE (WIDE_INT_MAX_PRECISION / 4 + 4)
diff --git a/gcc/wide-int.cc b/gcc/wide-int.cc
index 1a7fc1435d0..b5aa9c52779 100644
--- a/gcc/wide-int.cc
+++ b/gcc/wide-int.cc
@@ -23,11 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hwint.h"
-#include "wide-int.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
diff --git a/gcc/wide-int.h b/gcc/wide-int.h
index 46f45453c01..d8f7b46080b 100644
--- a/gcc/wide-int.h
+++ b/gcc/wide-int.h
@@ -216,11 +216,6 @@ along with GCC; see the file COPYING3. If not see
the same result as X + X; the precision of the shift amount Y
can be arbitrarily different from X. */
-#include "system.h"
-#include "hwint.h"
-#include "signop.h"
-#include "insn-modes.h"
-
/* The MAX_BITSIZE_MODE_ANY_INT is automatically generated by a very
early examination of the target's mode file. The WIDE_INT_MAX_ELTS
can accomodate at least 1 more bit so that unsigned numbers of that
diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c
index ac27f39b97a..405a4f675f3 100644
--- a/gcc/xcoffout.c
+++ b/gcc/xcoffout.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "hash-set.h"
-#include "machmode.h"
#include "vec.h"
-#include "double-int.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "wide-int.h"
#include "inchash.h"
#include "tree.h"
#include "varasm.h"