34 files changed, 52 insertions, 54 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f393a232802..c345f83d9e6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,39 @@
+2015-07-07  Andrew MacLeod  <amacleod@redhat.com>
+
+	* call.c: Adjust includes.
+	* class.c: Likewise.
+	* constexpr.c: Likewise.
+	* cp-array-notation.c: Likewise.
+	* cp-gimplify.c: Likewise.
+	* cp-lang.c: Likewise.
+	* cp-objcp-common.c: Likewise.
+	* cp-ubsan.c: Likewise.
+	* cvt.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.
+
 2015-07-07  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* decl2.c (cpp_check): Deal with IS_MOVE_CONSTRUCTOR.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 44346bf8f92..4da1072bf3d 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stor-layout.h"
 #include "trans-mem.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index b5f2c3451da..b5b5b8b5cee 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -25,10 +25,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "alias.h"
-#include "symtab.h"
+#include "tree.h"
 #include "options.h"
 #include "tm.h"
-#include "tree.h"
 #include "stringpool.h"
 #include "stor-layout.h"
 #include "attribs.h"
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index a122ded0a26..fe962fee003 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -24,9 +24,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "alias.h"
-#include "symtab.h"
-#include "options.h"
 #include "tree.h"
+#include "options.h"
 #include "varasm.h"
 #include "cp-tree.h"
 #include "c-family/c-objc.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index a84efd5b151..eb675e53b25 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -54,9 +54,8 @@
 #include "system.h"
 #include "coretypes.h"
 #include "alias.h"
-#include "symtab.h"
-#include "options.h"
 #include "tree.h"
+#include "options.h"
 #include "cp-tree.h"
 #include "c-family/c-common.h"
 #include "diagnostic.h"
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index b95489e7816..c36d3399133 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -23,21 +23,18 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "alias.h"
-#include "symtab.h"
+#include "function.h"
+#include "predict.h"
+#include "basic-block.h"
 #include "tree.h"
-#include "stor-layout.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 "tree-iterator.h"
-#include "predict.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "basic-block.h"
-#include "tree-ssa-alias.h"
 #include "internal-fn.h"
-#include "gimple-expr.h"
-#include "gimple.h"
 #include "gimplify.h"
 #include "flags.h"
 #include "splay-tree.h"
@@ -45,7 +42,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-family/c-ubsan.h"
 #include "cilk.h"
 #include "gimplify.h"
-#include "gimple-expr.h"
 
 /* Forward declarations.  */
 
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 0818be4bd4c..45f41c01ac2 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stor-layout.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index cb17daf831c..31f12c8b7a3 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "c-family/c-common.h"
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index c0d1ffcfc43..8fab27d6553 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@@ -22,14 +22,16 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "alias.h"
-#include "symtab.h"
-#include "options.h"
+#include "predict.h"
+#include "basic-block.h"
 #include "tree.h"
+#include "cp-tree.h"
+#include "gimple.h"
+#include "options.h"
 #include "alloc-pool.h"
 #include "output.h"
 #include "toplev.h"
 #include "ubsan.h"
-#include "cp-tree.h"
 #include "c-family/c-common.h"
 #include "c-family/c-ubsan.h"
 #include "asan.h"
@@ -38,11 +40,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "builtins.h"
 #include "fold-const.h"
 #include "stringpool.h"
-#include "predict.h"
-#include "tree-ssa-alias.h"
-#include "basic-block.h"
-#include "gimple-expr.h"
-#include "gimple.h"
 #include "lto-streamer.h"
 #include "cgraph.h"
 
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index a2776781d98..13bc1f7766f 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stor-layout.h"
 #include "flags.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8bea2e3accf..b70a2cc1b0f 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "tree-hasher.h"
 #include "stringpool.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index cd43e62a84c..cac0508f881 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "varasm.h"
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index 2382e27b428..25a15d71e26 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "tree-dump.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 3710046bbef..b2b063842ee 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index c5d80d9ce03..f7409b5c14d 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "trans-mem.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 4270fffe509..6d2d658c7fa 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "flags.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 96655f327f1..14fc5d0b267 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 871ddb5e686..860a277629e 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "varasm.h"
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 13c12559608..dcd3bb92ca0 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -25,9 +25,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "alias.h"
-#include "symtab.h"
-#include "options.h"
 #include "tree.h"
+#include "options.h"
 #include "stringpool.h"
 #include "tm.h"
 #include "hard-reg-set.h"
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index d8ee8e33965..a142410a295 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index cf260c419e1..a157b2b776c 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -49,7 +49,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "tree-hasher.h"
 #include "stor-layout.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 2d5aa636a11..570f800f7c2 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "varasm.h"
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 1d7afea2aca..2246fa05f60 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm.h"
 #include "flags.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "print-tree.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 89750c0964c..33c67c0450a 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 8d8ec3003c2..d64b22711a5 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "timevar.h"
 #include "cpplib.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "print-tree.h"
 #include "stringpool.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3cd7bac8ff0..2f336ed41da 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "varasm.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index 9e0073a0a19..8abdb729ced 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "print-tree.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 62c35f90ddc..5155a2fa295 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stringpool.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index baa11879301..ed81322a577 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "tm_p.h"
 #include "stringpool.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 53b038e5cf4..646ff06a3ef 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "intl.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 8de2522a6d4..1277c2d6d6c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stmt.h"
 #include "varasm.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 0d1112c33d0..4fcdb6c52a6 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "tree-hasher.h"
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 2d03d758448..24866ef59bc 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "fold-const.h"
 #include "stor-layout.h"
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index ea0ae64b4e8..eb51784f2cf 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "alias.h"
-#include "symtab.h"
 #include "tree.h"
 #include "stor-layout.h"
 #include "varasm.h"