aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog38
-rw-r--r--gcc/cp/call.c4
-rw-r--r--gcc/cp/class.c4
-rw-r--r--gcc/cp/constexpr.c3
-rw-r--r--gcc/cp/cp-array-notation.c3
-rw-r--r--gcc/cp/cp-gimplify.c3
-rw-r--r--gcc/cp/cp-lang.c3
-rw-r--r--gcc/cp/cp-objcp-common.c3
-rw-r--r--gcc/cp/cp-tree.h1
-rw-r--r--gcc/cp/cp-ubsan.c3
-rw-r--r--gcc/cp/cvt.c3
-rw-r--r--gcc/cp/decl.c4
-rw-r--r--gcc/cp/decl2.c3
-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.c4
-rw-r--r--gcc/cp/lambda.c3
-rw-r--r--gcc/cp/lex.c3
-rw-r--r--gcc/cp/mangle.c4
-rw-r--r--gcc/cp/method.c3
-rw-r--r--gcc/cp/name-lookup.c3
-rw-r--r--gcc/cp/optimize.c3
-rw-r--r--gcc/cp/parser.c3
-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.c3
-rw-r--r--gcc/cp/tree.c4
-rw-r--r--gcc/cp/typeck.c3
-rw-r--r--gcc/cp/typeck2.c4
-rw-r--r--gcc/cp/vtable-class-hierarchy.c1
36 files changed, 38 insertions, 108 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 83071db..5a77b30 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,41 @@
+2015-06-04 Andrew MacLeod <amacleod@redhat.com>
+
+ * call.c: Adjust includes for restructured coretypes.h.
+ * 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-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-04 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
PR c++/66192
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 71f7e06..da5cfbb 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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"
@@ -57,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "wide-int.h"
#include "internal-fn.h"
/* The various kinds of conversion. */
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 4160705..09de9cf 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.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 "tm.h"
#include "tree.h"
@@ -56,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "splay-tree.h"
#include "gimplify.h"
-#include "wide-int.h"
/* The number of nested classes being processed. If we are not in the
scope of any class, this is zero. */
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index d05372a..49d0fe4 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -24,14 +24,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.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 "varasm.h"
diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c
index c64f7e2..e8cf337 100644
--- a/gcc/cp/cp-array-notation.c
+++ b/gcc/cp/cp-array-notation.c
@@ -54,14 +54,11 @@
#include "system.h"
#include "coretypes.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 "cp-tree.h"
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index 69fd53b..d8dc1c7 100644
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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"
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 825005a..c4e80e6 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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"
diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c
index dd8e7c5..8f40ce4 100644
--- a/gcc/cp/cp-objcp-common.c
+++ b/gcc/cp/cp-objcp-common.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "cp-tree.h"
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index efaf1bd..26b6cb6 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "hashtab.h"
#include "hash-set.h"
#include "vec.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"
diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c
index ce12263..1cdee86 100644
--- a/gcc/cp/cp-ubsan.c
+++ b/gcc/cp/cp-ubsan.c
@@ -22,14 +22,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.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 "alloc-pool.h"
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index ae0326e..2ab7b41 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2b57c47..e63098f 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "tree-hasher.h"
@@ -76,7 +73,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-ref.h"
#include "cgraph.h"
#include "cilk.h"
-#include "wide-int.h"
#include "builtins.h"
/* Possible cases of bad specifiers type used by bad_specifiers. */
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index e733e34..a6a628d 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -31,13 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c
index a318a23..21a27e0 100644
--- a/gcc/cp/dump.c
+++ b/gcc/cp/dump.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "cp-tree.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 690cb0c..83efad5 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 614f2e9..67eb5a2 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index dc7b277..1ea873a 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "flags.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 20781cb..564ced6 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -22,13 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "cp-tree.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 3077407..3f177b6 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
@@ -40,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "target.h"
#include "gimplify.h"
-#include "wide-int.h"
#include "c-family/c-ubsan.h"
static bool begin_init_stmts (tree *, tree *);
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index 174700f..3a4824b 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -25,14 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index bde15bc..3e8ce35 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -27,13 +27,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "input.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 "stringpool.h"
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index cc5faf7..f6ec65e 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -49,13 +49,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "tree-hasher.h"
@@ -74,7 +71,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "ipa-ref.h"
#include "cgraph.h"
-#include "wide-int.h"
#include "attribs.h"
/* Debugging support. */
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index d41e112..9187eeb1 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 9e4e0e3..62424e0 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "flags.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 "stringpool.h"
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 2d20e09..d902871 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 9ae555c..ae9d3f0 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -25,13 +25,10 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "cpplib.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 "print-tree.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index a0c5d7c..ec33d96 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index fd71bb4..d105be3 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "print-tree.h"
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index f417e4b..e98dace 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stringpool.h"
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index 8200d30..d01de92 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -24,13 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "tm_p.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 0031acd..fff3619 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -26,13 +26,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "cp-tree.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index b1c280f..dd53758 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -28,13 +28,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "stmt.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index eebb415..9d9956b 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -23,13 +23,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "fold-const.h"
@@ -54,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "gimple-expr.h"
#include "gimplify.h"
-#include "wide-int.h"
#include "attribs.h"
static tree bot_manip (tree *, int *, void *);
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 4da6275..96371a4 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -29,13 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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 "fold-const.h"
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 076f9a0..5d90806 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -30,13 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.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"
@@ -45,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "cp-tree.h"
#include "flags.h"
#include "diagnostic-core.h"
-#include "wide-int.h"
static tree
process_init_constructor (tree type, tree init, tsubst_flags_t complain);
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index a138ee4..1a94ce2 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -121,7 +121,6 @@ along with GCC; see the file COPYING3. If not see
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
-#include "machmode.h"
#include "tm.h"
#include "hard-reg-set.h"
#include "input.h"