decl.c: Reorder #include's and remove duplicates.

ada
2015-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* gcc-interface/decl.c: Reorder #include's and remove duplicates.
	* gcc-interface/misc.c: Likewise.
	* gcc-interface/targtyps.c: Likewise.
	* gcc-interface/trans.c: Likewise.
	* gcc-interface/utils.c: Likewise.
	
c
2015-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* c-array-notation.c: Reorder #include's and remove duplicates.
	* 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-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* array-notation-common.c: Reorder #include's and remove duplicates.
	* 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
2015-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* call.c: Reorder #include's and remove duplicates.
	* 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.
	* 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-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* array.c: Reorder #include's and remove duplicates.
	* 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.
	* resolve.c: Likewise.
	* simplify.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-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* go-backend.c: Reorder #include's and remove duplicates.
	* go-lang.c: Likewise.

java
2015-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* boehm.c: Reorder #include's and remove duplicates.
	* 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-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* dummy-frontend.c: Reorder #include's and remove duplicates.
	* jit-builtins.c: Likewise.
	* jit-playback.c: Likewise.
	* jit-recording.c: Likewise.
	* libgccjit.c: Likewise.

lto
2015-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* lto-lang.c: Reorder #include's and remove duplicates.
	* lto-object.c: Likewise.
	* lto-partition.c: Likewise.
	* lto-symtab.c: Likewise.
	* lto.c: Likewise.

objc
2015-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* objc-lang.c: Reorder #include's and remove duplicates.
	* objc-map.c: Likewise.

objcp
2015-10-29  Andrew MacLeod  <amacleod@redhat.com>

	* objcp-decl.c: Reorder #include's and remove duplicates.
	* objcp-lang.c: Likewise.

From-SVN: r229533

gcc/ada/ChangeLog

@@ -1,3 +1,11 @@
+2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* gcc-interface/decl.c: Reorder #include's and remove duplicates.
+	* gcc-interface/misc.c: Likewise.
+	* gcc-interface/targtyps.c: Likewise.
+	* gcc-interface/trans.c: Likewise.
+	* gcc-interface/utils.c: Likewise.
+	
 2015-10-27  Tristan Gingold  <gingold@adacore.com>
 
 	* bindgen.adb (System_BB_CPU_Primitives_Multiprocessors_Used):

gcc/ada/gcc-interface/decl.c

@@ -26,20 +26,17 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "vec.h"
-#include "alias.h"
+#include "ggc.h"
+#include "target.h"
 #include "tree.h"
-#include "inchash.h"
-#include "fold-const.h"
 #include "stringpool.h"
+#include "diagnostic-core.h"
+#include "alias.h"
+#include "fold-const.h"
 #include "stor-layout.h"
 #include "flags.h"
 #include "toplev.h"
-#include "ggc.h"
-#include "target.h"
 #include "tree-inline.h"
-#include "diagnostic-core.h"
 
 #include "ada.h"
 #include "types.h"

gcc/ada/gcc-interface/misc.c

@@ -26,27 +26,21 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "opts.h"
-#include "options.h"
-#include "tm.h"
-#include "vec.h"
-#include "alias.h"
+#include "ggc.h"
+#include "target.h"
 #include "tree.h"
-#include "inchash.h"
+#include "diagnostic.h"
+#include "opts.h"
+#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
 #include "print-tree.h"
-#include "diagnostic.h"
-#include "target.h"
-#include "ggc.h"
 #include "flags.h"
 #include "debug.h"
 #include "toplev.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "plugin.h"
-#include "hashtab.h"
-#include "hard-reg-set.h"
 #include "calls.h"	/* For pass_by_reference.  */
 #include "dwarf2out.h"
 

gcc/ada/gcc-interface/targtyps.c

@@ -28,13 +28,10 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "vec.h"
-#include "alias.h"
-#include "tree.h"
-#include "inchash.h"
-#include "options.h"
 #include "tm.h"
+#include "tree.h"
 #include "tm_p.h"
+#include "alias.h"
 
 #include "ada.h"
 #include "types.h"

gcc/ada/gcc-interface/trans.c

@@ -26,13 +26,16 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "vec.h"
-#include "alias.h"
+#include "target.h"
+#include "function.h"
+#include "bitmap.h"
 #include "tree.h"
-#include "inchash.h"
-#include "fold-const.h"
+#include "gimple-expr.h"
 #include "stringpool.h"
+#include "cgraph.h"
+#include "diagnostic.h"
+#include "alias.h"
+#include "fold-const.h"
 #include "stor-layout.h"
 #include "stmt.h"
 #include "varasm.h"
@@ -40,16 +43,8 @@
 #include "output.h"
 #include "libfuncs.h"	/* For set_stack_check_libfunc.  */
 #include "tree-iterator.h"
-#include "gimple-expr.h"
 #include "gimplify.h"
-#include "bitmap.h"
-#include "hash-map.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
-#include "diagnostic.h"
 #include "opts.h"
-#include "target.h"
 #include "common/common-target.h"
 
 #include "ada.h"

gcc/ada/gcc-interface/utils.c

@@ -26,32 +26,26 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "vec.h"
-#include "alias.h"
+#include "ggc.h"
+#include "target.h"
+#include "function.h"
 #include "tree.h"
-#include "inchash.h"
-#include "fold-const.h"
+#include "timevar.h"
 #include "stringpool.h"
+#include "cgraph.h"
+#include "diagnostic.h"
+#include "alias.h"
+#include "fold-const.h"
 #include "stor-layout.h"
 #include "attribs.h"
 #include "varasm.h"
 #include "flags.h"
 #include "toplev.h"
-#include "diagnostic-core.h"
 #include "output.h"
