decl.c: Remove unused header files.

ada

	* gcc-interface/decl.c: Remove unused header files.
	* gcc-interface/misc.c: Likewise.
	* gcc-interface/targtyps.c: Likewise.
	* gcc-interface/trans.c: Likewise.
	* gcc-interface/utils.c: Likewise.
c

	* c-array-notation.c: Remove unused header files.
	* 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.
	* gccspec.c: Likewise.

c-family

	* array-notation-common.c: Remove unused header files.
	* c-ada-spec.c: Likewise.
	* c-cilkplus.c: Likewise.
	* c-common.c: 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

	* call.c: Remove unused header files.
	* class.c: Likewise.
	* constexpr.c: Likewise.
	* cp-array-notation.c: Likewise.
	* cp-cilkplus.c: Likewise.
	* cp-gimplify.c: Likewise.
	* cp-lang.c: Likewise.
	* cp-objcp-common.c: Likewise.
	* cp-ubsan.c: Likewise.
	* cvt.c: Likewise.
	* cxx-pretty-print.c: Likewise.
	* decl.c: Likewise.
	* decl2.c: Likewise.
	* dump.c: Likewise.
	* error.c: Likewise.
	* except.c: Likewise.
	* expr.c: Likewise.
	* friend.c: Likewise.
	* g++spec.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

	* array.c: Remove unused header files.
	* convert.c: Likewise.
	* cpp.c: Likewise.
	* decl.c: Likewise.
	* f95-lang.c: Likewise.
	* frontend-passes.c: Likewise.
	* iresolve.c: Likewise.
	* match.c: Likewise.
	* module.c: Likewise.
	* options.c: Likewise.
	* parse.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

	* go-backend.c: Remove unused header files.
	* go-gcc.cc: Likewise.
	* go-lang.c: Likewise.
	* gospec.c: Likewise.

Java

	* boehm.c: Remove unused header files.
	* 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.
	* zextract.c: Likewise.

jit

	* dummy-frontend.c: Remove unused header files.
	* jit-builtins.c: Likewise.
	* jit-playback.c: Likewise.
	* jit-recording.c: Likewise.
	* jit-spec.c: Likewise.
	* libgccjit.c: Likewise.

lto

	* lto-lang.c: Remove unused header files.
	* lto-object.c: Likewise.
	* lto-partition.c: Likewise.
	* lto-symtab.c: Likewise.
	* lto.c: Likewise.

objc

	* objc-act.c: Remove unused header files.
	* objc-encoding.c: Likewise.
	* objc-gnu-runtime-abi-01.c: Likewise.
	* objc-lang.c: Likewise.
	* objc-map.c: Likewise.
	* objc-next-runtime-abi-01.c: Likewise.
	* objc-next-runtime-abi-02.c: Likewise.
	* objc-runtime-shared-support.c: Likewise.

objcp

	* objcp-decl.c: Remove unused header files.
	* objcp-lang.c: Likewise.

From-SVN: r230166

151 files changed, 174 insertions, 571 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ca1cb61..e5bb3e4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* gcc-interface/decl.c: Remove unused header files.
+	* gcc-interface/misc.c: Likewise.
+	* gcc-interface/targtyps.c: Likewise.
+	* gcc-interface/trans.c: Likewise.
+	* gcc-interface/utils.c: Likewise.
+
 2015-11-08  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/gigi.h (set_reverse_storage_order_on_pad_type):
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 627eace..b345a88 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "ggc.h"
 #include "target.h"
 #include "tree.h"
 #include "stringpool.h"
@@ -34,8 +33,6 @@
 #include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
-#include "flags.h"
-#include "toplev.h"
 #include "tree-inline.h"
 
 #include "ada.h"
@@ -46,7 +43,6 @@
 #include "nlists.h"
 #include "repinfo.h"
 #include "snames.h"
-#include "stringt.h"
 #include "uintp.h"
 #include "fe.h"
 #include "sinfo.h"
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index da724f1..0e5de24 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "ggc.h"
 #include "target.h"
 #include "tree.h"
 #include "diagnostic.h"
@@ -35,8 +34,6 @@
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "print-tree.h"
-#include "flags.h"
-#include "debug.h"
 #include "toplev.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
@@ -48,10 +45,8 @@
 #include "adadecode.h"
 #include "types.h"
 #include "atree.h"
-#include "elists.h"
 #include "namet.h"
 #include "nlists.h"
-#include "stringt.h"
 #include "uintp.h"
 #include "fe.h"
 #include "sinfo.h"
diff --git a/gcc/ada/gcc-interface/targtyps.c b/gcc/ada/gcc-interface/targtyps.c
index b508157..78a9db9 100644
--- a/gcc/ada/gcc-interface/targtyps.c
+++ b/gcc/ada/gcc-interface/targtyps.c
@@ -30,22 +30,9 @@
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "tm_p.h"
-#include "alias.h"
 
 #include "ada.h"
 #include "types.h"
-#include "atree.h"
-#include "elists.h"
-#include "namet.h"
-#include "nlists.h"
-#include "snames.h"
-#include "stringt.h"
-#include "uintp.h"
-#include "urealp.h"
-#include "fe.h"
-#include "sinfo.h"
-#include "einfo.h"
 #include "ada-tree.h"
 #include "gigi.h"
 
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 5c093fb..a347b3b 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -39,7 +39,6 @@
 #include "stor-layout.h"
 #include "stmt.h"
 #include "varasm.h"
-#include "flags.h"
 #include "output.h"
 #include "libfuncs.h"	/* For set_stack_check_libfunc.  */
 #include "tree-iterator.h"
@@ -51,7 +50,6 @@
 #include "adadecode.h"
 #include "types.h"
 #include "atree.h"
-#include "elists.h"
 #include "namet.h"
 #include "nlists.h"
 #include "snames.h"
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 224dc00..1e9e936 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -26,11 +26,9 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "ggc.h"
 #include "target.h"
 #include "function.h"
 #include "tree.h"
-#include "timevar.h"
 #include "stringpool.h"
 #include "cgraph.h"
 #include "diagnostic.h"
@@ -39,7 +37,6 @@
 #include "stor-layout.h"
 #include "attribs.h"
 #include "varasm.h"
-#include "flags.h"
 #include "toplev.h"
 #include "output.h"
 #include "debug.h"
@@ -48,15 +45,11 @@
 #include "langhooks.h"
 #include "tree-dump.h"
 #include "tree-inline.h"
-#include "tree-iterator.h"
 
 #include "ada.h"
 #include "types.h"
 #include "atree.h"
-#include "elists.h"
-#include "namet.h"
 #include "nlists.h"
-#include "stringt.h"
 #include "uintp.h"
 #include "fe.h"
 #include "sinfo.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 4188535..0a99798 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,26 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* array-notation-common.c: Remove unused header files.
+	* c-ada-spec.c: Likewise.
+	* c-cilkplus.c: Likewise.
+	* c-common.c: 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-11-09  Thomas Schwinge  <thomas@codesourcery.com>
 	    Cesar Philippidis  <cesar@codesourcery.com>
 	    James Norris  <jnorris@codesourcery.com>
diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c
index 960b207..4f7072b 100644
--- a/gcc/c-family/array-notation-common.c
+++ b/gcc/c-family/array-notation-common.c
@@ -25,9 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h" 
 #include "coretypes.h"
 #include "options.h"
-#include "tree.h"
 #include "c-family/c-common.h"
-#include "langhooks.h" 
 #include "tree-iterator.h"
 
 /* Returns true if the function call in FNDECL is  __sec_implicit_index.  */
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index cf4c6e9..216bd6f 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -25,10 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "tree.h"
 #include "c-ada-spec.h"
-#include "alias.h"
 #include "fold-const.h"
-#include "dumpfile.h"
-#include "cpplib.h"
 #include "c-pragma.h"
 #include "cpp-id-data.h"
 
