From: Christian Biesinger <cbiesin...@chromium.org>
Removes an unused include as a cleanup. Requires updating
lots of files who previously relied on this transitive include.
I have only been able to test this on x86_64 because I failed
at building a cross compiler.
gcc/ChangeLog:
2019-09-23 Christian Biesinger <cbiesin...@chromium.org>
* bitmap.c: Include vec.h.
* common/common-target.h: Likewise.
* common/common-targhooks.h: Likewise.
* config/aarch64/aarch64-protos.h: Likewise.
* config/aarch64/aarch64.c: Likewise.
* config/aarch64/cortex-a57-fma-steering.c: Likewise.
* config/arc/arc.c: Likewise.
* config/avr/avr-c.c: Likewise.
* config/c6x/c6x.c: Likewise.
* config/cris/cris.c: Likewise.
* config/darwin.c: Likewise.
* config/epiphany/resolve-sw-modes.c: Likewise.
* config/i386/i386-features.c: Likewise.
* config/i386/i386.c: Likewise.
* config/ia64/ia64.c: Likewise.
* config/mips/mips.c: Likewise.
* config/mn10300/mn10300.c: Likewise.
* config/nds32/nds32-relax-opt.c: Likewise.
* config/nds32/nds32.c: Likewise.
* config/nvptx/nvptx.c: Likewise.
* config/pa/pa.c: Likewise.
* config/pdp11/pdp11.c: Likewise.
* config/rs6000/rs6000-c.c: Likewise.
* config/rx/rx.c: Likewise.
* config/s390/s390-c.c: Likewise.
* config/s390/s390.c: Likewise.
* config/sparc/sparc.c: Likewise.
* config/visium/visium.c: Likewise.
* config/vms/vms.c: Likewise.
* config/vxworks.c: Likewise.
* dbgcnt.c: Likewise.
* diagnostic-show-locus.c: Likewise.
* edit-context.c: Likewise.
* fibonacci_heap.h: Likewise.
* function.h: Likewise.
* genmatch.c: Likewise.
* ggc-common.c: Likewise.
* graphds.h: Likewise.
* hash-table.h: Remove unused include of vec.h.
* input.c: Include vec.h.
* json.h: Likewise.
* opt-suggestions.h: Likewise.
* opts.h: Likewise.
* rtl.h: Likewise.
* target.h: Likewise.
* timevar.c: Likewise.
* tree-core.h: Likewise.
* typed-splay-tree.c: Likewise.
* vec.c: Likewise.
* vector-builder.h: Likewise.
* vtable-verify.h: Likewise.
gcc/fortran/ChangeLog:
2019-09-23 Christian Biesinger <cbiesin...@chromium.org>
* gfortran.h: Include vec.h.
---
gcc/bitmap.c | 1 +
gcc/common/common-target.h | 1 +
gcc/common/common-targhooks.h | 2 ++
gcc/config/aarch64/aarch64-protos.h | 1 +
gcc/config/aarch64/aarch64.c | 1 +
gcc/config/aarch64/cortex-a57-fma-steering.c | 1 +
gcc/config/arc/arc.c | 1 +
gcc/config/avr/avr-c.c | 1 +
gcc/config/c6x/c6x.c | 1 +
gcc/config/cris/cris.c | 1 +
gcc/config/darwin.c | 1 +
gcc/config/epiphany/resolve-sw-modes.c | 1 +
gcc/config/i386/i386-features.c | 1 +
gcc/config/i386/i386.c | 1 +
gcc/config/ia64/ia64.c | 1 +
gcc/config/mips/mips.c | 1 +
gcc/config/mn10300/mn10300.c | 1 +
gcc/config/nds32/nds32-relax-opt.c | 1 +
gcc/config/nds32/nds32.c | 1 +
gcc/config/nvptx/nvptx.c | 1 +
gcc/config/pa/pa.c | 1 +
gcc/config/pdp11/pdp11.c | 1 +
gcc/config/rs6000/rs6000-c.c | 1 +
gcc/config/rx/rx.c | 1 +
gcc/config/s390/s390-c.c | 1 +
gcc/config/s390/s390.c | 1 +
gcc/config/sparc/sparc.c | 1 +
gcc/config/visium/visium.c | 1 +
gcc/config/vms/vms.c | 1 +
gcc/config/vxworks.c | 1 +
gcc/dbgcnt.c | 1 +
gcc/diagnostic-show-locus.c | 1 +
gcc/edit-context.c | 1 +
gcc/fibonacci_heap.h | 2 ++
gcc/fortran/gfortran.h | 1 +
gcc/function.h | 1 +
gcc/genmatch.c | 1 +
gcc/ggc-common.c | 1 +
gcc/graphds.h | 2 ++
gcc/hash-table.h | 1 -
gcc/input.c | 1 +
gcc/json.h | 2 ++
gcc/opt-suggestions.h | 2 ++
gcc/opts.h | 1 +
gcc/rtl.h | 1 +
gcc/target.h | 1 +
gcc/timevar.c | 1 +
gcc/tree-core.h | 1 +
gcc/typed-splay-tree.c | 1 +
gcc/vec.c | 1 +
gcc/vector-builder.h | 2 ++
gcc/vtable-verify.h | 1 +
52 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index c6afa3f1835..baeccb89029 100644
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "bitmap.h"
#include "selftest.h"
+#include "vec.h"
/* Memory allocation statistics purpose instance. */
mem_alloc_description<bitmap_usage> bitmap_mem_desc;
diff --git a/gcc/common/common-target.h b/gcc/common/common-target.h
index f08e8713d8e..8c7e57b0c21 100644
--- a/gcc/common/common-target.h
+++ b/gcc/common/common-target.h
@@ -22,6 +22,7 @@
#ifndef GCC_COMMON_TARGET_H
#define GCC_COMMON_TARGET_H
+#include "vec.h"
/* Sets of optimization levels at which an option may be enabled by
default_options_optimization. */
diff --git a/gcc/common/common-targhooks.h b/gcc/common/common-targhooks.h
index 18cfb5ab802..9bb855cfe93 100644
--- a/gcc/common/common-targhooks.h
+++ b/gcc/common/common-targhooks.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_COMMON_TARGHOOKS_H
#define GCC_COMMON_TARGHOOKS_H
+#include "vec.h"
+
extern enum unwind_info_type default_except_unwind_info (struct gcc_options *);
extern enum unwind_info_type dwarf2_except_unwind_info (struct gcc_options *);
extern enum unwind_info_type sjlj_except_unwind_info (struct gcc_options *);
diff --git a/gcc/config/aarch64/aarch64-protos.h
b/gcc/config/aarch64/aarch64-protos.h
index 1c1aac7201a..6a72757c940 100644
--- a/gcc/config/aarch64/aarch64-protos.h
+++ b/gcc/config/aarch64/aarch64-protos.h
@@ -23,6 +23,7 @@
#define GCC_AARCH64_PROTOS_H
#include "input.h"
+#include "vec.h"
/* SYMBOL_SMALL_ABSOLUTE: Generate symbol accesses through
high and lo relocs that calculate the base address using a PC
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 56a4a47db73..b5b242a74f3 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -74,6 +74,7 @@
#include "rtx-vector-builder.h"
#include "intl.h"
#include "expmed.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/aarch64/cortex-a57-fma-steering.c
b/gcc/config/aarch64/cortex-a57-fma-steering.c
index 3e890ad3de6..55bfddc64f8 100644
--- a/gcc/config/aarch64/cortex-a57-fma-steering.c
+++ b/gcc/config/aarch64/cortex-a57-fma-steering.c
@@ -39,6 +39,7 @@
#include "tree-pass.h"
#include "regrename.h"
#include "aarch64-protos.h"
+#include "vec.h"
/* For better performance, the destination of FMADD/FMSUB instructions should
have the same parity as their accumulator register if the accumulator
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index 0b5d3fd7e26..24f151ce0af 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -68,6 +68,7 @@ along with GCC; see the file COPYING3. If not see
#include "alias.h"
#include "opts.h"
#include "hw-doloop.h"
+#include "vec.h"
/* Which cpu we're compiling for (ARC600, ARC601, ARC700). */
static char arc_cpu_name[10] = "";
diff --git a/gcc/config/avr/avr-c.c b/gcc/config/avr/avr-c.c
index e0ba5bd47af..d6abb41758c 100644
--- a/gcc/config/avr/avr-c.c
+++ b/gcc/config/avr/avr-c.c
@@ -30,6 +30,7 @@
#include "langhooks.h"
#include "memmodel.h"
#include "tm_p.h"
+#include "vec.h"
/* IDs for all the AVR builtins. */
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index e593273bbf5..f34bdee7792 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -58,6 +58,7 @@
#include "regrename.h"
#include "dumpfile.h"
#include "builtins.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 9f9bc512eae..05ab6aea9a6 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "tm-constrs.h"
#include "builtins.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 3e4bbffc928..bf9147ddcec 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -47,6 +47,7 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "lto-section-names.h"
#include "intl.h"
+#include "vec.h"
/* Darwin supports a feature called fix-and-continue, which is used
for rapid turn around debugging. When code is compiled with the
diff --git a/gcc/config/epiphany/resolve-sw-modes.c
b/gcc/config/epiphany/resolve-sw-modes.c
index 9ecdf6301bc..6700206d945 100644
--- a/gcc/config/epiphany/resolve-sw-modes.c
+++ b/gcc/config/epiphany/resolve-sw-modes.c
@@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgrtl.h"
#include "insn-attr-common.h"
#include "tree-pass.h"
+#include "vec.h"
namespace {
diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c
index 9b297bac191..4fd50379e61 100644
--- a/gcc/config/i386/i386-features.c
+++ b/gcc/config/i386/i386-features.c
@@ -90,6 +90,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-vector-builder.h"
#include "debug.h"
#include "dwarf2out.h"
+#include "vec.h"
#include "i386-builtins.h"
#include "i386-features.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 9a87413ee1e..fb4f4092e4a 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -91,6 +91,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-vector-builder.h"
#include "debug.h"
#include "dwarf2out.h"
+#include "vec.h"
#include "i386-options.h"
#include "i386-builtins.h"
#include "i386-expand.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 7697e907aea..907fa0fbe37 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -65,6 +65,7 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "dumpfile.h"
#include "builtins.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index c682ebd5add..967c6fecc0a 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -65,6 +65,7 @@ along with GCC; see the file COPYING3. If not see
#include "context.h"
#include "builtins.h"
#include "rtl-iter.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index da27c903074..b2b10cafb1d 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -52,6 +52,7 @@
#include "cfgrtl.h"
#include "dumpfile.h"
#include "builtins.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/nds32/nds32-relax-opt.c
b/gcc/config/nds32/nds32-relax-opt.c
index 5da27530cd6..6c6b0a40491 100644
--- a/gcc/config/nds32/nds32-relax-opt.c
+++ b/gcc/config/nds32/nds32-relax-opt.c
@@ -51,6 +51,7 @@
#include "insn-attr.h"
#include "cfgrtl.h"
#include "tree-pass.h"
+#include "vec.h"
using namespace nds32;
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 3caae14e0e1..2fc5083c209 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -50,6 +50,7 @@
#include "builtins.h"
#include "cpplib.h"
#include "context.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index 90171a95784..d22166bb6f9 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -74,6 +74,7 @@
#include "cfgloop.h"
#include "fold-const.h"
#include "intl.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 55637df120a..b594286e8ba 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -53,6 +53,7 @@ along with GCC; see the file COPYING3. If not see
#include "cfgrtl.h"
#include "opts.h"
#include "builtins.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index d7c68091a7a..cdebcc25a82 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -47,6 +47,7 @@ along with GCC; see the file COPYING3. If not see
#include "dbxout.h"
#include "explow.h"
#include "expmed.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index bd4b19d5646..dbc7ccfc18b 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -34,6 +34,7 @@
#include "c-family/c-pragma.h"
#include "langhooks.h"
#include "c/c-tree.h"
+#include "vec.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index c7ce19c1fc0..ed952f8275a 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -51,6 +51,7 @@
#include "langhooks.h"
#include "opts.h"
#include "builtins.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index fd98a392517..62ab70eb376 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -42,6 +42,7 @@
#include "c-family/c-pragma.h"
#include "langhooks.h"
#include "tree-pretty-print.h"
+#include "vec.h"
#include "s390-builtins.h"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index cfdfa4e141d..fdbe2fe805f 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -86,6 +86,7 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-prop.h"
#include "ipa-fnsummary.h"
#include "sched-int.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index fe5e94118ef..1ba8fedb4b1 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -61,6 +61,7 @@ along with GCC; see the file COPYING3. If not see
#include "context.h"
#include "builtins.h"
#include "tree-vector-builder.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c
index 8477008320c..fe6da48af41 100644
--- a/gcc/config/visium/visium.c
+++ b/gcc/config/visium/visium.c
@@ -57,6 +57,7 @@
#include "tree-pass.h"
#include "context.h"
#include "builtins.h"
+#include "vec.h"
/* This file should be included last. */
#include "target-def.h"
diff --git a/gcc/config/vms/vms.c b/gcc/config/vms/vms.c
index c3d54ca4e6f..f9b63d754b2 100644
--- a/gcc/config/vms/vms.c
+++ b/gcc/config/vms/vms.c
@@ -30,6 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include "vms-protos.h"
#include "output.h"
#include "dwarf2out.h"
+#include "vec.h"
/* Correlation of standard CRTL names with DECCRTL function names. */
diff --git a/gcc/config/vxworks.c b/gcc/config/vxworks.c
index 5ca302a3b2c..37128ec2030 100644
--- a/gcc/config/vxworks.c
+++ b/gcc/config/vxworks.c
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "output.h"
#include "fold-const.h"
+#include "vec.h"
#if !HAVE_INITFINI_ARRAY_SUPPORT
/* Like default_named_section_asm_out_constructor, except that even
diff --git a/gcc/dbgcnt.c b/gcc/dbgcnt.c
index 15ffe115a4f..16abd8e6104 100644
--- a/gcc/dbgcnt.c
+++ b/gcc/dbgcnt.c
@@ -24,6 +24,7 @@ See dbgcnt.def for usage information. */
#include "coretypes.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
+#include "vec.h"
#include "dbgcnt.h"
diff --git a/gcc/diagnostic-show-locus.c b/gcc/diagnostic-show-locus.c
index 4d563dda8f4..9bc2faf7057 100644
--- a/gcc/diagnostic-show-locus.c
+++ b/gcc/diagnostic-show-locus.c
@@ -30,6 +30,7 @@ along with GCC; see the file COPYING3. If not see
#include "gcc-rich-location.h"
#include "selftest.h"
#include "selftest-diagnostic.h"
+#include "vec.h"
#ifdef HAVE_TERMIOS_H
# include <termios.h>
diff --git a/gcc/edit-context.c b/gcc/edit-context.c
index 4cd26c95e21..7ac4b7114fc 100644
--- a/gcc/edit-context.c
+++ b/gcc/edit-context.c
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "pretty-print.h"
#include "diagnostic-color.h"
#include "selftest.h"
+#include "vec.h"
/* This file implements a way to track the effect of fix-its,
via a class edit_context; the other classes are support classes for
diff --git a/gcc/fibonacci_heap.h b/gcc/fibonacci_heap.h
index 6e0a2166c86..0c60c3f075e 100644
--- a/gcc/fibonacci_heap.h
+++ b/gcc/fibonacci_heap.h
@@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_FIBONACCI_HEAP_H
#define GCC_FIBONACCI_HEAP_H
+#include "vec.h"
+
/* Forward definition. */
template<class K, class V>
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 6f7717d1134..82838cae57f 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -51,6 +51,7 @@ not after.
#include "intl.h"
#include "splay-tree.h"
+#include "vec.h"
/* Major control parameters. */
diff --git a/gcc/function.h b/gcc/function.h
index 43ac5dffd24..3b97d82a0af 100644
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_FUNCTION_H
#define GCC_FUNCTION_H
+#include "vec.h"
/* Stack of pending (incomplete) sequences saved by `start_sequence'.
Each element describes one pending sequence.
diff --git a/gcc/genmatch.c b/gcc/genmatch.c
index cede432cdc9..47455716129 100644
--- a/gcc/genmatch.c
+++ b/gcc/genmatch.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "hash-set.h"
#include "is-a.h"
+#include "vec.h"
/* Stubs for GGC referenced through instantiations triggered by hash-map. */
diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c
index 0968d9769fa..99c0ccbb163 100644
--- a/gcc/ggc-common.c
+++ b/gcc/ggc-common.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "hosthooks.h"
#include "plugin.h"
+#include "vec.h"
/* When set, ggc_collect will do collection. */
bool ggc_force_collect;
diff --git a/gcc/graphds.h b/gcc/graphds.h
index 68adc4976af..7e8eeda141c 100644
--- a/gcc/graphds.h
+++ b/gcc/graphds.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GRAPHDS_H
#define GCC_GRAPHDS_H
+#include "vec.h"
+
/* Structure representing edge of a graph. */
struct graph_edge
diff --git a/gcc/hash-table.h b/gcc/hash-table.h
index 0e95f5b4042..ed9958d121b 100644
--- a/gcc/hash-table.h
+++ b/gcc/hash-table.h
@@ -245,7 +245,6 @@ along with GCC; see the file COPYING3. If not see
#include "statistics.h"
#include "ggc.h"
-#include "vec.h"
#include "hashtab.h"
#include "inchash.h"
#include "mem-stats-traits.h"
diff --git a/gcc/input.c b/gcc/input.c
index 00301ef68dd..89e4b1954ac 100644
--- a/gcc/input.c
+++ b/gcc/input.c
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "selftest.h"
#include "cpplib.h"
+#include "vec.h"
#ifndef HAVE_ICONV
#define HAVE_ICONV 0
diff --git a/gcc/json.h b/gcc/json.h
index d8a690ede5c..f1396952b21 100644
--- a/gcc/json.h
+++ b/gcc/json.h
@@ -21,6 +21,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_JSON_H
#define GCC_JSON_H
+#include "vec.h"
+
/* Implementation of JSON, a lightweight data-interchange format.
See http://www.json.org/
diff --git a/gcc/opt-suggestions.h b/gcc/opt-suggestions.h
index 8d24833c0ed..8d2370376ee 100644
--- a/gcc/opt-suggestions.h
+++ b/gcc/opt-suggestions.h
@@ -21,6 +21,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_OPT_PROPOSER_H
#define GCC_OPT_PROPOSER_H
+#include "vec.h"
+
/* Option proposer is class used by driver in order to provide hints
for wrong options provided. And it's used by --complete option that's
intended to be invoked by BASH in order to provide better option
diff --git a/gcc/opts.h b/gcc/opts.h
index 47223229388..3233d049419 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#define GCC_OPTS_H
#include "obstack.h"
+#include "vec.h"
/* Specifies how a switch's VAR_VALUE relates to its FLAG_VAR. */
enum cl_var_type {
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 9cadac7a970..0d9e835d646 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3. If not see
#endif /* GENERATOR_FILE */
#include "hard-reg-set.h"
+#include "vec.h"
/* Value used by some passes to "recognize" noop moves as valid
instructions. */
diff --git a/gcc/target.h b/gcc/target.h
index a65693049b2..89a779aeb4b 100644
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -51,6 +51,7 @@
#include "insn-codes.h"
#include "tm.h"
#include "hard-reg-set.h"
+#include "vec.h"
#if CHECKING_P
diff --git a/gcc/timevar.c b/gcc/timevar.c
index 552a87738bd..042cd9882db 100644
--- a/gcc/timevar.c
+++ b/gcc/timevar.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "timevar.h"
#include "options.h"
+#include "vec.h"
#ifndef HAVE_CLOCK_T
typedef int clock_t;
diff --git a/gcc/tree-core.h b/gcc/tree-core.h
index cfd88393c04..7bff0d06eaf 100644
--- a/gcc/tree-core.h
+++ b/gcc/tree-core.h
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#define GCC_TREE_CORE_H
#include "symtab.h"
+#include "vec.h"
/* This file contains all the data structures that define the 'tree' type.
There are no accessor macros nor functions in this file. Only the
diff --git a/gcc/typed-splay-tree.c b/gcc/typed-splay-tree.c
index eb60e9f3f7e..55ede27471b 100644
--- a/gcc/typed-splay-tree.c
+++ b/gcc/typed-splay-tree.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "typed-splay-tree.h"
#include "selftest.h"
+#include "vec.h"
#if CHECKING_P
diff --git a/gcc/vec.c b/gcc/vec.c
index bac5eb753a3..b17fe42b096 100644
--- a/gcc/vec.c
+++ b/gcc/vec.c
@@ -31,6 +31,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "hash-table.h"
#include "selftest.h"
+#include "vec.h"
#ifdef GENERATOR_FILE
#include "errors.h"
#else
diff --git a/gcc/vector-builder.h b/gcc/vector-builder.h
index 37911ac693d..2b7937d7b82 100644
--- a/gcc/vector-builder.h
+++ b/gcc/vector-builder.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_VECTOR_BUILDER_H
#define GCC_VECTOR_BUILDER_H
+#include "vec.h"
+
/* This class is a wrapper around auto_vec<T> for building vectors of T.
It aims to encode each vector as npatterns interleaved patterns,
where each pattern represents a sequence:
diff --git a/gcc/vtable-verify.h b/gcc/vtable-verify.h
index 9020c9ef47d..4b1f7a51c5a 100644
--- a/gcc/vtable-verify.h
+++ b/gcc/vtable-verify.h
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#define VTABLE_VERIFY_H
#include "sbitmap.h"
+#include "vec.h"
/* The function decl used to create calls to __VLTVtableVerify. It must
be global because it needs to be initialized in the C++ front end, but
--
2.23.0.351.gc4317032e6-goog