-#include "ggc.h"
 #include "debug.h"
 #include "convert.h"
-#include "target.h"
 #include "common/common-target.h"
 #include "langhooks.h"
-#include "hash-map.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
-#include "diagnostic.h"
-#include "timevar.h"
 #include "tree-dump.h"
 #include "tree-inline.h"
 #include "tree-iterator.h"

gcc/c-family/ChangeLog

@@ -1,3 +1,26 @@
+2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* array-notation-common.c: Reorder #include's and remove duplicates.
+	* 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-10-28  Jason Merrill  <jason@redhat.com>
 
 	* c-common.c (pointer_int_sum): Fold the MULT_EXPR.

gcc/c-family/array-notation-common.c

@@ -24,13 +24,11 @@ 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 "tree.h"
+#include "c-family/c-common.h"
 #include "langhooks.h" 
 #include "tree-iterator.h"
-#include "c-family/c-common.h"
-#include "diagnostic-core.h"
 
 /* Returns true if the function call in FNDECL is  __sec_implicit_index.  */
 

gcc/c-family/c-ada-spec.c

@@ -23,12 +23,11 @@ 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 "c-ada-spec.h"
+#include "alias.h"
 #include "fold-const.h"
 #include "dumpfile.h"
-#include "c-ada-spec.h"
 #include "cpplib.h"
 #include "c-pragma.h"
 #include "cpp-id-data.h"

gcc/c-family/c-cilkplus.c

@@ -23,10 +23,10 @@ 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 "tree.h"
 #include "c-common.h"
+#include "alias.h"
 
 /* Validate the body of a _Cilk_for construct or a <#pragma simd> for
    loop.

gcc/c-family/c-common.c

@@ -22,37 +22,32 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "c-common.h"
-#include "tm.h"
-#include "intl.h"
+#include "target.h"
+#include "function.h"
+#include "obstack.h"
 #include "tree.h"
-#include "fold-const.h"
+#include "c-common.h"
+#include "gimple-expr.h"
+#include "tm_p.h"
+#include "stringpool.h"
+#include "cgraph.h"
+#include "diagnostic.h"
+#include "intl.h"
 #include "stor-layout.h"
 #include "calls.h"
-#include "stringpool.h"
 #include "attribs.h"
 #include "varasm.h"
 #include "trans-mem.h"
 #include "flags.h"
 #include "c-pragma.h"
 #include "c-objc.h"
-#include "tm_p.h"
-#include "obstack.h"
-#include "cpplib.h"
-#include "target.h"
 #include "common/common-target.h"
 #include "langhooks.h"
 #include "tree-inline.h"
 #include "toplev.h"
-#include "diagnostic.h"
 #include "tree-iterator.h"
 #include "opts.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "gimplify.h"
-#include "wide-int-print.h"
-#include "gimple-expr.h"
 
 cpp_reader *parse_in;		/* Declared in c-pragma.h.  */
 

gcc/c-family/c-cppbuiltin.c

@@ -20,19 +20,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "stor-layout.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-common.h"
 #include "c-pragma.h"
 #include "output.h"		/* For user_label_prefix.  */
 #include "debug.h"		/* For dwarf2out_do_cfi_asm.  */
-#include "tm_p.h"		/* For TARGET_CPU_CPP_BUILTINS & friends.  */
-#include "target.h"
 #include "common/common-target.h"
 #include "cpp-id-data.h"
 #include "cppbuiltin.h"

gcc/c-family/c-dump.c

@@ -22,10 +22,10 @@ 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 "tree-dump.h"
 #include "c-common.h"
+#include "alias.h"
+#include "tree-dump.h"
 
 /* Dump any C-specific tree codes and attributes of common codes.  */
 

gcc/c-family/c-format.c

@@ -21,18 +21,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "alias.h"
+#include "c-target.h"
 #include "tree.h"
-#include "stringpool.h"
-#include "flags.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 "diagnostic-core.h"
 #include "langhooks.h"
 #include "c-format.h"
-#include "alloc-pool.h"
-#include "c-target.h"
 
 /* Handle attributes associated with format checking.  */
 

gcc/c-family/c-gimplify.c

@@ -28,24 +28,23 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "function.h"
-#include "predict.h"
 #include "basic-block.h"
-#include "tree.h"
-#include "gimple.h"
 #include "hard-reg-set.h"
+#include "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 "c-common.h"
 #include "internal-fn.h"
 #include "gimplify.h"
 #include "tree-inline.h"
-#include "diagnostic-core.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "flags.h"
 #include "dumpfile.h"
-#include "c-pretty-print.h"
-#include "cgraph.h"
 #include "cilk.h"
 #include "c-ubsan.h"
 

gcc/c-family/c-indentation.c

@@ -21,11 +21,11 @@ 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 "stringpool.h"
-#include "stor-layout.h"
 #include "c-common.h"
+#include "stringpool.h"
+#include "alias.h"
+#include "stor-layout.h"
 #include "c-indentation.h"
 
 extern cpp_options *cpp_opts;

gcc/c-family/c-lex.c

@@ -20,20 +20,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "stringpool.h"
-#include "stor-layout.h"
 #include "c-common.h"
-#include "flags.h"
 #include "timevar.h"
-#include "cpplib.h"
+#include "stringpool.h"
+#include "alias.h"
+#include "stor-layout.h"
+#include "flags.h"
 #include "c-pragma.h"
 #include "intl.h"
-#include "splay-tree.h"
 #include "debug.h"
-#include "target.h"
 
 #include "attribs.h"
 

gcc/c-family/c-omp.c

@@ -25,11 +25,11 @@ 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 "c-common.h"
-#include "c-pragma.h"
 #include "gimple-expr.h"
