3 files changed, 15 insertions, 15 deletions
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index f25c898..7057b02 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+	* go-backend.c: Reorder #include's and remove duplicates.
+	* go-lang.c: Likewise.
+
 2015-10-20  Alan Modra  <amodra@gmail.com>
 
 	PR go/66870
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index b6dcc25..f9221db 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -20,17 +20,16 @@ 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 "tm_p.h"
+#include "diagnostic.h"
 #include "simple-object.h"
-#include "tm.h"
 #include "alias.h"
-#include "tree.h"
 #include "stor-layout.h"
-#include "tm_p.h"
 #include "intl.h"
 #include "output.h"	/* for assemble_string */
-#include "target.h"
 #include "common/common-target.h"
-#include "diagnostic.h"
 
 #include "go-c.h"
 
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index 675b582..7b76a35 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -19,28 +19,24 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
-#include "ansidecl.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 "tree.h"
-#include "options.h"
 #include "fold-const.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "gimple-expr.h"
 #include "gimplify.h"
 #include "stor-layout.h"
 #include "toplev.h"
 #include "debug.h"
-#include "options.h"
 #include "flags.h"
 #include "convert.h"
-#include "diagnostic.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
-#include "target.h"
 #include "common/common-target.h"
 
 #include <mpfr.h>