diff --git a/gcc/c-family/c-cilkplus.c b/gcc/c-family/c-cilkplus.c
index 6042462..a73660f 100644
--- a/gcc/c-family/c-cilkplus.c
+++ b/gcc/c-family/c-cilkplus.c
@@ -23,10 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
-#include "tree.h"
 #include "c-common.h"
-#include "alias.h"
 
 /* Validate the body of a _Cilk_for construct or a <#pragma simd> for
    loop.
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 53c1d81..8b424d3 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "function.h"
-#include "obstack.h"
 #include "tree.h"
 #include "c-common.h"
 #include "gimple-expr.h"
@@ -38,8 +37,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "attribs.h"
 #include "varasm.h"
 #include "trans-mem.h"
-#include "flags.h"
-#include "c-pragma.h"
 #include "c-objc.h"
 #include "common/common-target.h"
 #include "langhooks.h"
diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index f729787..313788d 100644
--- a/gcc/c-family/c-cppbuiltin.c
+++ b/gcc/c-family/c-cppbuiltin.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "c-common.h"
 #include "tm_p.h"		/* For TARGET_CPU_CPP_BUILTINS & friends.  */
 #include "stringpool.h"
-#include "alias.h"
 #include "stor-layout.h"
-#include "version.h"
 #include "flags.h"
 #include "c-pragma.h"
 #include "output.h"		/* For user_label_prefix.  */
diff --git a/gcc/c-family/c-dump.c b/gcc/c-family/c-dump.c
index 5cebcb9..52a3adc 100644
--- a/gcc/c-family/c-dump.c
+++ b/gcc/c-family/c-dump.c
@@ -21,10 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "c-common.h"
-#include "alias.h"
 #include "tree-dump.h"
 
 /* Dump any C-specific tree codes and attributes of common codes.  */
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index c309a54..6e37265 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "c-target.h"
-#include "tree.h"
 #include "c-common.h"
 #include "alloc-pool.h"
 #include "stringpool.h"
-#include "alias.h"
-#include "flags.h"
 #include "c-objc.h"
 #include "intl.h"
 #include "langhooks.h"
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index c67db88..a3d0025 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -29,21 +29,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "function.h"
 #include "basic-block.h"
-#include "hard-reg-set.h"
 #include "tree.h"
-#include "c-common.h"
 #include "gimple.h"
-#include "predict.h"
 #include "cgraph.h"
 #include "c-pretty-print.h"
-#include "alias.h"
-#include "fold-const.h"
-#include "internal-fn.h"
 #include "gimplify.h"
-#include "tree-inline.h"
 #include "langhooks.h"
-#include "langhooks-def.h"
-#include "flags.h"
 #include "dumpfile.h"
 #include "cilk.h"
 #include "c-ubsan.h"
diff --git a/gcc/c-family/c-indentation.c b/gcc/c-family/c-indentation.c
index a525e9a..638a9cf 100644
--- a/gcc/c-family/c-indentation.c
+++ b/gcc/c-family/c-indentation.c
@@ -21,11 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "tree.h"
 #include "c-common.h"
-#include "stringpool.h"
-#include "alias.h"
-#include "stor-layout.h"
 #include "c-indentation.h"
 
 extern cpp_options *cpp_opts;
diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index ae16cfc..7800b7d 100644
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -21,15 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "c-common.h"
 #include "timevar.h"
 #include "stringpool.h"
-#include "alias.h"
 #include "stor-layout.h"
-#include "flags.h"
 #include "c-pragma.h"
-#include "intl.h"
 #include "debug.h"
 
 #include "attribs.h"
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index 3e93b59..e3d41a6 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
+#include "options.h"
 #include "c-common.h"
 #include "gimple-expr.h"
-#include "alias.h"
 #include "c-pragma.h"
-#include "langhooks.h"
 #include "omp-low.h"
 #include "gomp-constants.h"
 
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index e42b7ae..4da6f31 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -23,11 +23,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "c-target.h"
-#include "tree.h"
 #include "c-common.h"
 #include "tm_p.h"		/* For C_COMMON_OVERRIDE_OPTIONS.  */
 #include "diagnostic.h"
-#include "alias.h"
 #include "c-pragma.h"
 #include "flags.h"
 #include "toplev.h"
diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c
index fa256e4..3a84498 100644
--- a/gcc/c-family/c-pch.c
+++ b/gcc/c-family/c-pch.c
@@ -21,18 +21,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "c-common.h"
 #include "timevar.h"
-#include "version.h"
-#include "cpplib.h"
-#include "alias.h"
 #include "flags.h"
 #include "debug.h"
 #include "c-pragma.h"
 #include "langhooks.h"
 #include "hosthooks.h"
-#include "opts.h"
 
 /* This is a list of flag variables that must match exactly, and their
    names for the error message.  The possible values for *flag_var must
diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c
index 6502248..9fe4aa9 100644
--- a/gcc/c-family/c-ppoutput.c
+++ b/gcc/c-family/c-ppoutput.c
@@ -19,12 +19,8 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
-#include "tree.h"
 #include "c-common.h"		/* For flags.  */
-#include "cpplib.h"
 #include "../libcpp/internal.h"
-#include "alias.h"
 #include "c-pragma.h"		/* For parse_in.  */
 
 /* Encapsulates state used to convert a stream of tokens into a text
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index 50324b8..26f001a 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -22,18 +22,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "function.h"		/* For cfun.  */
-#include "tree.h"
 #include "c-common.h"
 #include "tm_p.h"		/* For REGISTER_TARGET_PRAGMAS.  */
 #include "stringpool.h"
 #include "cgraph.h"
 #include "diagnostic.h"
-#include "alias.h"
 #include "attribs.h"
 #include "varasm.h"
-#include "cpplib.h"
 #include "c-pragma.h"
-#include "flags.h"
 #include "opts.h"
 #include "plugin.h"
 
diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c
index 6b439ec..ea60375 100644
--- a/gcc/c-family/c-pretty-print.c
+++ b/gcc/c-family/c-pretty-print.c
@@ -21,16 +21,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "c-pretty-print.h"
 #include "diagnostic.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "attribs.h"
 #include "intl.h"
 #include "tree-pretty-print.h"
-#include "tree-iterator.h"
 
 /* The pretty-printer code is primarily designed to closely follow
    (GNU) C and C++ grammars.  That is to be contrasted with spaghetti
diff --git a/gcc/c-family/c-semantics.c b/gcc/c-family/c-semantics.c
index e481f96..0bbc3c9 100644
--- a/gcc/c-family/c-semantics.c
+++ b/gcc/c-family/c-semantics.c
@@ -21,14 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "function.h"
-#include "hard-reg-set.h"
-#include "tree.h"
 #include "c-common.h"
-#include "alias.h"
-#include "splay-tree.h"
-#include "flags.h"
 #include "tree-iterator.h"
 
 /* Create an empty statement tree rooted at T.  */
diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index f35e8eb..d5f71a4 100644
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -22,18 +22,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "function.h"
-#include "hard-reg-set.h"
-#include "tree.h"
 #include "c-family/c-common.h"
-#include "alloc-pool.h"
-#include "cgraph.h"
-#include "output.h"
-#include "toplev.h"
 #include "ubsan.h"
 #include "c-family/c-ubsan.h"
 #include "asan.h"
-#include "internal-fn.h"
 #include "stor-layout.h"
 #include "builtins.h"
 #include "gimplify.h"
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 3ab7f4e..e75e20c 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "function.h"
-#include "hard-reg-set.h"
-#include "tree.h"
 #include "c-family/c-common.h"
 #include "gimple-expr.h"
 #include "stringpool.h"
 #include "cgraph.h"
 #include "diagnostic.h"