+#include "alias.h"
+#include "c-pragma.h"
 #include "langhooks.h"
 #include "omp-low.h"
 #include "gomp-constants.h"

gcc/c-family/c-opts.c

@@ -22,14 +22,16 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "alias.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"
 #include "langhooks.h"
-#include "diagnostic.h"
 #include "tree-diagnostic.h" /* for virt_loc_aware_diagnostic_finalizer */
 #include "intl.h"
 #include "cppdefault.h"
@@ -38,8 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "opts.h"
 #include "plugin.h"		/* For PLUGIN_INCLUDE_FILE event.  */
 #include "mkdeps.h"
-#include "c-target.h"
-#include "tm_p.h"		/* For C_COMMON_OVERRIDE_OPTIONS.  */
 #include "dumpfile.h"
 
 #ifndef DOLLARS_IN_IDENTIFIERS

gcc/c-family/c-pch.c

@@ -20,20 +20,19 @@ 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 "c-common.h"
+#include "timevar.h"
 #include "version.h"
 #include "cpplib.h"
-#include "options.h"
 #include "alias.h"
-#include "tree.h"
 #include "flags.h"
-#include "c-common.h"
 #include "debug.h"
 #include "c-pragma.h"
 #include "langhooks.h"
 #include "hosthooks.h"
-#include "target.h"
 #include "opts.h"
-#include "timevar.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

gcc/c-family/c-ppoutput.c

@@ -19,12 +19,12 @@
 #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 "tree.h"
-#include "options.h"
-#include "c-common.h"		/* For flags.  */
 #include "c-pragma.h"		/* For parse_in.  */
 
 /* Encapsulates state used to convert a stream of tokens into a text

gcc/c-family/c-pragma.c

@@ -20,28 +20,22 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
+#include "function.h"		/* For cfun.  */
 #include "tree.h"
-#include "options.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 "hard-reg-set.h"
-#include "function.h"		/* For cfun.  FIXME: Does the parser know
-				   when it is inside a function, so that
-				   we don't have to look at cfun?  */
 #include "cpplib.h"
 #include "c-pragma.h"
 #include "flags.h"
-#include "c-common.h"
-#include "tm_p.h"		/* For REGISTER_TARGET_PRAGMAS (why is
-				   this not a target hook?).  */
-#include "target.h"
-#include "diagnostic.h"
 #include "opts.h"
 #include "plugin.h"
-#include "cgraph.h"
 
 #define GCC_BAD(gmsgid) \
   do { warning (OPT_Wpragmas, gmsgid); return; } while (0)

gcc/c-family/c-pretty-print.c

@@ -22,17 +22,15 @@ 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 "c-pretty-print.h"
+#include "diagnostic.h"
+#include "alias.h"
 #include "stor-layout.h"
 #include "attribs.h"
 #include "intl.h"
-#include "c-pretty-print.h"
 #include "tree-pretty-print.h"
 #include "tree-iterator.h"
-#include "diagnostic.h"
-#include "wide-int-print.h"
 
 /* The pretty-printer code is primarily designed to closely follow
    (GNU) C and C++ grammars.  That is to be contrasted with spaghetti

gcc/c-family/c-semantics.c

@@ -22,13 +22,12 @@ 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 "hard-reg-set.h"
 #include "function.h"
-#include "splay-tree.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"
 

gcc/c-family/c-ubsan.c

@@ -21,18 +21,16 @@ 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 "alloc-pool.h"
 #include "tm.h"
-#include "hard-reg-set.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-common.h"
 #include "c-family/c-ubsan.h"
 #include "asan.h"
 #include "internal-fn.h"

gcc/c-family/cilk.c

@@ -23,24 +23,21 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
+#include "tm.h"
+#include "function.h"
+#include "hard-reg-set.h"
 #include "tree.h"
-#include "options.h"
-#include "fold-const.h"
-#include "stringpool.h"
-#include "langhooks.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"
-#include "c-family/c-common.h"
 #include "toplev.h" 
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
 #include "calls.h"
-#include "cgraph.h"
-#include "diagnostic.h"
 #include "cilk.h"
 
 enum add_variable_type {

gcc/c-family/stub-objc.c

@@ -22,9 +22,9 @@ 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 "c-common.h"
+#include "alias.h"
 #include "c-objc.h"
 
 tree

gcc/c/ChangeLog

@@ -1,3 +1,15 @@
+2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* c-array-notation.c: Reorder #include's and remove duplicates.
+	* 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-10-26  Jim Wilson  <jim.wilson@linaro.org>
 
 	PR debug/66068

gcc/c/c-array-notation.c

@@ -69,12 +69,11 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
-#include "alias.h"
+#include "c-family/c-common.h"
 #include "c-tree.h"
 #include "gimple-expr.h"
 #include "tree-iterator.h"
 #include "opts.h"
-#include "c-family/c-common.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.  */

gcc/c/c-aux-info.c

@@ -24,10 +24,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "flags.h"
 #include "tree.h"
-#include "alias.h"
 #include "c-tree.h"
