Good evening,
Is there a reason for attribs.h and tree-ssanames.h not having
#includes, even though their inline functions depend on stringpool.h?
The patch below clears some #include's inside /gcc, and this is one
of the techniques used. Let me know
Best regards,
Léo
-- 8< --
This patch contains the following changes:
1. Fixes gcc/attribs.h and gcc/tree-ssanames.h depending on
gcc/stringpool.h, but not including it. Stopped including "stringpool.h"
directly from many files, such as internal-fn.cc, tree-ssa-address.cc
2. In gcc/ubsan.cc, I noted that tree-pretty-print.h was included,
but only functions included indirectly form pretty-print.h were used.
I replaced the include to be more specific.
3. Removed instances in which headers were included twice. This happened
because, when some functions were moved to attribs.h (314e6352),
including stringpool+attribs was done in bulk, without checking whether
stringpool was already included. Happened in: varasm.cc internal-fn.cc
builtins.cc calls.cc function.cc gimple-expr.cc ipa.cc tree-streamer-in.cc
lto-cgraph.cc
4. Removed unused/redundant inports.
- In asan.cc, tree-ssanames, comes in ssa.h;
- In gimple-laddress.cc, it seems stringpool.h was never used;
Successfully bootstrapped on my Intel machine.
gcc/analyzer/ChangeLog:
* region-model.h: Remove unused include region-model.h
gcc/ChangeLog:
* asan.cc: Removed unused and transitive include.
* attribs.h: Include dependency stringpool.h.
* bb-reorder.cc: Remove include which is now transitive.
* btfout.cc: Likewise.
* builtins.cc: Likewise.
* calls.cc: Likewise.
* cfgexpand.cc: Likewise.
* convert.cc: Likewise.
* final.cc: Likewise.
* fold-const.cc: Likewise.
* function.cc: Likewise.
* gimple-expr.cc: Likewise.
* gimple-laddress.cc: Likewise.
* gimple-pretty-print.cc: Likewise.
* gimple-ssa-pta-constraints.cc: Likewise.
* gimple-ssa-warn-access.cc: Likewise.
* internal-fn.cc: Likewise.
* ipa-cp.cc: Likewise.
* ipa-devirt.cc: Likewise.
* ipa-fnsummary.cc: Likewise.
* ipa-inline.cc: Likewise.
* ipa-modref.cc: Likewise.
* ipa-visibility.cc: Likewise.
* ipa.cc: Likewise.
* lto-cgraph.cc: Likewise.
* multiple_target.cc: Likewise.
* opts-global.cc: Likewise.
* predict.cc: Likewise.
* profile.cc: Likewise.
* sanopt.cc: Likewise.
* selftest-run-tests.cc: Likewise.
* symtab.cc: Likewise.
* toplev.cc: Likewise.
* tree-eh.cc: Likewise.
* tree-into-ssa.cc: Likewise.
* tree-object-size.cc: Likewise.
* tree-ssa-address.cc: Likewise.
* tree-ssa-live.cc: Likewise.
* tree-ssa-loop.cc: Likewise.
* tree-ssa-sccvn.cc: Likewise.
* tree-ssa-structalias.cc: Likewise.
* tree-ssa.cc: Likewise.
* tree-ssanames.h: Include dependency stringpool.h.
* tree-streamer-in.cc: Remove include which is now transitive.
* tree-vectorizer.cc: Likewise.
* tsan.cc: Likewise.
* ubsan.cc: Replaced include with more a specific one.
* varasm.cc: Remove include which is now transitive.
* varpool.cc: Likewise.
Signed-off-by: Léo Hardt <[email protected]>
---
gcc/analyzer/region-model.h | 1 -
gcc/asan.cc | 3 ---
gcc/attribs.h | 2 ++
gcc/bb-reorder.cc | 1 -
gcc/btfout.cc | 1 -
gcc/builtins.cc | 1 -
gcc/calls.cc | 1 -
gcc/cfgexpand.cc | 1 -
gcc/convert.cc | 1 -
gcc/final.cc | 1 -
gcc/fold-const.cc | 1 -
gcc/function.cc | 1 -
gcc/gimple-expr.cc | 1 -
gcc/gimple-laddress.cc | 1 -
gcc/gimple-pretty-print.cc | 1 -
gcc/gimple-ssa-pta-constraints.cc | 1 -
gcc/gimple-ssa-warn-access.cc | 1 -
gcc/internal-fn.cc | 2 --
gcc/ipa-cp.cc | 1 -
gcc/ipa-devirt.cc | 1 -
gcc/ipa-fnsummary.cc | 1 -
gcc/ipa-inline.cc | 1 -
gcc/ipa-modref.cc | 1 -
gcc/ipa-visibility.cc | 1 -
gcc/ipa.cc | 1 -
gcc/lto-cgraph.cc | 1 -
gcc/multiple_target.cc | 1 -
gcc/opts-global.cc | 1 -
gcc/predict.cc | 1 -
gcc/profile.cc | 1 -
gcc/sanopt.cc | 1 -
gcc/selftest-run-tests.cc | 1 -
gcc/symtab.cc | 1 -
gcc/toplev.cc | 1 -
gcc/tree-eh.cc | 1 -
gcc/tree-into-ssa.cc | 1 -
gcc/tree-object-size.cc | 1 -
gcc/tree-ssa-address.cc | 1 -
gcc/tree-ssa-live.cc | 1 -
gcc/tree-ssa-loop.cc | 1 -
gcc/tree-ssa-sccvn.cc | 1 -
gcc/tree-ssa-structalias.cc | 1 -
gcc/tree-ssa.cc | 1 -
gcc/tree-ssanames.h | 2 ++
gcc/tree-streamer-in.cc | 1 -
gcc/tree-vectorizer.cc | 1 -
gcc/tsan.cc | 1 -
gcc/ubsan.cc | 2 +-
gcc/varasm.cc | 1 -
gcc/varpool.cc | 1 -
50 files changed, 5 insertions(+), 51 deletions(-)
diff --git a/gcc/analyzer/region-model.h b/gcc/analyzer/region-model.h
index 22a57a84735..207a0779ba3 100644
--- a/gcc/analyzer/region-model.h
+++ b/gcc/analyzer/region-model.h
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
http://lcs.ios.ac.cn/~xuzb/canalyze/memmodel.pdf */
#include "bitmap.h"
-#include "stringpool.h"
#include "attribs.h" // for rdwr_map
#include "selftest.h"
#include "analyzer/svalue.h"
diff --git a/gcc/asan.cc b/gcc/asan.cc
index 7f625fdcfa0..23cb98e86f0 100644
--- a/gcc/asan.cc
+++ b/gcc/asan.cc
@@ -33,8 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "memmodel.h"
#include "tm_p.h"
#include "ssa.h"
-#include "stringpool.h"
-#include "tree-ssanames.h"
#include "optabs.h"
#include "emit-rtl.h"
#include "cgraph.h"
@@ -47,7 +45,6 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stor-layout.h"
#include "tree-iterator.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "dojump.h"
diff --git a/gcc/attribs.h b/gcc/attribs.h
index 9f9abc5e4c3..602775ff789 100644
--- a/gcc/attribs.h
+++ b/gcc/attribs.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_ATTRIBS_H
#define GCC_ATTRIBS_H
+#include "stringpool.h"
+
/* A set of attributes that belong to the same namespace, given by NS. */
struct scoped_attribute_specs
{
diff --git a/gcc/bb-reorder.cc b/gcc/bb-reorder.cc
index 4e863bdac99..c423618f856 100644
--- a/gcc/bb-reorder.cc
+++ b/gcc/bb-reorder.cc
@@ -114,7 +114,6 @@
#include "except.h"
#include "alloc-pool.h"
#include "fibonacci_heap.h"
-#include "stringpool.h"
#include "attribs.h"
#include "common/common-target.h"
diff --git a/gcc/btfout.cc b/gcc/btfout.cc
index 2ba69b0c678..abfa7a30707 100644
--- a/gcc/btfout.cc
+++ b/gcc/btfout.cc
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "cgraph.h"
#include "varasm.h"
-#include "stringpool.h" /* For lookup_attribute. */
#include "attribs.h" /* For lookup_attribute. */
#include "dwarf2out.h" /* For lookup_decl_die. */
diff --git a/gcc/builtins.cc b/gcc/builtins.cc
index 056fd20c4c6..a41e26dc39c 100644
--- a/gcc/builtins.cc
+++ b/gcc/builtins.cc
@@ -62,7 +62,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "value-prof.h"
#include "builtins.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "internal-fn.h"
diff --git a/gcc/calls.cc b/gcc/calls.cc
index e5d67b6c97a..d4f66bc47f2 100644
--- a/gcc/calls.cc
+++ b/gcc/calls.cc
@@ -50,7 +50,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-vrp.h"
#include "tree-ssanames.h"
#include "intl.h"
-#include "stringpool.h"
#include "hash-map.h"
#include "hash-traits.h"
#include "attribs.h"
diff --git a/gcc/cfgexpand.cc b/gcc/cfgexpand.cc
index 245ba357b5e..5fc71f52c36 100644
--- a/gcc/cfgexpand.cc
+++ b/gcc/cfgexpand.cc
@@ -67,7 +67,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-outof-ssa.h"
#include "cfgloop.h"
#include "insn-attr.h" /* For INSN_SCHEDULING. */
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "tree-ssa-address.h"
diff --git a/gcc/convert.cc b/gcc/convert.cc
index 2d2cdfbc866..4e3872372a2 100644
--- a/gcc/convert.cc
+++ b/gcc/convert.cc
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "builtins.h"
#include "ubsan.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "selftest.h"
diff --git a/gcc/final.cc b/gcc/final.cc
index a99b188d043..80b0e27c317 100644
--- a/gcc/final.cc
+++ b/gcc/final.cc
@@ -75,7 +75,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "tree-ssa.h"
#include "cfgloop.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "rtl-iter.h"
diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc
index 4c4b535d440..b9262b34f76 100644
--- a/gcc/fold-const.cc
+++ b/gcc/fold-const.cc
@@ -80,7 +80,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-vrp.h"
#include "tree-ssanames.h"
#include "selftest.h"
-#include "stringpool.h"
#include "attribs.h"
#include "tree-vector-builder.h"
#include "vec-perm-indices.h"
diff --git a/gcc/function.cc b/gcc/function.cc
index 9358787b262..fd9da3003cd 100644
--- a/gcc/function.cc
+++ b/gcc/function.cc
@@ -77,7 +77,6 @@ along with GCC; see the file COPYING3. If not see
#include "rtl-iter.h"
#include "tree-dfa.h"
#include "tree-ssa.h"
-#include "stringpool.h"
#include "attribs.h"
#include "gimple.h"
#include "options.h"
diff --git a/gcc/gimple-expr.cc b/gcc/gimple-expr.cc
index 3b8726ded4d..fcc31b99390 100644
--- a/gcc/gimple-expr.cc
+++ b/gcc/gimple-expr.cc
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "hash-set.h"
#include "rtl.h"
#include "tree-pass.h"
-#include "stringpool.h"
#include "attribs.h"
#include "target.h"
diff --git a/gcc/gimple-laddress.cc b/gcc/gimple-laddress.cc
index e0545cf26b3..d2ac1381067 100644
--- a/gcc/gimple-laddress.cc
+++ b/gcc/gimple-laddress.cc
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-alias.h"
#include "symtab.h"
#include "tree.h"
-#include "stringpool.h"
#include "tree-vrp.h"
#include "tree-ssanames.h"
#include "fold-const.h"
diff --git a/gcc/gimple-pretty-print.cc b/gcc/gimple-pretty-print.cc
index 001865605a1..fecfa4a1e51 100644
--- a/gcc/gimple-pretty-print.cc
+++ b/gcc/gimple-pretty-print.cc
@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "value-prof.h"
#include "trans-mem.h"
#include "cfganal.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "cfgloop.h"
diff --git a/gcc/gimple-ssa-pta-constraints.cc
b/gcc/gimple-ssa-pta-constraints.cc
index b433aee8243..984fbb471c1 100644
--- a/gcc/gimple-ssa-pta-constraints.cc
+++ b/gcc/gimple-ssa-pta-constraints.cc
@@ -39,7 +39,6 @@
#include "tree-dfa.h"
#include "gimple-walk.h"
#include "varasm.h"
-#include "stringpool.h"
#include "attribs.h"
#include "tree-ssa.h"
#include "tree-cfg.h"
diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access.cc
index 2906ee7320f..299896e0ad5 100644
--- a/gcc/gimple-ssa-warn-access.cc
+++ b/gcc/gimple-ssa-warn-access.cc
@@ -50,7 +50,6 @@
#include "cfganal.h"
#include "intl.h"
#include "gimple-range.h"
-#include "stringpool.h"
#include "attribs.h"
#include "demangle.h"
#include "attr-fnspec.h"
diff --git a/gcc/internal-fn.cc b/gcc/internal-fn.cc
index c57b594ac59..44775a90f90 100644
--- a/gcc/internal-fn.cc
+++ b/gcc/internal-fn.cc
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "gimple.h"
#include "predict.h"
-#include "stringpool.h"
#include "tree-vrp.h"
#include "tree-ssanames.h"
#include "expmed.h"
@@ -40,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "dojump.h"
#include "expr.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "ubsan.h"
diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc
index d0428d04684..c9fb03e5329 100644
--- a/gcc/ipa-cp.cc
+++ b/gcc/ipa-cp.cc
@@ -126,7 +126,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-fnsummary.h"
#include "ipa-utils.h"
#include "tree-ssa-ccp.h"
-#include "stringpool.h"
#include "attribs.h"
#include "dbgcnt.h"
#include "symtab-clones.h"
diff --git a/gcc/ipa-devirt.cc b/gcc/ipa-devirt.cc
index f70ed21652a..6440f5b8b02 100644
--- a/gcc/ipa-devirt.cc
+++ b/gcc/ipa-devirt.cc
@@ -132,7 +132,6 @@ along with GCC; see the file COPYING3. If not see
#include "dbgcnt.h"
#include "gimple-pretty-print.h"
#include "intl.h"
-#include "stringpool.h"
#include "attribs.h"
#include "data-streamer.h"
#include "lto-streamer.h"
diff --git a/gcc/ipa-fnsummary.cc b/gcc/ipa-fnsummary.cc
index b8571c5b718..6b17b1e14a5 100644
--- a/gcc/ipa-fnsummary.cc
+++ b/gcc/ipa-fnsummary.cc
@@ -84,7 +84,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-utils.h"
#include "cfgexpand.h"
#include "gimplify.h"
-#include "stringpool.h"
#include "attribs.h"
#include "tree-into-ssa.h"
#include "symtab-clones.h"
diff --git a/gcc/ipa-inline.cc b/gcc/ipa-inline.cc
index 5a7615666cc..c9037cade43 100644
--- a/gcc/ipa-inline.cc
+++ b/gcc/ipa-inline.cc
@@ -117,7 +117,6 @@ along with GCC; see the file COPYING3. If not see
#include "auto-profile.h"
#include "builtins.h"
#include "fibonacci_heap.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "ipa-strub.h"
diff --git a/gcc/ipa-modref.cc b/gcc/ipa-modref.cc
index 7883a90bcdd..82eaf99773c 100644
--- a/gcc/ipa-modref.cc
+++ b/gcc/ipa-modref.cc
@@ -85,7 +85,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-phinodes.h"
#include "tree-ssa-operands.h"
#include "ssa-iterators.h"
-#include "stringpool.h"
#include "tree-ssanames.h"
#include "attribs.h"
#include "tree-cfg.h"
diff --git a/gcc/ipa-visibility.cc b/gcc/ipa-visibility.cc
index 4361d84adc9..355aa14c166 100644
--- a/gcc/ipa-visibility.cc
+++ b/gcc/ipa-visibility.cc
@@ -84,7 +84,6 @@ along with GCC; see the file COPYING3. If not see
#include "calls.h"
#include "varasm.h"
#include "ipa-utils.h"
-#include "stringpool.h"
#include "attribs.h"
/* Return true when NODE cannot be local. Worker for cgraph_local_node_p.
*/
diff --git a/gcc/ipa.cc b/gcc/ipa.cc
index 908fb301cd0..0a5f031c639 100644
--- a/gcc/ipa.cc
+++ b/gcc/ipa.cc
@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-fnsummary.h"
#include "dbgcnt.h"
#include "debug.h"
-#include "stringpool.h"
#include "attribs.h"
/* Return true when NODE has ADDR reference. */
diff --git a/gcc/lto-cgraph.cc b/gcc/lto-cgraph.cc
index adbf59ca821..bffe35f2353 100644
--- a/gcc/lto-cgraph.cc
+++ b/gcc/lto-cgraph.cc
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-utils.h"
#include "omp-offload.h"
#include "omp-general.h"
-#include "stringpool.h"
#include "attribs.h"
#include "alloc-pool.h"
#include "symbol-summary.h"
diff --git a/gcc/multiple_target.cc b/gcc/multiple_target.cc
index 01d3ff84bf3..c3499e378c8 100644
--- a/gcc/multiple_target.cc
+++ b/gcc/multiple_target.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "backend.h"
#include "tree.h"
-#include "stringpool.h"
#include "gimple.h"
#include "diagnostic-core.h"
#include "gimple-ssa.h"
diff --git a/gcc/opts-global.cc b/gcc/opts-global.cc
index 30fad240d83..56e53f54aee 100644
--- a/gcc/opts-global.cc
+++ b/gcc/opts-global.cc
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "plugin.h"
#include "toplev.h"
#include "context.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "file-prefix-map.h" /* add_*_prefix_map() */
diff --git a/gcc/predict.cc b/gcc/predict.cc
index 53328bb0e0d..dcd5ed06457 100644
--- a/gcc/predict.cc
+++ b/gcc/predict.cc
@@ -57,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "selftest.h"
#include "cfgrtl.h"
-#include "stringpool.h"
#include "attribs.h"
/* Enum with reasons why a predictor is ignored. */
diff --git a/gcc/profile.cc b/gcc/profile.cc
index 52704e93866..d8448927eee 100644
--- a/gcc/profile.cc
+++ b/gcc/profile.cc
@@ -66,7 +66,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgloop.h"
#include "sreal.h"
#include "file-prefix-map.h"
-#include "stringpool.h"
#include "attribs.h"
#include "profile.h"
diff --git a/gcc/sanopt.cc b/gcc/sanopt.cc
index 42c16d99f39..2fcca3f37db 100644
--- a/gcc/sanopt.cc
+++ b/gcc/sanopt.cc
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "fold-const.h"
#include "gimple-iterator.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "ubsan.h"
diff --git a/gcc/selftest-run-tests.cc b/gcc/selftest-run-tests.cc
index 07eb984e918..3ff05163aac 100644
--- a/gcc/selftest-run-tests.cc
+++ b/gcc/selftest-run-tests.cc
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "langhooks.h"
#include "options.h"
-#include "stringpool.h"
#include "attribs.h"
#include "analyzer/analyzer-selftests.h"
#include "diagnostics/diagnostics-selftests.h"
diff --git a/gcc/symtab.cc b/gcc/symtab.cc
index 28182f0c2c4..698d78e58e6 100644
--- a/gcc/symtab.cc
+++ b/gcc/symtab.cc
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "ipa-utils.h"
#include "calls.h"
-#include "stringpool.h"
#include "attribs.h"
#include "builtins.h"
#include "fold-const.h"
diff --git a/gcc/toplev.cc b/gcc/toplev.cc
index 30f5a3d0063..e1fce83e8ba 100644
--- a/gcc/toplev.cc
+++ b/gcc/toplev.cc
@@ -64,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "hosthooks.h"
#include "opts.h"
#include "opts-diagnostic.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "tsan.h"
diff --git a/gcc/tree-eh.cc b/gcc/tree-eh.cc
index 1a781f7a090..7d1ebba3abc 100644
--- a/gcc/tree-eh.cc
+++ b/gcc/tree-eh.cc
@@ -43,7 +43,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "cfgloop.h"
#include "gimple-low.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "gimplify.h"
diff --git a/gcc/tree-into-ssa.cc b/gcc/tree-into-ssa.cc
index f0ef5afb188..1e95b66dcf1 100644
--- a/gcc/tree-into-ssa.cc
+++ b/gcc/tree-into-ssa.cc
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "domwalk.h"
#include "statistics.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "attr-fnspec.h"
diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc
index 54c320d36d0..9e39df9b572 100644
--- a/gcc/tree-object-size.cc
+++ b/gcc/tree-object-size.cc
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-fold.h"
#include "tree-cfg.h"
#include "tree-dfa.h"
-#include "stringpool.h"
#include "attribs.h"
#include "builtins.h"
#include "gimplify-me.h"
diff --git a/gcc/tree-ssa-address.cc b/gcc/tree-ssa-address.cc
index 30baf81d789..09fc9599d96 100644
--- a/gcc/tree-ssa-address.cc
+++ b/gcc/tree-ssa-address.cc
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "gimple.h"
#include "memmodel.h"
-#include "stringpool.h"
#include "tree-vrp.h"
#include "tree-ssanames.h"
#include "expmed.h"
diff --git a/gcc/tree-ssa-live.cc b/gcc/tree-ssa-live.cc
index 0bf8ace1bc0..7d945f5011c 100644
--- a/gcc/tree-ssa-live.cc
+++ b/gcc/tree-ssa-live.cc
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "ipa-utils.h"
#include "cfgloop.h"
-#include "stringpool.h"
#include "attribs.h"
#include "optinfo.h"
#include "gimple-walk.h"
diff --git a/gcc/tree-ssa-loop.cc b/gcc/tree-ssa-loop.cc
index e0cfb9f43ff..df7efa87caf 100644
--- a/gcc/tree-ssa-loop.cc
+++ b/gcc/tree-ssa-loop.cc
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-scalar-evolution.h"
#include "omp-general.h"
#include "diagnostic-core.h"
-#include "stringpool.h"
#include "attribs.h"
diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc
index bfc227f7ca0..814c97945fe 100644
--- a/gcc/tree-ssa-sccvn.cc
+++ b/gcc/tree-ssa-sccvn.cc
@@ -57,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-cfg.h"
#include "domwalk.h"
#include "gimple-match.h"
-#include "stringpool.h"
#include "attribs.h"
#include "tree-pass.h"
#include "statistics.h"
diff --git a/gcc/tree-ssa-structalias.cc b/gcc/tree-ssa-structalias.cc
index 76fb3600e74..3ad49886845 100644
--- a/gcc/tree-ssa-structalias.cc
+++ b/gcc/tree-ssa-structalias.cc
@@ -39,7 +39,6 @@
#include "tree-dfa.h"
#include "gimple-walk.h"
#include "varasm.h"
-#include "stringpool.h"
#include "attribs.h"
#include "tree-ssa.h"
#include "tree-cfg.h"
diff --git a/gcc/tree-ssa.cc b/gcc/tree-ssa.cc
index 5248c0903d4..aae78865da9 100644
--- a/gcc/tree-ssa.cc
+++ b/gcc/tree-ssa.cc
@@ -41,7 +41,6 @@ along with GCC; see the file COPYING3. If not see
#include "cfgexpand.h"
#include "tree-cfg.h"
#include "tree-dfa.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
diff --git a/gcc/tree-ssanames.h b/gcc/tree-ssanames.h
index a7b564dd4e9..c60ffa209ee 100644
--- a/gcc/tree-ssanames.h
+++ b/gcc/tree-ssanames.h
@@ -20,6 +20,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_TREE_SSANAMES_H
#define GCC_TREE_SSANAMES_H
+#include "stringpool.h"
+
/* Aliasing information for SSA_NAMEs representing pointer variables. */
struct GTY(()) ptr_info_def
diff --git a/gcc/tree-streamer-in.cc b/gcc/tree-streamer-in.cc
index 595206e0bee..45ba2732d3a 100644
--- a/gcc/tree-streamer-in.cc
+++ b/gcc/tree-streamer-in.cc
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "builtins.h"
#include "gomp-constants.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "opts.h"
diff --git a/gcc/tree-vectorizer.cc b/gcc/tree-vectorizer.cc
index 8c824e4ee33..75dbb25f919 100644
--- a/gcc/tree-vectorizer.cc
+++ b/gcc/tree-vectorizer.cc
@@ -76,7 +76,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-propagate.h"
#include "dbgcnt.h"
#include "tree-scalar-evolution.h"
-#include "stringpool.h"
#include "attribs.h"
#include "gimple-pretty-print.h"
#include "opt-problem.h"
diff --git a/gcc/tsan.cc b/gcc/tsan.cc
index d6e3361346c..43440daf9ab 100644
--- a/gcc/tsan.cc
+++ b/gcc/tsan.cc
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-loop-ivopts.h"
#include "tree-eh.h"
#include "tsan.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "builtins.h"
diff --git a/gcc/ubsan.cc b/gcc/ubsan.cc
index 79a863b46ce..fb5ddc02670 100644
--- a/gcc/ubsan.cc
+++ b/gcc/ubsan.cc
@@ -31,7 +31,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "ssa.h"
#include "cgraph.h"
-#include "tree-pretty-print.h"
+#include "pretty-print.h"
#include "stor-layout.h"
#include "cfganal.h"
#include "gimple-iterator.h"
diff --git a/gcc/varasm.cc b/gcc/varasm.cc
index ad39bdddcfc..bcaf8074951 100644
--- a/gcc/varasm.cc
+++ b/gcc/varasm.cc
@@ -53,7 +53,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "debug.h"
#include "common/common-target.h"
-#include "stringpool.h"
#include "attribs.h"
#include "asan.h"
#include "rtl-iter.h"
diff --git a/gcc/varpool.cc b/gcc/varpool.cc
index 1025535ec5a..6030a3f11cc 100644
--- a/gcc/varpool.cc
+++ b/gcc/varpool.cc
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "omp-offload.h"
#include "context.h"
-#include "stringpool.h"
#include "attribs.h"
#include "tree-pass.h"
--
2.47.3