-#include "langhooks.h"
 #include "gimplify.h"
 #include "tree-iterator.h"
 #include "tree-inline.h"
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index 4aa2f4d..5525570 100644
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.c
@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
-#include "c-common.h"
-#include "alias.h"
 #include "c-objc.h"
 
 tree
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 0124dcc..8fb3786 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,16 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* c-array-notation.c: Remove unused header files.
+	* 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.
+	* gccspec.c: Likewise.
+
 2015-11-09  Thomas Schwinge  <thomas@codesourcery.com>
 	    Cesar Philippidis  <cesar@codesourcery.com>
 	    James Norris  <jnorris@codesourcery.com>
diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index 0537cbc..21f8684 100644
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -68,12 +68,9 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tree.h"
-#include "c-family/c-common.h"
 #include "c-tree.h"
 #include "gimple-expr.h"
 #include "tree-iterator.h"
-#include "opts.h"
 
 /* If *VALUE is not of type INTEGER_CST, PARM_DECL or VAR_DECL, then map it
    to a variable and then set *VALUE to the new variable.  */
diff --git a/gcc/c/c-aux-info.c b/gcc/c/c-aux-info.c
index e8b6de6..79d9851 100644
--- a/gcc/c/c-aux-info.c
+++ b/gcc/c/c-aux-info.c
@@ -24,10 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "tree.h"
 #include "c-tree.h"
