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

26 files changed, 129 insertions, 114 deletions

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2d737f2..a58d1f1 100644
--- a/gcc/fortran/ChangeLog
+++ b/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
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 940eeaf..2083044 100644
--- a/gcc/fortran/array.c
+++ b/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"
 
diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c
index 21fc36f..3752077 100644
--- a/gcc/fortran/convert.c
+++ b/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"
 
diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index daffc20..7d29625 100644
--- a/gcc/fortran/cpp.c
+++ b/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"
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 07c5391..5c34dc9 100644
--- a/gcc/fortran/decl.c
+++ b/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.  */
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index fdb396d..2e91470 100644
--- a/gcc/fortran/f95-lang.c
+++ b/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 "target.h"
+#include "function.h"
+#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 "tree.h"
-#include "options.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"
 
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index bc9f621..fbcc964 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/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"
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index 7503f18..f176390 100644
--- a/gcc/fortran/iresolve.c
+++ b/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"
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index dda2d5a..7abb5de 100644
--- a/gcc/fortran/match.c
+++ b/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;
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index f0d84a4..91d2bd6 100644
--- a/gcc/fortran/module.c
+++ b/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>
 
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index e367e15..f689518 100644
--- a/gcc/fortran/options.c
+++ b/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;
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 4925c7e..650135b 100644
--- a/gcc/fortran/parse.c
+++ b/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"
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 8798d4d..1049c0c 100644
--- a/gcc/fortran/resolve.c
+++ b/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"
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 6a81dc3..9b58b99 100644
--- a/gcc/fortran/simplify.c
+++ b/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.  */
 
 
diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index a58a977..ae339ed 100644
--- a/gcc/fortran/target-memory.c
+++ b/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"
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index f6e980d7..6bbf8cc 100644
--- a/gcc/fortran/trans-array.c
+++ b/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"
diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c
index ae336c1..6809932 100644
--- a/gcc/fortran/trans-common.c
+++ b/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"
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 1d1e963..55c5d14 100644
--- a/gcc/fortran/trans-const.c
+++ b/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 "options.h"
+#include "tree.h"
 #include "gfortran.h"
+#include "trans.h"
+#include "diagnostic-core.h"	/* For fatal_error.  */
 #include "alias.h"
-#include "tree.h"
-#include "options.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"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 269c235..ded5c1f 100644
--- a/gcc/fortran/trans-decl.c
+++ b/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 "target.h"
+#include "function.h"
+#include "tree.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 "tree.h"
 #include "fold-const.h"
-#include "stringpool.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"
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index f8ed0df..b8f4790 100644
--- a/gcc/fortran/trans-expr.c
+++ b/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"
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index d72ea98..c84f12c 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/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.  */
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index 7afa726..306d2e9 100644
--- a/gcc/fortran/trans-io.c
+++ b/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"
diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 3be9f51..7e01e72 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/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 "tree.h"
+#include "gfortran.h"
 #include "gimple-expr.h"
-#include "gimplify.h"	/* For create_tmp_var_raw.  */
+#include "trans.h"
 #include "stringpool.h"
-#include "gfortran.h"
 #include "diagnostic-core.h"	/* For internal_error.  */
-#include "trans.h"
+#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"
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index 85558f0..1c61606 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/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"
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index 7f3f261..780200e 100644
--- a/gcc/fortran/trans-types.c
+++ b/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"
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index 4eaea53..4337fcb 100644
--- a/gcc/fortran/trans.c
+++ b/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 "trans.h"
 #include "stringpool.h"
-#include "tree-iterator.h"
 #include "diagnostic-core.h"  /* For internal_error.  */
+#include "alias.h"
+#include "fold-const.h"
+#include "tree-iterator.h"
 #include "flags.h"
-#include "trans.h"
 #include "trans-stmt.h"
 #include "trans-array.h"
 #include "trans-types.h"