aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog39
-rw-r--r--gcc/cp/call.c4
-rw-r--r--gcc/cp/class.c5
-rw-r--r--gcc/cp/constexpr.c3
-rw-r--r--gcc/cp/cp-array-notation.c4
-rw-r--r--gcc/cp/cp-cilkplus.c1
-rw-r--r--gcc/cp/cp-gimplify.c3
-rw-r--r--gcc/cp/cp-lang.c4
-rw-r--r--gcc/cp/cp-objcp-common.c3
-rw-r--r--gcc/cp/cp-tree.h5
-rw-r--r--gcc/cp/cp-ubsan.c3
-rw-r--r--gcc/cp/cvt.c3
-rw-r--r--gcc/cp/decl.c5
-rw-r--r--gcc/cp/decl2.c4
-rw-r--r--gcc/cp/dump.c3
-rw-r--r--gcc/cp/error.c3
-rw-r--r--gcc/cp/except.c3
-rw-r--r--gcc/cp/expr.c3
-rw-r--r--gcc/cp/friend.c3
-rw-r--r--gcc/cp/init.c3
-rw-r--r--gcc/cp/lambda.c4
-rw-r--r--gcc/cp/lex.c3
-rw-r--r--gcc/cp/mangle.c4
-rw-r--r--gcc/cp/method.c4
-rw-r--r--gcc/cp/name-lookup.c3
-rw-r--r--gcc/cp/optimize.c5
-rw-r--r--gcc/cp/parser.c4
-rw-r--r--gcc/cp/pt.c3
-rw-r--r--gcc/cp/ptree.c3
-rw-r--r--gcc/cp/repo.c3
-rw-r--r--gcc/cp/rtti.c3
-rw-r--r--gcc/cp/search.c3
-rw-r--r--gcc/cp/semantics.c5
-rw-r--r--gcc/cp/tree.c5
-rw-r--r--gcc/cp/typeck.c3
-rw-r--r--gcc/cp/typeck2.c3
-rw-r--r--gcc/cp/vtable-class-hierarchy.c4
37 files changed, 39 insertions, 127 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 99988ef..5160324 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,42 @@
+2015-06-08 Andrew MacLeod <amacleod@redhat.com>
+
+ * call.c : Adjust include files.
+ * 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-tree.h : 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.
+ * vtable-class-hierarchy.c : Likewise.
+
2015-06-05 Jason Merrill <jason@redhat.com>
PR c++/66405
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index da5cfbb..2d90ed9 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "trans-mem.h"
@@ -46,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "c-family/c-objc.h"
#include "timevar.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 09de9cf..5b9bba8 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -24,25 +24,20 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tm.h"
#include "tree.h"
#include "stringpool.h"
#include "stor-layout.h"
#include "attribs.h"
-#include "hash-table.h"
#include "cp-tree.h"
#include "flags.h"
#include "toplev.h"
#include "target.h"
#include "convert.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 49d0fe4..8fa2eb3 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "varasm.h"
#include "cp-tree.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index e8cf337..a3656d3 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -53,19 +53,15 @@
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
#include "diagnostic.h"
#include "tree-iterator.h"
-#include "vec.h"
/* Creates a FOR_STMT with INIT, COND, INCR and BODY as the initializer,
condition, increment expression and the loop-body, respectively. */
diff --git a/gcc/cp/cp-cilkplus.c b/gcc/cp/cp-cilkplus.c
index f946770..74662b1 100644
--- a/gcc/cp/cp-cilkplus.c
+++ b/gcc/cp/cp-cilkplus.c
@@ -27,7 +27,6 @@
#include "diagnostic-core.h"
#include "tree-iterator.h"
#include "tree-inline.h" /* for copy_tree_body_r. */
-#include "ggc.h"
#include "cilk.h"
/* Callback for cp_walk_tree to validate the body of a pragma simd loop
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index d8dc1c7..05a0091 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "cp-tree.h"
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index c4e80e6..6eb7741 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "cp-tree.h"
@@ -36,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks-def.h"
#include "debug.h"
#include "cp-objcp-common.h"
-#include "hashtab.h"
#include "target.h"
#include "parser.h"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index 4c193a1..13e2e22 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "c-family/c-common.h"
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index fb1702c..603a871 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -21,15 +21,10 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CP_TREE_H
#define GCC_CP_TREE_H
-#include "ggc.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
-#include "hash-map.h"
/* In order for the format checking to accept the C++ front end
diagnostic framework extensions, you must include this file before
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index 1cdee86..ac9e38c 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@@ -21,13 +21,10 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "alloc-pool.h"
#include "output.h"
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 2ab7b41..9f93c68 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "flags.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2bddce2..3bed538 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -30,12 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stringpool.h"
@@ -50,7 +47,6 @@ along with GCC; see the file COPYING3. If not see
#include "decl.h"
#include "intl.h"
#include "toplev.h"
-#include "hashtab.h"
#include "tm_p.h"
#include "target.h"
#include "c-family/c-common.h"
@@ -64,7 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "splay-tree.h"
#include "plugin.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index c1b568b..9df3139e 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -30,12 +30,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
@@ -51,7 +48,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index 21a27e0..465fadc 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 83efad5..3287786 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 67eb5a2..894cc28 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "trans-mem.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 1ea873a..5d90039 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "flags.h"
#include "cp-tree.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 564ced6..4f7e808 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -21,12 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "flags.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 3f177b6..aad3b44 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 3a4824b..c423830 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -24,16 +24,12 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
#include "options.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "tm.h"
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 3e8ce35..e04600b 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -26,12 +26,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "input.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index f6ec65e..d1bb765 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -48,12 +48,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tree-hasher.h"
#include "stor-layout.h"
@@ -63,7 +60,6 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "flags.h"
#include "target.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 9187eeb1..e279458 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
@@ -41,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "diagnostic.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index e4baac3..cafc31f 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "print-tree.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index d902871..cc54508 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -22,18 +22,14 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
#include "input.h"
#include "params.h"
-#include "hashtab.h"
#include "target.h"
#include "debug.h"
#include "tree-inline.h"
@@ -42,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "tree-iterator.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2ea61c0..15b920a 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -24,12 +24,9 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "timevar.h"
#include "cpplib.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "print-tree.h"
#include "stringpool.h"
@@ -42,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "diagnostic-core.h"
#include "target.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4a9fff0..2ebeb65 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "varasm.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index d105be3..91438ac 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 e98dace..850b256 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stringpool.h"
#include "cp-tree.h"
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index d01de92..5acef1b 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "tm_p.h"
#include "stringpool.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index fff3619..26d58e8 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -25,12 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "cp-tree.h"
#include "intl.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index dd53758..650ef4c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -27,12 +27,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stmt.h"
#include "varasm.h"
@@ -47,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "timevar.h"
#include "diagnostic.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
@@ -57,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "tree-iterator.h"
#include "target.h"
-#include "hash-table.h"
#include "gimplify.h"
#include "bitmap.h"
#include "omp-low.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 9d9956b..3c4b527 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -22,12 +22,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "fold-const.h"
#include "tree-hasher.h"
@@ -39,7 +36,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "debug.h"
#include "convert.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
#include "hard-reg-set.h"
@@ -48,7 +44,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-ref.h"
#include "cgraph.h"
#include "splay-tree.h"
-#include "hash-table.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "attribs.h"
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 96371a4..6c4b038 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -28,12 +28,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.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 5d90806..affa265 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -29,12 +29,9 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "hash-set.h"
-#include "vec.h"
#include "input.h"
#include "alias.h"
#include "symtab.h"
-#include "inchash.h"
#include "tree.h"
#include "stor-layout.h"
#include "varasm.h"
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index 1a94ce2..dfd8af8 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -115,12 +115,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "cp-tree.h"
#include "output.h"
-#include "hash-map.h"
#include "is-a.h"
#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"