-#include "flags.h"
-#include "alias.h"
 
 enum formals_style {
   ansi,
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index 3d16ccb..6476a8b 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -27,10 +27,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
-#include "c-family/c-common.h"
 #include "c-tree.h"
-#include "flags.h"
 #include "convert.h"
 #include "langhooks.h"
 #include "ubsan.h"
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index a3d8ead..c58dec6 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -29,11 +29,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "function.h"
-#include "tree.h"
-#include "c-family/c-common.h"
 #include "c-tree.h"
 #include "timevar.h"
-#include "tm_p.h"
 #include "stringpool.h"
 #include "cgraph.h"
 #include "intl.h"
@@ -41,11 +38,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "stor-layout.h"
 #include "varasm.h"
 #include "attribs.h"
-#include "tree-inline.h"
-#include "flags.h"
 #include "toplev.h"
 #include "debug.h"
-#include "opts.h"
 #include "c-family/c-objc.h"
 #include "c-family/c-pragma.h"
 #include "c-family/c-ubsan.h"
@@ -53,7 +47,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "tree-iterator.h"
 #include "dumpfile.h"
-#include "langhooks-def.h"
 #include "plugin.h"
 #include "c-family/c-ada-spec.h"
 #include "cilk.h"
diff --git a/gcc/c/c-errors.c b/gcc/c/c-errors.c
index b458957..ef0f9a2 100644
--- a/gcc/c/c-errors.c
+++ b/gcc/c/c-errors.c
@@ -22,11 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "tree.h"
 #include "c-tree.h"
-#include "tm_p.h"
-#include "alias.h"
-#include "flags.h"
 #include "opts.h"
 
 /* Issue an ISO C99 pedantic warning MSGID if -pedantic outside C11 mode,
diff --git a/gcc/c/c-lang.c b/gcc/c/c-lang.c
index 9728a47..2ee7f91 100644
--- a/gcc/c/c-lang.c
+++ b/gcc/c/c-lang.c
@@ -21,15 +21,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
-#include "c-family/c-common.h"
 #include "c-tree.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
-#include "tree-inline.h"
 #include "c-objc-common.h"
-#include "c-family/c-pragma.h"
 
 enum c_language_kind c_language = clk_c;
 
diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c
index 270b03d..77a883b 100644
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -20,9 +20,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tree.h"
 #include "c-tree.h"
-#include "alias.h"
 #include "intl.h"
 #include "c-family/c-pretty-print.h"
 #include "tree-pretty-print.h"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index dd4434d..2484b92 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -40,18 +40,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "function.h"
-#include "tree.h"
-#include "c-family/c-common.h"
 #include "c-tree.h"
 #include "timevar.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "flags.h"
 #include "attribs.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "trans-mem.h"
-#include "langhooks.h"
 #include "c-family/c-pragma.h"
 #include "c-lang.h"
 #include "c-family/c-objc.h"
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 9ee2681..4335a87 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -29,8 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "target.h"
 #include "function.h"
 #include "bitmap.h"
-#include "tree.h"
-#include "c-family/c-common.h"
 #include "c-tree.h"
 #include "gimple-expr.h"
 #include "predict.h"
@@ -40,7 +38,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "stmt.h"
 #include "langhooks.h"
 #include "c-lang.h"
-#include "flags.h"
 #include "intl.h"
 #include "tree-iterator.h"
 #include "gimplify.h"
diff --git a/gcc/c/gccspec.c b/gcc/c/gccspec.c
index ec0845a..84be446 100644
--- a/gcc/c/gccspec.c
+++ b/gcc/c/gccspec.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "gcc.h"
 #include "opts.h"
 
 /* Filter command line before processing by the gcc driver proper.  */
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 859f378..b2f8b64 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,43 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* call.c: Remove unused header files.
+	* class.c: Likewise.
+	* constexpr.c: Likewise.
+	* cp-array-notation.c: Likewise.
+	* cp-cilkplus.c: Likewise.
+	* cp-gimplify.c: Likewise.
+	* cp-lang.c: Likewise.
+	* cp-objcp-common.c: Likewise.
+	* cp-ubsan.c: Likewise.
+	* cvt.c: Likewise.
+	* cxx-pretty-print.c: Likewise.
+	* decl.c: Likewise.
+	* decl2.c: Likewise.
+	* dump.c: Likewise.
+	* error.c: Likewise.
+	* except.c: Likewise.
+	* expr.c: Likewise.
+	* friend.c: Likewise.
+	* g++spec.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-11-09  Cesar Philippidis  <cesar@codesourcery.com>
 
 	* parser.c (cp_finalize_oacc_routine): New boolean first argument.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 13d8438..a860e46 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -26,12 +26,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "timevar.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "trans-mem.h"
 #include "flags.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index b123932..866e342 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -25,11 +25,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "attribs.h"
 #include "flags.h"
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 51fae5a..159c4b3 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -23,9 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
 #include "varasm.h"
 #include "c-family/c-objc.h"
 #include "tree-iterator.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index 9fd348c..d445054 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -53,9 +53,7 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "tree-iterator.h"
 
 /* Creates a FOR_STMT with INIT, COND, INCR and BODY as the initializer,
diff --git a/gcc/cp/cp-cilkplus.c b/gcc/cp/cp-cilkplus.c
index 42af45f..2b3a551 100644
--- a/gcc/cp/cp-cilkplus.c
+++ b/gcc/cp/cp-cilkplus.c
@@ -25,7 +25,6 @@
 #include "coretypes.h"
 #include "cp-tree.h"
 #include "tree-iterator.h"
-#include "tree-inline.h"  /* for copy_tree_body_r.  */
 #include "cilk.h"
 
 /* Callback for cp_walk_tree to validate the body of a pragma simd loop
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index e4b50e5..2b77e75 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -23,18 +23,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "function.h"
 #include "basic-block.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "gimple.h"
 #include "predict.h"
 #include "stor-layout.h"
 #include "tree-iterator.h"
-#include "internal-fn.h"
 #include "gimplify.h"
-#include "flags.h"
 #include "c-family/c-ubsan.h"
 #include "cilk.h"
 
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 451e03b..048108d 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -21,16 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "stor-layout.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
-#include "debug.h"
 #include "cp-objcp-common.h"
-#include "parser.h"
 
 enum c_language_kind c_language = clk_cxx;
 static void cp_init_ts (void);
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index e5fe837..2758252 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -21,14 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
-#include "langhooks.h"
-#include "langhooks-def.h"
-#include "debug.h"
-#include "cxx-pretty-print.h"
 #include "cp-objcp-common.h"
 
 /* Special routine to get the alias set for C++.  */
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index 86af6c7..0aaf0af 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@@ -21,22 +21,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "basic-block.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
-#include "gimple.h"
-#include "predict.h"
-#include "stringpool.h"
-#include "cgraph.h"
-#include "output.h"
-#include "toplev.h"
 #include "ubsan.h"
-#include "c-family/c-ubsan.h"
-#include "asan.h"
-#include "internal-fn.h"
-#include "stor-layout.h"
-#include "builtins.h"
 
 /* Test if we should instrument vptr access.  */
 
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index e764ee1..c6e13f3 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -28,14 +28,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "flags.h"
 #include "intl.h"
 #include "convert.h"
-#include "decl.h"
 
 static tree cp_convert_to_pointer (tree, tree, tsubst_flags_t);
 static tree convert_to_pointer_force (tree, tree, tsubst_flags_t);
diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c
index 72bbfc5..5004e8f 100644
--- a/gcc/cp/cxx-pretty-print.c
+++ b/gcc/cp/cxx-pretty-print.c
@@ -21,9 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "cp-tree.h"
-#include "intl.h"
 #include "cxx-pretty-print.h"
 #include "tree-pretty-print.h"
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index bd3f2bc6..d124666 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -31,21 +31,15 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "c-family/c-target.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "timevar.h"
-#include "tm_p.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "tree-hasher.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "attribs.h"
-#include "calls.h"
 #include "flags.h"
 #include "tree-iterator.h"
-#include "tree-inline.h"
 #include "decl.h"
 #include "intl.h"
 #include "toplev.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index a2d31a3..149f8a1 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "c-family/c-common.h"
 #include "timevar.h"
@@ -40,15 +39,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "attribs.h"
 #include "stor-layout.h"
 #include "calls.h"
-#include "flags.h"
 #include "decl.h"
 #include "toplev.h"
 #include "c-family/c-objc.h"
-#include "tree-inline.h"
 #include "c-family/c-pragma.h"
 #include "dumpfile.h"
 #include "intl.h"
-#include "langhooks.h"
 #include "c-family/c-ada-spec.h"
 #include "asan.h"
 
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index 471e124..8f8fa4f1 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.c
@@ -21,10 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
 #include "tree-dump.h"
 
 static void dump_access (dump_info_p, tree);
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 286389c..361e41a 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -20,12 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "stringpool.h"
-#include "alias.h"
-#include "flags.h"
 #include "tree-diagnostic.h"
 #include "langhooks-def.h"
 #include "intl.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index abcfde8..9b2450d 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -24,15 +24,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "stringpool.h"
-#include "alias.h"
 #include "trans-mem.h"
 #include "attribs.h"
-#include "flags.h"
-#include "tree-inline.h"
 #include "tree-iterator.h"
 
 static void push_eh_cleanup (tree);
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 946ad89..0155872 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -22,12 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "tm_p.h"
-#include "alias.h"
-#include "flags.h"
 
 /* Expand C++-specific constants.  Currently, this means PTRMEM_CST.  */
 
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 9d58efc..5d067bd 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -20,11 +20,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
-#include "flags.h"
 
 /* Friend data structures are described in cp-tree.h.  */
 
diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
index 6536d7e..35d8cbc 100644
--- a/gcc/cp/g++spec.c
+++ b/gcc/cp/g++spec.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "gcc.h"
 #include "opts.h"
 
 /* This bit is set if we saw a `-xfoo' language specification.  */
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 2e11acb..9e582d6 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "stringpool.h"
-#include "alias.h"
 #include "varasm.h"
-#include "flags.h"
 #include "gimplify.h"
 #include "c-family/c-ubsan.h"
 
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index d10fff2..5fe3473 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -24,14 +24,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "function.h"
-#include "hard-reg-set.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "alias.h"
 #include "tree-iterator.h"
 #include "toplev.h"
 
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 3dc1155..9365423 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -24,14 +24,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "timevar.h"
-#include "tm_p.h"
 #include "stringpool.h"
-#include "alias.h"
-#include "flags.h"
 #include "c-family/c-pragma.h"
 #include "c-family/c-objc.h"
 
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 182e605..6f8bf68 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -49,13 +49,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "vtable-verify.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "tm_p.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "alias.h"
-#include "tree-hasher.h"
 #include "stor-layout.h"
 #include "flags.h"
 #include "attribs.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 97643b7..533ae0e 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -25,14 +25,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "tm_p.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "alias.h"
 #include "varasm.h"
-#include "flags.h"
 #include "toplev.h"
 #include "common/common-target.h"
 
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 8744fff..cebe57e 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -21,16 +21,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "timevar.h"
 #include "stringpool.h"
-#include "flags.h"
-#include "alias.h"
 #include "print-tree.h"
 #include "attribs.h"
-#include "intl.h"
 #include "debug.h"
 #include "c-family/c-pragma.h"
 #include "params.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index f947d09..c4e7020 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -22,17 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "alias.h"
-#include "params.h"
 #include "debug.h"
 #include "tree-inline.h"
-#include "flags.h"
-#include "langhooks.h"
-#include "dumpfile.h"
 #include "tree-iterator.h"
 
 /* Prototypes.  */
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index f3b4b46..a87675e 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "c-family/c-common.h"
 #include "timevar.h"
@@ -32,14 +30,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "attribs.h"
 #include "trans-mem.h"
 #include "intl.h"
-#include "c-family/c-pragma.h"
 #include "decl.h"
-#include "flags.h"
 #include "c-family/c-objc.h"
 #include "plugin.h"
 #include "tree-pretty-print.h"
 #include "parser.h"
-#include "type-utils.h"
 #include "omp-low.h"
 #include "gomp-constants.h"
 #include "c-family/c-indentation.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index bfea8e2..053a4ef 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -27,21 +27,15 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "timevar.h"
 #include "stringpool.h"
 #include "varasm.h"
 #include "attribs.h"
 #include "stor-layout.h"
 #include "intl.h"
-#include "flags.h"
 #include "c-family/c-objc.h"
 #include "cp-objcp-common.h"
-#include "tree-inline.h"
-#include "decl.h"
 #include "toplev.h"
 #include "tree-iterator.h"
 #include "type-utils.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index d01e8ca..a9b3987 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -22,10 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
 #include "print-tree.h"
 
 void
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 2978198..2d5c5da 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -27,13 +27,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "stringpool.h"
-#include "alias.h"
 #include "toplev.h"
-#include "flags.h"
 
 static const char *extract_string (const char **);
 static const char *get_base_filename (const char *);
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index be25be4..b397b55 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -22,15 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
 #include "tm_p.h"
 #include "stringpool.h"
 #include "intl.h"
-#include "alias.h"
 #include "stor-layout.h"
-#include "flags.h"
-#include "convert.h"
 #include "c-family/c-pragma.h"
 
 /* C++ returns type information to the user in struct type_info
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 93054bd..94502f6 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -24,12 +24,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
 #include "intl.h"
-#include "flags.h"
 #include "toplev.h"
 
 static int is_subobject_of_p (tree, tree);
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 7702a41..db37e85 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -28,10 +28,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "target.h"
 #include "bitmap.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
-#include "timevar.h"
 #include "stringpool.h"
 #include "cgraph.h"
 #include "stmt.h"
@@ -40,12 +37,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-family/c-objc.h"
 #include "tree-inline.h"
 #include "intl.h"
-#include "toplev.h"
-#include "flags.h"
 #include "tree-iterator.h"
-#include "gimplify.h"
 #include "omp-low.h"
-#include "builtins.h"
 #include "convert.h"
 #include "gomp-constants.h"
 
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 4311212..bd5caf7 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -21,18 +21,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "gimple-expr.h"
 #include "cgraph.h"
-#include "alias.h"
-#include "fold-const.h"
-#include "tree-hasher.h"
 #include "stor-layout.h"
 #include "print-tree.h"
 #include "tree-iterator.h"
-#include "flags.h"
 #include "tree-inline.h"
 #include "debug.h"
 #include "convert.h"
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 0501e4d..90c95fb 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "stor-layout.h"
 #include "varasm.h"
-#include "flags.h"
 #include "intl.h"
 #include "convert.h"
 #include "c-family/c-objc.h"
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index e73ea13..cfc76c4 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -28,14 +28,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "intl.h"
-#include "flags.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 d5c31e8..752345d 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -113,7 +113,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "vtable-verify.h"
 #include "cp-tree.h"
 #include "stringpool.h"
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 33c541a..b0c10ad 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,29 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* array.c: Remove unused header files.
+	* convert.c: Likewise.
+	* cpp.c: Likewise.
+	* decl.c: Likewise.
+	* f95-lang.c: Likewise.
+	* frontend-passes.c: Likewise.
+	* iresolve.c: Likewise.
+	* match.c: Likewise.
+	* module.c: Likewise.
+	* options.c: Likewise.
+	* parse.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-11-11  Dominique d'Humieres <dominiq@lps.ens.fr>
 
 	PR fortran/67826
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 0b676af..144d8e0 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "options.h"
 #include "gfortran.h"
-#include "flags.h"
 #include "match.h"
 #include "constructor.h"
 
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index 3752077..ad75cf5 100644
--- a/gcc/fortran/convert.c
+++ b/gcc/fortran/convert.c
@@ -25,9 +25,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
 #include "tree.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "convert.h"
 
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index 85a2c79..8b12626 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -20,13 +20,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "tree.h"
 #include "gfortran.h"
-#include "tm_p.h"		/* Target prototypes.  */
 #include "diagnostic.h"
-#include "alias.h"
-#include "version.h"
-#include "flags.h"
 
 
 #include "toplev.h"
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 0c3377f..157eb23 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "match.h"
 #include "parse.h"
 #include "constructor.h"
-#include "alias.h"
 
 /* Macros to access allocate memory for gfc_data_variable,
    gfc_data_value and gfc_data.  */
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 2e91470..605c2ab 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -30,17 +30,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree.h"
 #include "gfortran.h"
 #include "trans.h"
-#include "timevar.h"
-#include "cgraph.h"
 #include "diagnostic.h" /* For errorcount/warningcount */
-#include "ansidecl.h"
-#include "alias.h"
-#include "flags.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "toplev.h"
 #include "debug.h"
-#include "dumpfile.h"
 #include "cpp.h"
 #include "trans-types.h"
 #include "trans-const.h"
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index fbcc964..22b4ce7 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -23,10 +23,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "options.h"
 #include "gfortran.h"
-#include "arith.h"
 #include "dependency.h"
 #include "constructor.h"
-#include "opts.h"
 #include "intrinsic.h"
 
 /* Forward declarations.  */
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index f176390..80b429f 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -29,11 +29,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
 #include "tree.h"
 #include "gfortran.h"
 #include "stringpool.h"
-#include "alias.h"
 #include "intrinsic.h"
 #include "constructor.h"
 #include "arith.h"
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 2844262..d4ba350 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -22,13 +22,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "options.h"
-#include "tree.h"
 #include "gfortran.h"
-#include "stringpool.h"
-#include "flags.h"
 #include "match.h"
 #include "parse.h"
-#include "alias.h"
 
 int gfc_matching_ptr_assignment = 0;
 int gfc_matching_procptr_assignment = 0;
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 91d2bd6..54777f7 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -76,7 +76,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "parse.h" /* FIXME */
 #include "constructor.h"
 #include "cpp.h"
-#include "alias.h"
 #include "scanner.h"
 #include <zlib.h>
 
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index f689518..d91b0f6 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -25,13 +25,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree.h"
 #include "gfortran.h"
 #include "diagnostic.h"	/* For global_dc.  */
-#include "alias.h"
-#include "flags.h"
-#include "intl.h"
 #include "opts.h"
 #include "toplev.h"  /* For save_decoded_options.  */
-#include "params.h"
-#include "tree-inline.h"
 #include "cpp.h"
 #include "langhooks.h"
 
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index b98dda1..bdb5731 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include <setjmp.h>
 #include "match.h"
 #include "parse.h"
-#include "debug.h"
 
 /* Current statement label.  Zero means no statement label.  Because new_st
    can get wiped during statement matching, we have to keep it separate.  */
diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index ae339ed..826d39e 100644
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree.h"
 #include "gfortran.h"
 #include "trans.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "arith.h"
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index e28a5ce..c294516 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -83,12 +83,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "gimple-expr.h"
 #include "trans.h"
-#include "diagnostic-core.h"	/* For internal_error/fatal_error.  */
-#include "alias.h"
 #include "fold-const.h"
-#include "flags.h"
 #include "constructor.h"
-#include "trans-stmt.h"
 #include "trans-types.h"
 #include "trans-array.h"
 #include "trans-const.h"
diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c
index 6809932..af9fadf 100644
--- a/gcc/fortran/trans-common.c
+++ b/gcc/fortran/trans-common.c
@@ -103,7 +103,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #include <map>
 
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 55c5d14..c2b883c 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -23,12 +23,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
 #include "tree.h"
 #include "gfortran.h"
 #include "trans.h"
 #include "diagnostic-core.h"	/* For fatal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "realmpfr.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 098a327..7e05e67 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -31,15 +31,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "trans.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "diagnostic-core.h"	/* For internal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "attribs.h"
 #include "tree-dump.h"
 #include "toplev.h"	/* For announce_function.  */
-#include "flags.h"
 #include "debug.h"
 #include "constructor.h"
 #include "trans-types.h"
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index b8f4790..8515315 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -30,10 +30,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "trans.h"
 #include "stringpool.h"
 #include "diagnostic-core.h"	/* For fatal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "langhooks.h"
-#include "flags.h"
 #include "arith.h"
 #include "constructor.h"
 #include "trans-const.h"
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index c84f12c..1dabc26 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -29,21 +29,16 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "trans.h"
 #include "stringpool.h"
-#include "diagnostic-core.h"	/* For internal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "tree-nested.h"
 #include "stor-layout.h"
 #include "toplev.h"	/* For rest_of_decl_compilation.  */
-#include "flags.h"
 #include "arith.h"
-#include "intrinsic.h"
 #include "trans-const.h"
 #include "trans-types.h"
 #include "trans-array.h"
 #include "dependency.h"	/* For CAF array alias analysis.  */
 /* Only for gfc_trans_assign and gfc_trans_pointer_assign.  */
-#include "trans-stmt.h"
 
 /* This maps Fortran intrinsic math functions to external library or GCC
    builtin functions.  */
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index 306d2e9..d126b27 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
 #include "tree.h"
 #include "gfortran.h"
 #include "trans.h"
 #include "stringpool.h"
-#include "diagnostic-core.h"	/* For internal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "trans-stmt.h"
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 9f0d533..f29f408 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -28,8 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-expr.h"
 #include "trans.h"
 #include "stringpool.h"
-#include "diagnostic-core.h"	/* For internal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "gimplify.h"	/* For create_tmp_var_raw.  */
 #include "trans-stmt.h"
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 1c61606..1af2ad1 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -28,14 +28,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "trans.h"
 #include "stringpool.h"
-#include "alias.h"
 #include "fold-const.h"
-#include "flags.h"
 #include "trans-stmt.h"
 #include "trans-types.h"
 #include "trans-array.h"
 #include "trans-const.h"
-#include "arith.h"
 #include "dependency.h"
 
 typedef struct iter_info
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index ad6cee8..6e2b3f1 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -29,15 +29,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "trans.h"
 #include "stringpool.h"
-#include "diagnostic-core.h"  /* For fatal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "langhooks.h"	/* For iso-c-bindings.def.  */
 #include "toplev.h"	/* For rest_of_decl_compilation.  */
 #include "trans-types.h"
 #include "trans-const.h"
-#include "flags.h"
 #include "dwarf2out.h"	/* For struct array_descr_info.  */
 
 
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index 9495450..d9ab346 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -27,11 +27,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-expr.h"	/* For create_tmp_var_raw.  */
 #include "trans.h"
 #include "stringpool.h"
-#include "diagnostic-core.h"  /* For internal_error.  */
-#include "alias.h"
 #include "fold-const.h"
 #include "tree-iterator.h"
-#include "flags.h"
 #include "trans-stmt.h"
 #include "trans-array.h"
 #include "trans-types.h"
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 7057b02..6ae7397 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* go-backend.c: Remove unused header files.
+	* go-gcc.cc: Likewise.
+	* go-lang.c: Likewise.
+	* gospec.c: Likewise.
+
 2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
 
 	* go-backend.c: Reorder #include's and remove duplicates.
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index f9221db..4873dea 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -25,13 +25,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "diagnostic.h"
 #include "simple-object.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "intl.h"
 #include "output.h"	/* for assemble_string */
 #include "common/common-target.h"
 
-#include "go-c.h"
 
 /* The segment name we pass to simple_object_start_read to find Go
    export data.  */
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 1314344..31aac2e 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -24,19 +24,13 @@
 // include it here before tree.h includes it later.
 #include <gmp.h>
 
-#include "vec.h"
-#include "alias.h"
 #include "tree.h"
-#include "options.h"
-#include "inchash.h"
 #include "fold-const.h"
 #include "stringpool.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "tree-iterator.h"
-#include "hash-map.h"
 #include "tm.h"
-#include "hard-reg-set.h"
 #include "function.h"
 #include "cgraph.h"
 #include "convert.h"
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index 7b76a35..37205e4 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -21,19 +21,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "function.h"
 #include "tree.h"
 #include "gimple-expr.h"
 #include "diagnostic.h"
-#include "ansidecl.h"
 #include "opts.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "gimplify.h"
 #include "stor-layout.h"
-#include "toplev.h"
 #include "debug.h"
-#include "flags.h"
 #include "convert.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
diff --git a/gcc/go/gospec.c b/gcc/go/gospec.c
index a56ffe0..98df65d 100644
--- a/gcc/go/gospec.c
+++ b/gcc/go/gospec.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "gcc.h"
 #include "opts.h"
 
 /* This bit is set if we saw a `-xfoo' language specification.  */
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 15cd23c..4d9aacc 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,26 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* boehm.c: Remove unused header files.
+	* 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.
+	* zextract.c: Likewise.
+
 2015-10-30  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* jcf-parse.c (get_constant): Use real_from_target rather than
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c
index fbe99d9..7c508b7 100644
--- a/gcc/java/boehm.c
+++ b/gcc/java/boehm.c
@@ -28,8 +28,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "diagnostic-core.h"
-#include "alias.h"
 #include "java-tree.h"
 #include "parse.h"
 
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index 7f6d745..2a71766 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -30,28 +30,17 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "function.h"
 #include "rtl.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "expmed.h"
 #include "optabs.h"
-#include "emit-rtl.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
-#include "flags.h"
-#include "langhooks.h"
 #include "java-tree.h"
 
 /* FIXME: All these headers are necessary for sync_compare_and_swap.
    Front ends should never have to look at that.  */
-#include "dojump.h"
-#include "explow.h"
-#include "calls.h"
-#include "varasm.h"
-#include "stmt.h"
-#include "expr.h"
 
 static tree max_builtin (tree, tree);
 static tree min_builtin (tree, tree);
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 8ecc1d9..cfff618 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -28,16 +28,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "coretypes.h"
 #include "target.h"
 #include "function.h"
-#include "obstack.h"
 #include "tree.h"
 #include "stringpool.h"
-#include "cgraph.h"
 #include "diagnostic-core.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "varasm.h"
-#include "flags.h"
 #include "java-tree.h"
 #include "jcf.h"
 #include "toplev.h"
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index 3e99623..6abc0b6 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -26,9 +26,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "tm.h"
 #include "tree.h"
 #include "stringpool.h"
-#include "diagnostic-core.h"
 #include "jcf.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "java-tree.h"
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 43675a9..328d213 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -33,15 +33,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "stringpool.h"
 #include "cgraph.h"
 #include "diagnostic-core.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "toplev.h"
-#include "flags.h"
 #include "java-tree.h"
 #include "jcf.h"
 #include "java-except.h"
-#include "tree-inline.h"
 #include "version.h"
 #include "tree-iterator.h"
 #include "langhooks.h"
diff --git a/gcc/java/except.c b/gcc/java/except.c
index 03457f6..fa07217 100644
--- a/gcc/java/except.c
+++ b/gcc/java/except.c
@@ -28,13 +28,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "tree.h"
 #include "stringpool.h"
 #include "diagnostic-core.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "java-tree.h"
-#include "javaop.h"
-#include "java-opcodes.h"
-#include "jcf.h"
 #include "java-except.h"
 #include "toplev.h"
 #include "tree-iterator.h"
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index e1eadd2..31fdd72 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -30,15 +30,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "tree.h"
 #include "stringpool.h"
 #include "diagnostic-core.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
-#include "flags.h"
 #include "java-tree.h"
-#include "javaop.h"
 #include "java-opcodes.h"
 #include "jcf.h"
-#include "java-except.h"
 #include "parse.h"
 #include "tree-iterator.h"
 
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index 2e64e8f..b18f25c 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -24,18 +24,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "function.h"
 #include "basic-block.h"
-#include "hard-reg-set.h"
 #include "tree.h"
 #include "gimple.h"
-#include "cfghooks.h"
-#include "alias.h"
-#include "fold-const.h"
 #include "java-tree.h"
 #include "dumpfile.h"
-#include "internal-fn.h"
 #include "gimplify.h"
 
 static tree java_gimplify_block (tree);
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index fec3a40..8a4c37f 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -50,13 +50,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
 #include "tree.h"
 #include "diagnostic.h"
 #include "intl.h"
 
 #include "jcf.h"
-#include "alias.h"
 #include "java-tree.h"
 
 #include "version.h"
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 642ca73..c957d3e 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -26,12 +26,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
-#include "tree.h"
 
 #include "jcf.h"
-#include "alias.h"
-#include "java-tree.h"
 #include <dirent.h>
 
 #include "zlib.h"
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 792fdbf..0018ffa 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -28,18 +28,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "coretypes.h"
 #include "target.h"
 #include "function.h"
-#include "obstack.h"
 #include "bitmap.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cgraph.h"
 #include "diagnostic-core.h"
-#include "alias.h"
-#include "flags.h"
-#include "java-except.h"
 #include "javaop.h"
 #include "java-tree.h"
-#include "parse.h"
 #include "debug.h"
 #include "toplev.h"
 
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index aa10377..9b42d31 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -26,12 +26,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
-#include "obstack.h"
 #include "tree.h"
 #include "diagnostic.h"
-#include "jcf.h"
-#include "alias.h"
 #include "java-tree.h"
 #include "intl.h"
 
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 94b2dcf..40a36fd 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -29,14 +29,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "target.h"
 #include "tree.h"
 #include "diagnostic.h"
-#include "alias.h"
 #include "java-tree.h"
 #include "jcf.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
-#include "flags.h"
-#include "tree-inline.h"
-#include "splay-tree.h"
 #include "tree-dump.h"
 #include "opts.h"
 #include "context.h"
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index c69bcd8..f0265b6 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -27,13 +27,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
-#include "obstack.h"
 #include "tree.h"
 #include "stringpool.h"
-#include "diagnostic-core.h"
 #include "jcf.h"
-#include "alias.h"
 #include "java-tree.h"
 #include "langhooks-def.h"
 
diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c
index 47e3b52..0d3a0a4 100644
--- a/gcc/java/mangle_name.c
+++ b/gcc/java/mangle_name.c
@@ -27,13 +27,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
 #include "obstack.h"
-#include "tree.h"
 #include "diagnostic-core.h"
 #include "jcf.h"
-#include "alias.h"
-#include "java-tree.h"
 
 static void append_unicode_mangled_name (const char *, int);
 #ifndef HAVE_AS_UTF8
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 922dfe7..7a7ea0c 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -25,19 +25,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "function.h"
-#include "hard-reg-set.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "diagnostic-core.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "java-tree.h"
-#include "jcf.h"
 #include "toplev.h"
-#include "parse.h"
 #include "tree-iterator.h"
 
 /* A list of all the resources files.  */
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index 1cdd070..e9a5d6b 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -27,16 +27,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "options.h"
-#include "obstack.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "diagnostic-core.h"
-#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
-#include "flags.h"
 #include "java-tree.h"
-#include "jcf.h"
 #include "convert.h"
 
 static tree convert_ieee_real_to_integer (tree, tree);
diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c
index 508383d..8664500 100644
--- a/gcc/java/verify-glue.c
+++ b/gcc/java/verify-glue.c
@@ -28,10 +28,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "system.h"
 #include "coretypes.h"
 #include "options.h"
-#include "tree.h"
 #include "stringpool.h"
 #include "diagnostic-core.h"
-#include "alias.h"
 #include "parse.h"
 
 #include "verify.h"
diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c
index 4969318..8484e6b 100644
--- a/gcc/java/verify-impl.c
+++ b/gcc/java/verify-impl.c
@@ -14,11 +14,8 @@ details.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
-#include "symtab.h"
 #include "verify.h"
 
-#include "alias.h"
 
 /* Hack to work around namespace pollution from java-tree.h.  */
 #undef current_class
diff --git a/gcc/java/zextract.c b/gcc/java/zextract.c
index 398b91b..fca4337 100644
--- a/gcc/java/zextract.c
+++ b/gcc/java/zextract.c
@@ -28,7 +28,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "zipfile.h"
 
 /* This stuff is partly based on the 28 August 1994 public release of the
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 5da8044..67ad6e1 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,12 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* dummy-frontend.c: Remove unused header files.
+	* jit-builtins.c: Likewise.
+	* jit-playback.c: Likewise.
+	* jit-recording.c: Likewise.
+	* jit-spec.c: Likewise.
+	* libgccjit.c: Likewise.
+
 2015-11-07  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* jit-builtins.c: Don't undef DEF_BUILTIN.
diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index d8f3d5e..643827a 100644
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -20,22 +20,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "function.h"
-#include "hard-reg-set.h"
-#include "tree.h"
 #include "jit-playback.h"
-#include "cgraph.h"
-#include "opts.h"
-#include "alias.h"
 #include "stor-layout.h"
 #include "debug.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
-#include "dumpfile.h"
 
-#include "jit-common.h"
-#include "jit-logging.h"
 
 #include <mpfr.h>
 
diff --git a/gcc/jit/jit-builtins.c b/gcc/jit/jit-builtins.c
index 63ff5af..3538de4 100644
--- a/gcc/jit/jit-builtins.c
+++ b/gcc/jit/jit-builtins.c
@@ -21,12 +21,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "jit-common.h"
 #include "jit-playback.h"
 #include "stringpool.h"
 
 #include "jit-builtins.h"
-#include "jit-recording.h"
 
 namespace gcc {
 
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index 8af62f9..6efe8bc 100644
--- a/gcc/jit/jit-playback.c
+++ b/gcc/jit/jit-playback.c
@@ -22,13 +22,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "target.h"
-#include "function.h"
 #include "tree.h"
-#include "timevar.h"
 #include "stringpool.h"
 #include "cgraph.h"
-#include "opts.h"
-#include "alias.h"
 #include "dumpfile.h"
 #include "toplev.h"
 #include "tree-cfg.h"
@@ -40,11 +36,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "attribs.h"
 #include "context.h"
 #include "fold-const.h"
-#include "debug.h"
 #include "gcc.h"
 
-#include "jit-common.h"
-#include "jit-logging.h"
 #include "jit-playback.h"
 #include "jit-result.h"
 #include "jit-builtins.h"
diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
index afe59c3..2b3affc 100644
--- a/gcc/jit/jit-recording.c
+++ b/gcc/jit/jit-recording.c
@@ -22,15 +22,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "jit-common.h"
-#include "timevar.h"
 #include "pretty-print.h"
 #include "toplev.h"
 
 #include <pthread.h>
 
 #include "jit-builtins.h"
-#include "jit-logging.h"
 #include "jit-recording.h"
 #include "jit-playback.h"
 
diff --git a/gcc/jit/jit-spec.c b/gcc/jit/jit-spec.c
index fa7e9d4..76c623a 100644
--- a/gcc/jit/jit-spec.c
+++ b/gcc/jit/jit-spec.c
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "gcc.h"
-#include "opts.h"
 
 /* Filter command line before processing by the gcc driver proper.  */
 void
diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
index 1e74e66..d463641 100644
--- a/gcc/jit/libgccjit.c
+++ b/gcc/jit/libgccjit.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "jit-common.h"
 #include "timevar.h"
-#include "opts.h"
 #include "typed-splay-tree.h"
 
 #include "libgccjit.h"
-#include "jit-logging.h"
 #include "jit-recording.h"
 #include "jit-result.h"
 
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index d254bee..c97c85d 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* lto-lang.c: Remove unused header files.
+	* lto-object.c: Likewise.
+	* lto-partition.c: Likewise.
+	* lto-symtab.c: Likewise.
+	* lto.c: Likewise.
+
 2015-11-08  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* lto.c (compare_tree_sccs_1): Deal with TYPE_REVERSE_STORAGE_ORDER.
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 4805c2a..53dd8f6 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -26,21 +26,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "tree.h"
 #include "gimple.h"
-#include "predict.h"
 #include "stringpool.h"
-#include "cgraph.h"
 #include "diagnostic-core.h"
-#include "alias.h"
-#include "fold-const.h"
 #include "stor-layout.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "debug.h"
 #include "lto-tree.h"
 #include "lto.h"
-#include "tree-inline.h"
-#include "internal-fn.h"
-#include "toplev.h"
 #include "cilk.h"
 
 static tree lto_type_for_size (unsigned, int);
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index 923ed51..ae89e51 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.c
@@ -22,17 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "function.h"
-#include "basic-block.h"
-#include "hard-reg-set.h"
-#include "tree.h"
-#include "gimple.h"
-#include "predict.h"
-#include "cgraph.h"
 #include "diagnostic-core.h"
-#include "alias.h"
-#include "fold-const.h"
-#include "internal-fn.h"
 #include "lto.h"
 #include "lto-section-names.h"
 #include "simple-object.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 03ed72b..4fd445f 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -25,21 +25,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "tree.h"
 #include "gimple.h"
-#include "predict.h"
 #include "alloc-pool.h"
-#include "timevar.h"
 #include "stringpool.h"
 #include "cgraph.h"
 #include "lto-streamer.h"
-#include "toplev.h"
-#include "alias.h"
-#include "fold-const.h"
-#include "internal-fn.h"
 #include "params.h"
 #include "symbol-summary.h"
 #include "ipa-prop.h"
 #include "ipa-inline.h"
-#include "ipa-utils.h"
 #include "lto-partition.h"
 
 vec<ltrans_partition> ltrans_partitions;
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index e77639f..7f12760 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -26,20 +26,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "basic-block.h"
 #include "tree.h"
 #include "gimple.h"
-#include "predict.h"
-#include "alloc-pool.h"
 #include "cgraph.h"
 #include "lto-streamer.h"
-#include "diagnostic-core.h"
-#include "alias.h"
-#include "fold-const.h"
-#include "internal-fn.h"
 #include "ipa-utils.h"
-#include "symbol-summary.h"
-#include "ipa-prop.h"
-#include "ipa-inline.h"
 #include "builtins.h"
-#include "print-tree.h"
 
 /* Replace the cgraph node NODE with PREVAILING_NODE in the cgraph, merging
    all edges and removing the old node.  */
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 5dcc4dc..36138e8 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -25,29 +25,21 @@ along with GCC; see the file COPYING3.  If not see
 #include "function.h"
 #include "bitmap.h"
 #include "basic-block.h"
-#include "hard-reg-set.h"
 #include "tree.h"
 #include "gimple.h"
 #include "cfghooks.h"
 #include "alloc-pool.h"
 #include "tree-pass.h"
-#include "tree-ssa-operands.h"
 #include "tree-streamer.h"
 #include "cgraph.h"
-#include "diagnostic-core.h"
 #include "opts.h"
 #include "toplev.h"
-#include "alias.h"
-#include "fold-const.h"
 #include "stor-layout.h"
-#include "langhooks.h"
 #include "symbol-summary.h"
 #include "ipa-prop.h"
 #include "common.h"
 #include "debug.h"
-#include "internal-fn.h"
 #include "lto.h"
-#include "lto-tree.h"
 #include "lto-section-names.h"
 #include "splay-tree.h"
 #include "lto-partition.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 57b5db4..a1e76fe 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,14 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* objc-act.c: Remove unused header files.
+	* objc-encoding.c: Likewise.
+	* objc-gnu-runtime-abi-01.c: Likewise.
+	* objc-lang.c: Likewise.
+	* objc-map.c: Likewise.
+	* objc-next-runtime-abi-01.c: Likewise.
+	* objc-next-runtime-abi-02.c: Likewise.
+	* objc-runtime-shared-support.c: Likewise.
+
 2015-11-09  Alan Modra  <amodra@gmail.com>
 
 	* objc-encoding.c (encode_aggregate_within): Cast obstack_next_free
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index a1e32fc..e09093c 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -22,10 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "alias.h"
 #include "tree.h"
-#include "options.h"
-#include "fold-const.h"
 #include "stringpool.h"
 #include "stor-layout.h"
 #include "attribs.h"
@@ -37,31 +34,23 @@ along with GCC; see the file COPYING3.  If not see
 #include "c/c-lang.h"
 #endif
 
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
-#include "c-family/c-pragma.h"
-#include "c-family/c-format.h"
-#include "flags.h"
 #include "langhooks.h"
 #include "objc-act.h"
 #include "objc-map.h"
-#include "hard-reg-set.h"
 #include "function.h"
 #include "toplev.h"
 #include "debug.h"
 #include "c-family/c-target.h"
-#include "diagnostic-core.h"
 #include "intl.h"
 #include "cgraph.h"
 #include "tree-iterator.h"
-#include "langhooks-def.h"
 /* Different initialization, code gen and meta data generation for each
    runtime.  */
 #include "objc-runtime-hooks.h"
 /* Routines used mainly by the runtimes.  */
 #include "objc-runtime-shared-support.h"
 /* For default_tree_printer ().  */
-#include "tree-pretty-print.h"
 
 /* For enum gimplify_status */
 #include "gimple-expr.h"
diff --git a/gcc/objc/objc-encoding.c b/gcc/objc/objc-encoding.c
index 9c577e9..ea32f4c 100644
--- a/gcc/objc/objc-encoding.c
+++ b/gcc/objc/objc-encoding.c
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
 #include "tree.h"
 #include "options.h"
 #include "stringpool.h"
@@ -33,7 +32,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "c/c-lang.h"
 #endif
 
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 
 #include "objc-encoding.h"
@@ -43,7 +41,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "objc-runtime-shared-support.h"
 
 /* For BITS_PER_UNIT.  */
-#include "tm.h"
 
 /* When building Objective-C++, we are not linking against the C front-end
    and so need to replicate the C tree-construction functions in some way.  */
@@ -53,7 +50,6 @@ along with GCC; see the file COPYING3.  If not see
 #endif  /* OBJCPLUS */
 
 /* Set up for use of obstacks.  */
-#include "obstack.h"
 
 /* This obstack is used to accumulate the encoding of a data type.  */
 static struct obstack util_obstack;
diff --git a/gcc/objc/objc-gnu-runtime-abi-01.c b/gcc/objc/objc-gnu-runtime-abi-01.c
index d91db2b..40862de 100644
--- a/gcc/objc/objc-gnu-runtime-abi-01.c
+++ b/gcc/objc/objc-gnu-runtime-abi-01.c
@@ -21,10 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
-#include "tree.h"
 #include "options.h"
-#include "fold-const.h"
 #include "stringpool.h"
 
 #ifdef OBJCPLUS
diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index c2c57d1..1595e5c 100644
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.c
@@ -22,16 +22,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
-#include "c-family/c-common.h"
 #include "c/c-tree.h"
 #include "c-family/c-objc.h"
 #include "objc-act.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "c/c-objc-common.h"
-#include "c/c-lang.h"
 
 enum c_language_kind c_language = clk_objc;
 
diff --git a/gcc/objc/objc-map.c b/gcc/objc/objc-map.c
index 0915a5a..bda0f09 100644
--- a/gcc/objc/objc-map.c
+++ b/gcc/objc/objc-map.c
@@ -20,9 +20,7 @@ Boston, MA 02110-1301, USA.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "options.h"
 #include "tree.h"
-#include "alias.h"
 #include "objc-map.h"
 
 #define OUT_OF_MEMORY { fprintf (stderr, "Out of memory\n"); abort (); }
diff --git a/gcc/objc/objc-next-runtime-abi-01.c b/gcc/objc/objc-next-runtime-abi-01.c
index 337771f..e4bcbf9 100644
--- a/gcc/objc/objc-next-runtime-abi-01.c
+++ b/gcc/objc/objc-next-runtime-abi-01.c
@@ -26,10 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
-#include "tree.h"
-#include "options.h"
-#include "fold-const.h"
 #include "stringpool.h"
 
 #ifdef OBJCPLUS
diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c
index 73b591e..2ac0a98 100644
--- a/gcc/objc/objc-next-runtime-abi-02.c
+++ b/gcc/objc/objc-next-runtime-abi-02.c
@@ -28,11 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "tree.h"
-#include "options.h"
-#include "fold-const.h"
 #include "stringpool.h"
 
 #ifdef OBJCPLUS
diff --git a/gcc/objc/objc-runtime-shared-support.c b/gcc/objc/objc-runtime-shared-support.c
index 56013b1..1242d34 100644
--- a/gcc/objc/objc-runtime-shared-support.c
+++ b/gcc/objc/objc-runtime-shared-support.c
@@ -22,9 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "alias.h"
-#include "tree.h"
-#include "options.h"
 #include "stringpool.h"
 
 #ifdef OBJCPLUS
@@ -33,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "c/c-tree.h"
 #include "c/c-lang.h"
 #endif
-#include "langhooks.h"
 #include "c-family/c-objc.h"
 #include "objc-act.h"
 
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index 5be6855..999d57a 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-11  Andrew MacLeod  <amacleod@redhat.com>
+
+	* objcp-decl.c: Remove unused header files.
+	* objcp-lang.c: Likewise.
+	
 2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
 
 	* objcp-decl.c: Reorder #include's and remove duplicates.
diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c
index ab757fa..05e815c 100644
--- a/gcc/objcp/objcp-decl.c
+++ b/gcc/objcp/objcp-decl.c
@@ -22,13 +22,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "alias.h"
 
 #include "c-family/c-objc.h"
-#include "objc-act.h"
 #include "objcp-decl.h"
 
 /* Hacks to simulate start_struct() and finish_struct(). */
diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c
index a04bea7..4c3d660 100644
--- a/gcc/objcp/objcp-lang.c
+++ b/gcc/objcp/objcp-lang.c
@@ -21,10 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "target.h"
-#include "tree.h"
 #include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "objc-act.h"
 #include "langhooks.h"