+#include "flags.h"
+#include "alias.h"
 
 enum formals_style {
   ansi,

gcc/c/c-convert.c

@@ -26,15 +26,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
+#include "target.h"
 #include "tree.h"
-#include "alias.h"
-#include "flags.h"
-#include "convert.h"
 #include "c-family/c-common.h"
 #include "c-tree.h"
+#include "flags.h"
+#include "convert.h"
 #include "langhooks.h"
-#include "target.h"
 #include "ubsan.h"
 
 /* Change of width--truncation and extension of integers or reals--

gcc/c/c-decl.c

@@ -27,38 +27,32 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "intl.h"
+#include "target.h"
+#include "function.h"
 #include "tree.h"
-#include "alias.h"
-#include "fold-const.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"
 #include "print-tree.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "attribs.h"
-#include "stringpool.h"
 #include "tree-inline.h"
 #include "flags.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "c-tree.h"
 #include "toplev.h"
-#include "tm_p.h"
-#include "cpplib.h"
-#include "target.h"
 #include "debug.h"
 #include "opts.h"
-#include "timevar.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "c-family/c-pragma.h"
 #include "c-family/c-ubsan.h"
 #include "c-lang.h"
 #include "langhooks.h"
 #include "tree-iterator.h"
-#include "diagnostic-core.h"
 #include "dumpfile.h"
-#include "cgraph.h"
 #include "langhooks-def.h"
 #include "plugin.h"
 #include "c-family/c-ada-spec.h"

gcc/c/c-errors.c

@@ -23,11 +23,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "alias.h"
 #include "c-tree.h"
 #include "tm_p.h"
+#include "alias.h"
 #include "flags.h"
-#include "diagnostic.h"
 #include "opts.h"
 
 /* Issue an ISO C99 pedantic warning MSGID if -pedantic outside C11 mode,

gcc/c/c-lang.c

@@ -23,13 +23,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "alias.h"
-#include "c-tree.h"
 #include "c-family/c-common.h"
+#include "c-tree.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
 #include "tree-inline.h"
-#include "diagnostic-core.h"
 #include "c-objc-common.h"
 #include "c-family/c-pragma.h"
 

gcc/c/c-objc-common.c

@@ -21,11 +21,10 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
-#include "alias.h"
 #include "c-tree.h"
+#include "alias.h"
 #include "intl.h"
 #include "c-family/c-pretty-print.h"
-#include "diagnostic.h"
 #include "tree-pretty-print.h"
 #include "langhooks.h"
 #include "c-objc-common.h"

gcc/c/c-parser.c

@@ -38,29 +38,23 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"			/* For rtl.h: needs enum reg_class.  */
+#include "target.h"
+#include "function.h"
 #include "tree.h"
-#include "alias.h"
-#include "flags.h"
-#include "fold-const.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 "cpplib.h"
-#include "timevar.h"
 #include "c-family/c-pragma.h"
-#include "c-tree.h"
 #include "c-lang.h"
-#include "flags.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
-#include "target.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "plugin.h"
 #include "omp-low.h"
 #include "builtins.h"

gcc/c/c-typeck.c

@@ -26,31 +26,27 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
+#include "target.h"
+#include "function.h"
+#include "bitmap.h"
 #include "tree.h"
-#include "alias.h"
-#include "fold-const.h"
+#include "c-family/c-common.h"
+#include "c-tree.h"
+#include "gimple-expr.h"
+#include "predict.h"
 #include "stor-layout.h"
 #include "trans-mem.h"
 #include "varasm.h"
 #include "stmt.h"
 #include "langhooks.h"
-#include "c-tree.h"
 #include "c-lang.h"
 #include "flags.h"
 #include "intl.h"
-#include "target.h"
 #include "tree-iterator.h"
-#include "bitmap.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "gimple-expr.h"
 #include "gimplify.h"
 #include "tree-inline.h"
 #include "omp-low.h"
 #include "c-family/c-objc.h"
-#include "c-family/c-common.h"
 #include "c-family/c-ubsan.h"
 #include "cilk.h"
 #include "gomp-constants.h"

gcc/cp/ChangeLog

@@ -1,3 +1,42 @@
+2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* call.c: Reorder #include's and remove duplicates.
+	* 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.
+	* 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-10-29  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/67845

gcc/cp/call.c

@@ -25,25 +25,21 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "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 "stringpool.h"
-#include "cp-tree.h"
 #include "flags.h"
 #include "toplev.h"
-#include "diagnostic-core.h"
 #include "intl.h"
-#include "target.h"
 #include "convert.h"
 #include "langhooks.h"
 #include "c-family/c-objc.h"
-#include "timevar.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "internal-fn.h"
 
 /* The various kinds of conversion.  */

gcc/cp/class.c

@@ -24,23 +24,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "options.h"
-#include "tm.h"
+#include "cp-tree.h"
 #include "stringpool.h"
+#include "cgraph.h"
+#include "alias.h"
 #include "stor-layout.h"
 #include "attribs.h"
-#include "cp-tree.h"
 #include "flags.h"
 #include "toplev.h"
-#include "target.h"
 #include "convert.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "dumpfile.h"
-#include "splay-tree.h"
 #include "gimplify.h"
 
 /* The number of nested classes being processed.  If we are not in the

gcc/cp/constexpr.c

@@ -23,11 +23,10 @@ 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 "varasm.h"
 #include "cp-tree.h"
+#include "alias.h"
+#include "varasm.h"
 #include "c-family/c-objc.h"
 #include "tree-iterator.h"
 #include "gimplify.h"

gcc/cp/cp-array-notation.c

@@ -53,12 +53,9 @@
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
 #include "tree.h"
-#include "options.h"
 #include "cp-tree.h"
 #include "c-family/c-common.h"
-#include "diagnostic.h"
 #include "tree-iterator.h"
 
 /* Creates a FOR_STMT with INIT, COND, INCR and BODY as the initializer,

gcc/cp/cp-cilkplus.c

@@ -24,7 +24,6 @@
 #include "system.h"
 #include "coretypes.h"
 #include "cp-tree.h"
-#include "diagnostic-core.h"
 #include "tree-iterator.h"
 #include "tree-inline.h"  /* for copy_tree_body_r.  */
 #include "cilk.h"

gcc/cp/cp-gimplify.c

@@ -22,26 +22,21 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
+#include "target.h"
 #include "function.h"
-#include "predict.h"
 #include "basic-block.h"
 #include "tree.h"
 #include "cp-tree.h"
-#include "gimple.h"
-#include "hard-reg-set.h"
-#include "alias.h"
-#include "stor-layout.h"
 #include "c-family/c-common.h"
+#include "gimple.h"
+#include "predict.h"
+#include "stor-layout.h"
 #include "tree-iterator.h"
 #include "internal-fn.h"
 #include "gimplify.h"
 #include "flags.h"
-#include "splay-tree.h"
-#include "target.h"
 #include "c-family/c-ubsan.h"
 #include "cilk.h"
-#include "gimplify.h"
 
 /* Forward declarations.  */
 

gcc/cp/cp-lang.c

@@ -21,17 +21,15 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "stor-layout.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 "target.h"
 #include "parser.h"
 
 enum c_language_kind c_language = clk_cxx;

gcc/cp/cp-objcp-common.c

@@ -22,13 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "alias.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "c-family/c-common.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
-#include "diagnostic.h"
 #include "debug.h"
 #include "cxx-pretty-print.h"
 #include "cp-objcp-common.h"

gcc/cp/cp-ubsan.c

@@ -21,25 +21,22 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
-#include "predict.h"
 #include "basic-block.h"
 #include "tree.h"
 #include "cp-tree.h"
+#include "c-family/c-common.h"
 #include "gimple.h"
-#include "options.h"
+#include "predict.h"
+#include "stringpool.h"
+#include "cgraph.h"
 #include "output.h"
 #include "toplev.h"
 #include "ubsan.h"
-#include "c-family/c-common.h"
 #include "c-family/c-ubsan.h"
 #include "asan.h"
 #include "internal-fn.h"
 #include "stor-layout.h"
 #include "builtins.h"
-#include "fold-const.h"
-#include "stringpool.h"
-#include "cgraph.h"
 
 /* Test if we should instrument vptr access.  */
 

gcc/cp/cvt.c

@@ -27,16 +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 "alias.h"
+#include "target.h"
 #include "tree.h"
+#include "cp-tree.h"
+#include "alias.h"
 #include "stor-layout.h"
 #include "flags.h"
-#include "cp-tree.h"
 #include "intl.h"
 #include "convert.h"
 #include "decl.h"
-#include "target.h"
 
 static tree cp_convert_to_pointer (tree, tree, tsubst_flags_t);
 static tree convert_to_pointer_force (tree, tree, tsubst_flags_t);

gcc/cp/cxx-pretty-print.c

@@ -22,8 +22,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "intl.h"
 #include "cp-tree.h"
+#include "intl.h"
 #include "cxx-pretty-print.h"
 #include "tree-pretty-print.h"
 

gcc/cp/decl.c

@@ -29,38 +29,31 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
+#include "c-family/c-target.h"
 #include "tree.h"
-#include "tree-hasher.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 "cp-tree.h"
 #include "tree-iterator.h"
 #include "tree-inline.h"
 #include "decl.h"
 #include "intl.h"
 #include "toplev.h"
-#include "tm_p.h"
-#include "target.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "c-family/c-pragma.h"
-#include "c-family/c-target.h"
 #include "c-family/c-ubsan.h"
-#include "diagnostic.h"
-#include "intl.h"
 #include "debug.h"
-#include "timevar.h"
-#include "splay-tree.h"
 #include "plugin.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "cilk.h"
 #include "builtins.h"
 

gcc/cp/decl2.c

@@ -29,31 +29,25 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
+#include "cp-tree.h"
+#include "c-family/c-common.h"
+#include "timevar.h"
 #include "stringpool.h"
+#include "cgraph.h"
 #include "varasm.h"
 #include "attribs.h"
 #include "stor-layout.h"
 #include "calls.h"
 #include "flags.h"
-#include "cp-tree.h"
 #include "decl.h"
 #include "toplev.h"
-#include "timevar.h"
-#include "cpplib.h"
-#include "target.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "tree-inline.h"
 #include "c-family/c-pragma.h"
 #include "dumpfile.h"
 #include "intl.h"
-#include "splay-tree.h"
 #include "langhooks.h"
 #include "c-family/c-ada-spec.h"
 #include "asan.h"

gcc/cp/dump.c

@@ -22,9 +22,9 @@ 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 "cp-tree.h"
+#include "alias.h"
 #include "tree-dump.h"
 
 static void dump_access (dump_info_p, tree);

gcc/cp/error.c

@@ -21,12 +21,11 @@ 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 "stringpool.h"
 #include "cp-tree.h"
+#include "stringpool.h"
+#include "alias.h"
 #include "flags.h"
-#include "diagnostic.h"
 #include "tree-diagnostic.h"
 #include "langhooks-def.h"
 #include "intl.h"

gcc/cp/except.c

@@ -24,17 +24,16 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
+#include "cp-tree.h"
 #include "stringpool.h"
+#include "alias.h"
 #include "trans-mem.h"
 #include "attribs.h"
-#include "cp-tree.h"
 #include "flags.h"
 #include "tree-inline.h"
 #include "tree-iterator.h"
-#include "target.h"
 
 static void push_eh_cleanup (tree);
 static tree prepare_eh_type (tree);

gcc/cp/expr.c

@@ -23,11 +23,11 @@ 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 "flags.h"
 #include "cp-tree.h"
 #include "tm_p.h"
+#include "alias.h"
+#include "flags.h"
 
 /* Expand C++-specific constants.  Currently, this means PTRMEM_CST.  */
 

gcc/cp/friend.c

@@ -21,9 +21,9 @@ 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 "cp-tree.h"
+#include "alias.h"
 #include "flags.h"
 
 /* Friend data structures are described in cp-tree.h.  */

gcc/cp/init.c

@@ -23,14 +23,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "tree.h"
-#include "stringpool.h"
-#include "varasm.h"
-#include "cp-tree.h"
-#include "flags.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"
 

gcc/cp/lambda.c

@@ -24,16 +24,15 @@ 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"
 #include "tm.h"
-#include "hard-reg-set.h"
 #include "function.h"
-#include "cgraph.h"
-#include "tree-iterator.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"
 
 /* Constructor for a lambda expression.  */

gcc/cp/lex.c

@@ -25,16 +25,15 @@ 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 "stringpool.h"
 #include "cp-tree.h"
-#include "cpplib.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"
-#include "tm_p.h"
-#include "timevar.h"
 
 static int interface_strcmp (const char *);
 static void init_cp_pragma (void);

gcc/cp/mangle.c

@@ -47,22 +47,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "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 "stringpool.h"
-#include "tm_p.h"
-#include "cp-tree.h"
-#include "obstack.h"
 #include "flags.h"
-#include "target.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "attribs.h"
-#include "vtable-verify.h"
 
 /* Debugging support.  */
 

gcc/cp/method.c

@@ -24,21 +24,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "stringpool.h"
-#include "varasm.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 "tm_p.h"
-#include "target.h"
 #include "common/common-target.h"
-#include "diagnostic.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 
 /* Various flags to control the mangling process.  */
 

gcc/cp/name-lookup.c

@@ -22,16 +22,14 @@ along with GCC; see the file COPYING3.  If not see
 #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 "tree.h"
-#include "stringpool.h"
 #include "print-tree.h"
 #include "attribs.h"
-#include "cp-tree.h"
-#include "name-lookup.h"
-#include "timevar.h"
-#include "diagnostic-core.h"
 #include "intl.h"
 #include "debug.h"
 #include "c-family/c-pragma.h"

gcc/cp/optimize.c

@@ -21,23 +21,19 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
-#include "tree.h"
-#include "stringpool.h"
-#include "cp-tree.h"
-#include "params.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 "diagnostic-core.h"
 #include "dumpfile.h"
 #include "tree-iterator.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 
 /* Prototypes.  */
 

gcc/cp/parser.c

@@ -21,26 +21,20 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "timevar.h"
-#include "cpplib.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "print-tree.h"
+#include "cp-tree.h"
+#include "c-family/c-common.h"
+#include "timevar.h"
 #include "stringpool.h"
+#include "cgraph.h"
+#include "print-tree.h"
 #include "attribs.h"
 #include "trans-mem.h"
-#include "cp-tree.h"
 #include "intl.h"
 #include "c-family/c-pragma.h"
 #include "decl.h"
 #include "flags.h"
-#include "diagnostic-core.h"
-#include "target.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "plugin.h"
 #include "tree-pretty-print.h"

gcc/cp/pt.c

@@ -28,22 +28,21 @@ 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 "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 "cp-tree.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "cp-objcp-common.h"
 #include "tree-inline.h"
 #include "decl.h"
 #include "toplev.h"
-#include "timevar.h"
 #include "tree-iterator.h"
 #include "type-utils.h"
 #include "gimplify.h"

gcc/cp/ptree.c

@@ -23,10 +23,10 @@ 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 "print-tree.h"
 #include "cp-tree.h"
+#include "alias.h"
+#include "print-tree.h"
 
 void
 cxx_print_decl (FILE *file, tree node, int indent)

gcc/cp/repo.c

@@ -28,13 +28,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "alias.h"
 #include "tree.h"
-#include "stringpool.h"
 #include "cp-tree.h"
-#include "obstack.h"
+#include "stringpool.h"
+#include "alias.h"
 #include "toplev.h"
-#include "diagnostic-core.h"
 #include "flags.h"
 
 static const char *extract_string (const char **);

gcc/cp/rtti.c

@@ -20,18 +20,17 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
-#include "intl.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.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 "cp-tree.h"
 #include "flags.h"
 #include "convert.h"
-#include "target.h"
 #include "c-family/c-pragma.h"
 
 /* C++ returns type information to the user in struct type_info

gcc/cp/search.c

@@ -24,14 +24,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
 #include "cp-tree.h"
+#include "alias.h"
 #include "intl.h"
 #include "flags.h"
 #include "toplev.h"
-#include "target.h"
 
 static int is_subobject_of_p (tree, tree);
 static tree dfs_lookup_base (tree, void *);

gcc/cp/semantics.c

@@ -26,29 +26,24 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "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"
 #include "varasm.h"
 #include "stor-layout.h"
-#include "stringpool.h"
-#include "cp-tree.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "tree-inline.h"
 #include "intl.h"
 #include "toplev.h"
 #include "flags.h"
-#include "timevar.h"
-#include "diagnostic.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
 #include "tree-iterator.h"
-#include "target.h"
 #include "gimplify.h"
-#include "bitmap.h"
 #include "omp-low.h"
 #include "builtins.h"
 #include "convert.h"

gcc/cp/tree.c

@@ -22,23 +22,20 @@ 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 "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 "cp-tree.h"
 #include "flags.h"
 #include "tree-inline.h"
 #include "debug.h"
 #include "convert.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
-#include "splay-tree.h"
-#include "gimple-expr.h"
 #include "gimplify.h"
 #include "attribs.h"
 

gcc/cp/typeck.c

@@ -27,19 +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 "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "fold-const.h"
+#include "cp-tree.h"
+#include "c-family/c-common.h"
 #include "stor-layout.h"
 #include "varasm.h"
-#include "cp-tree.h"
 #include "flags.h"
-#include "diagnostic.h"
 #include "intl.h"
-#include "target.h"
 #include "convert.h"
-#include "c-family/c-common.h"
 #include "c-family/c-objc.h"
 #include "c-family/c-ubsan.h"
 #include "params.h"

gcc/cp/typeck2.c

@@ -29,14 +29,13 @@ 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 "cp-tree.h"
+#include "alias.h"
 #include "stor-layout.h"
 #include "varasm.h"
 #include "intl.h"
-#include "cp-tree.h"
 #include "flags.h"
-#include "diagnostic-core.h"
 
 static tree
 process_init_constructor (tree type, tree init, tsubst_flags_t complain);

gcc/cp/vtable-class-hierarchy.c

@@ -113,16 +113,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "cp-tree.h"
-#include "output.h"
 #include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
-#include "tree-iterator.h"
 #include "vtable-verify.h"
-#include "gimplify.h"
+#include "cp-tree.h"
 #include "stringpool.h"
+#include "cgraph.h"
+#include "output.h"
+#include "tree-iterator.h"
+#include "gimplify.h"
 #include "stor-layout.h"
 
 static int num_calls_to_regset = 0;

gcc/fortran/ChangeLog

@@ -1,3 +1,31 @@
+2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* array.c: Reorder #include's and remove duplicates.
+	* 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.
+	* resolve.c: Likewise.
+	* simplify.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-10-29  Richard Biener  <rguenther@suse.de>
 
 	* f95-lang.c: Properly build variadic types for classification

gcc/fortran/array.c

@@ -22,8 +22,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "options.h"
-#include "flags.h"
 #include "gfortran.h"
+#include "flags.h"
 #include "match.h"
 #include "constructor.h"
 

gcc/fortran/convert.c

@@ -25,9 +25,9 @@ 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 "tree.h"
+#include "alias.h"
 #include "fold-const.h"
 #include "convert.h"
 

gcc/fortran/cpp.c

@@ -19,19 +19,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "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 "options.h"
-#include "gfortran.h"
-#include "tm_p.h"		/* Target prototypes.  */
-#include "target.h"
 #include "toplev.h"
-#include "diagnostic.h"
 
 #include "../../libcpp/internal.h"
 #include "cpp.h"

gcc/fortran/decl.c

@@ -21,14 +21,14 @@ 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 "match.h"
 #include "parse.h"
-#include "options.h"
 #include "constructor.h"
 #include "alias.h"
-#include "tree.h"
-#include "stringpool.h"
 
 /* Macros to access allocate memory for gfc_data_variable,
    gfc_data_value and gfc_data.  */

gcc/fortran/f95-lang.c

@@ -24,28 +24,24 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
-#include "ansidecl.h"
-#include "system.h"
 #include "coretypes.h"
-#include "gfortran.h"
-#include "alias.h"
+#include "target.h"
+#include "function.h"
 #include "tree.h"
-#include "options.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 "timevar.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
 #include "toplev.h"
-#include "target.h"
 #include "debug.h"
-#include "diagnostic.h" /* For errorcount/warningcount */
 #include "dumpfile.h"
-#include "cgraph.h"
 #include "cpp.h"
-#include "trans.h"
 #include "trans-types.h"
 #include "trans-const.h"
 

gcc/fortran/frontend-passes.c

@@ -21,9 +21,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "options.h"
 #include "gfortran.h"
 #include "arith.h"
-#include "options.h"
 #include "dependency.h"
 #include "constructor.h"
 #include "opts.h"

gcc/fortran/iresolve.c

@@ -29,11 +29,11 @@ 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"
+#include "tree.h"
 #include "gfortran.h"
+#include "stringpool.h"
+#include "alias.h"
 #include "intrinsic.h"
 #include "constructor.h"
 #include "arith.h"

gcc/fortran/match.c

@@ -22,13 +22,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "options.h"
-#include "flags.h"
+#include "tree.h"
 #include "gfortran.h"
+#include "stringpool.h"
+#include "flags.h"
 #include "match.h"
 #include "parse.h"
 #include "alias.h"
-#include "tree.h"
-#include "stringpool.h"
 
 int gfc_matching_ptr_assignment = 0;
 int gfc_matching_procptr_assignment = 0;

gcc/fortran/module.c

@@ -67,16 +67,16 @@ 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 "arith.h"
 #include "match.h"
 #include "parse.h" /* FIXME */
 #include "constructor.h"
 #include "cpp.h"
 #include "alias.h"
-#include "tree.h"
-#include "options.h"
-#include "stringpool.h"
 #include "scanner.h"
 #include <zlib.h>
 

gcc/fortran/options.c

@@ -21,20 +21,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
-#include "options.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 "gfortran.h"
-#include "target.h"
 #include "cpp.h"
-#include "diagnostic.h"	/* For global_dc.  */
-#include "tm.h"
 #include "langhooks.h"
 
 gfc_option_t gfc_option;

gcc/fortran/parse.c

@@ -20,10 +20,10 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
-#include <setjmp.h>
 #include "coretypes.h"
 #include "options.h"
 #include "gfortran.h"
+#include <setjmp.h>
 #include "match.h"
 #include "parse.h"
 #include "debug.h"

gcc/fortran/resolve.c

@@ -22,9 +22,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "options.h"
-#include "gfortran.h"
-#include "obstack.h"
 #include "bitmap.h"
+#include "gfortran.h"
 #include "arith.h"  /* For gfc_compare_expr().  */
 #include "dependency.h"
 #include "data.h"

gcc/fortran/simplify.c

@@ -21,12 +21,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "tm.h"		/* For BITS_PER_UNIT.  */
 #include "gfortran.h"
 #include "arith.h"
 #include "intrinsic.h"
 #include "target-memory.h"
 #include "constructor.h"
-#include "tm.h"		/* For BITS_PER_UNIT.  */
 #include "version.h"	/* For version_string.  */
 
 

gcc/fortran/target-memory.c

@@ -21,14 +21,14 @@ 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 "gfortran.h"
+#include "trans.h"
+#include "alias.h"
 #include "fold-const.h"
 #include "stor-layout.h"
-#include "gfortran.h"
 #include "arith.h"
 #include "constructor.h"
-#include "trans.h"
 #include "trans-const.h"
 #include "trans-types.h"
 #include "target-memory.h"

gcc/fortran/trans-array.c

@@ -78,16 +78,16 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "gfortran.h"
-#include "alias.h"
-#include "tree.h"
 #include "options.h"
-#include "fold-const.h"
+#include "tree.h"
+#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.h"
 #include "trans-stmt.h"
 #include "trans-types.h"
 #include "trans-array.h"

gcc/fortran/trans-common.c

@@ -94,19 +94,19 @@ 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 "gfortran.h"
+#include "trans.h"
+#include "stringpool.h"
 
 #include <map>
 
-#include "coretypes.h"
-#include "tm.h"
 #include "alias.h"
-#include "tree.h"
 #include "fold-const.h"
-#include "stringpool.h"
 #include "stor-layout.h"
 #include "varasm.h"
-#include "gfortran.h"
-#include "trans.h"
 #include "trans-types.h"
 #include "trans-const.h"
 #include "target-memory.h"

gcc/fortran/trans-const.c

@@ -23,15 +23,15 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "gfortran.h"
-#include "alias.h"
-#include "tree.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"
-#include "diagnostic-core.h"	/* For fatal_error.  */
-#include "trans.h"
 #include "trans-const.h"
 #include "trans-types.h"
 #include "target-memory.h"

gcc/fortran/trans-decl.c

@@ -23,27 +23,25 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "gfortran.h"
-#include "alias.h"
+#include "target.h"
+#include "function.h"
 #include "tree.h"
-#include "fold-const.h"
+#include "gfortran.h"
+#include "gimple-expr.h"	/* For create_tmp_var_raw.  */
+#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 "gimple-expr.h"	/* For create_tmp_var_raw.  */
-#include "diagnostic-core.h"	/* For internal_error.  */
 #include "toplev.h"	/* For announce_function.  */
-#include "target.h"
-#include "hard-reg-set.h"
-#include "function.h"
 #include "flags.h"
-#include "cgraph.h"
 #include "debug.h"
 #include "constructor.h"
-#include "trans.h"
 #include "trans-types.h"
 #include "trans-array.h"
 #include "trans-const.h"

gcc/fortran/trans-expr.c

@@ -24,18 +24,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "gfortran.h"
-#include "alias.h"
-#include "tree.h"
 #include "options.h"
-#include "fold-const.h"
+#include "tree.h"
+#include "gfortran.h"
+#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.h"
 #include "trans-const.h"
 #include "trans-types.h"
 #include "trans-array.h"

gcc/fortran/trans-intrinsic.c

@@ -25,26 +25,25 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"		/* For UNITS_PER_WORD.  */
-#include "alias.h"
 #include "tree.h"
-#include "fold-const.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 "tree-nested.h"
 #include "stor-layout.h"
-#include "gfortran.h"
-#include "diagnostic-core.h"	/* For internal_error.  */
 #include "toplev.h"	/* For rest_of_decl_compilation.  */
 #include "flags.h"
 #include "arith.h"
 #include "intrinsic.h"
-#include "trans.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"
-#include "tree-nested.h"
 
 /* This maps Fortran intrinsic math functions to external library or GCC
    builtin functions.  */

gcc/fortran/trans-io.c

@@ -22,15 +22,15 @@ 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"
-#include "stor-layout.h"
+#include "tree.h"
 #include "gfortran.h"
-#include "diagnostic-core.h"	/* For internal_error.  */
 #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"
 #include "trans-array.h"
 #include "trans-types.h"

gcc/fortran/trans-openmp.c

@@ -22,16 +22,16 @@ 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 "gimple-expr.h"
-#include "gimplify.h"	/* For create_tmp_var_raw.  */
-#include "stringpool.h"
+#include "tree.h"
 #include "gfortran.h"
-#include "diagnostic-core.h"	/* For internal_error.  */
+#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"
 #include "trans-types.h"
 #include "trans-array.h"

gcc/fortran/trans-stmt.c

@@ -23,14 +23,14 @@ 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"
+#include "tree.h"
 #include "gfortran.h"
-#include "flags.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"

gcc/fortran/trans-types.c

@@ -24,18 +24,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
 #include "tree.h"
+#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 "stringpool.h"
 #include "langhooks.h"	/* For iso-c-bindings.def.  */
-#include "target.h"
-#include "gfortran.h"
-#include "diagnostic-core.h"  /* For fatal_error.  */
 #include "toplev.h"	/* For rest_of_decl_compilation.  */
-#include "trans.h"
 #include "trans-types.h"
 #include "trans-const.h"
 #include "flags.h"

gcc/fortran/trans.c

@@ -21,17 +21,17 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "gfortran.h"
-#include "alias.h"
-#include "tree.h"
 #include "options.h"
-#include "fold-const.h"
+#include "tree.h"
+#include "gfortran.h"
 #include "gimple-expr.h"	/* For create_tmp_var_raw.  */
-#include "stringpool.h"
-#include "tree-iterator.h"
-#include "diagnostic-core.h"  /* For internal_error.  */
-#include "flags.h"
 #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"