3 files changed, 30 insertions, 7 deletions
diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c
index d6752d5..66ecee7 100644
--- a/gcc/go/go-backend.c
+++ b/gcc/go/go-backend.c
@@ -22,6 +22,15 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "simple-object.h"
 #include "tm.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "vec.h"
+#include "double-int.h"
+#include "input.h"
+#include "alias.h"
+#include "symtab.h"
+#include "wide-int.h"
+#include "inchash.h"
 #include "tree.h"
 #include "stor-layout.h"
 #include "tm_p.h"
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 1566552..d8b80b6 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -24,7 +24,18 @@
 // include it here before tree.h includes it later.
 #include <gmp.h>
 
+#include "hash-set.h"
+#include "machmode.h"
+#include "vec.h"
+#include "double-int.h"
+#include "input.h"
+#include "alias.h"
+#include "symtab.h"
+#include "options.h"
+#include "wide-int.h"
+#include "inchash.h"
 #include "tree.h"
+#include "fold-const.h"
 #include "stringpool.h"
 #include "stor-layout.h"
 #include "varasm.h"
@@ -32,10 +43,6 @@
 #include "hash-map.h"
 #include "is-a.h"
 #include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "machmode.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "input.h"
diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c
index 520c94b..2797e99 100644
--- a/gcc/go/go-lang.c
+++ b/gcc/go/go-lang.c
@@ -22,11 +22,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "ansidecl.h"
 #include "coretypes.h"
 #include "opts.h"
-#include "tree.h"
-#include "vec.h"
-#include "hashtab.h"
 #include "hash-set.h"
 #include "machmode.h"
+#include "vec.h"
+#include "double-int.h"
+#include "input.h"
+#include "alias.h"
+#include "symtab.h"
+#include "options.h"
+#include "wide-int.h"
+#include "inchash.h"
+#include "tree.h"
+#include "fold-const.h"
 #include "tm.h"
 #include "hard-reg-set.h"
 #include "input.h"