gccrs: cleanup header usage to decouple includes

gcc/rust/ChangeLog:

	* backend/rust-compile-base.cc: fix headers
	* backend/rust-compile-base.h: likewise
	* backend/rust-compile-expr.cc: likewise
	* backend/rust-compile-extern.h: likewise
	* backend/rust-compile-pattern.cc: likewise
	* backend/rust-compile.cc: likewise
	* typecheck/rust-autoderef.cc: likewise
	* typecheck/rust-hir-dot-operator.cc: likewise
	* typecheck/rust-hir-inherent-impl-overlap.h: likewise
	* typecheck/rust-hir-path-probe.cc: likewise
	* typecheck/rust-hir-trait-resolve.cc: likewise
	* typecheck/rust-hir-type-check-base.cc: likewise
	* typecheck/rust-hir-type-check-base.h (RUST_HIR_TYPE_CHECK_BASE): likewise
	* typecheck/rust-hir-type-check-enumitem.cc: likewise
	* typecheck/rust-hir-type-check-expr.cc: likewise
	* typecheck/rust-hir-type-check-implitem.cc: likewise
	* typecheck/rust-hir-type-check-item.cc: likewise
	* typecheck/rust-hir-type-check-path.cc: likewise
	* typecheck/rust-hir-type-check-pattern.cc: likewise
	* typecheck/rust-hir-type-check-stmt.cc: likewise
	* typecheck/rust-hir-type-check-struct.cc: likewise
	* typecheck/rust-hir-type-check-type.cc: likewise
	* typecheck/rust-hir-type-check-type.h: likewise
	* typecheck/rust-hir-type-check.h (RUST_HIR_TYPE_CHECK): likewise
	* typecheck/rust-tyty-bounds.cc: likewise
	* typecheck/rust-tyty-call.cc: likewise
	* typecheck/rust-tyty-subst.cc: likewise
	* typecheck/rust-tyty.cc: likewise

Signed-off-by: Philip Herron <herron.philip@googlemail.com>

diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc
index 0a8b1769ea668a175d89850ce13eb4ef21c10583..869f05ff28b7f61a42c3c93817261ee35c801ce5 100644 (file)
--- a/gcc/rust/backend/rust-compile-base.cc
+++ b/gcc/rust/backend/rust-compile-base.cc
@@ -18,11 +18,11 @@
 
 #include "rust-compile-base.h"
 #include "rust-abi.h"
-#include "rust-compile-item.h"
 #include "rust-compile-stmt.h"
 #include "rust-compile-expr.h"
 #include "rust-compile-fnparam.h"
 #include "rust-compile-var-decl.h"
+#include "rust-compile-type.h"
 #include "rust-constexpr.h"
 #include "rust-diagnostics.h"
 #include "rust-expr.h" // for AST::AttrInputLiteral

diff --git a/gcc/rust/backend/rust-compile-base.h b/gcc/rust/backend/rust-compile-base.h
index ffcfe7b094ff6317f37fdc289f8cad57ee5d7a1b..1bf157030be3557650eed23338460fac4ffad339 100644 (file)
--- a/gcc/rust/backend/rust-compile-base.h
+++ b/gcc/rust/backend/rust-compile-base.h
@@ -20,9 +20,6 @@
 #define RUST_COMPILE_BASE
 
 #include "rust-compile-context.h"
-#include "rust-compile-type.h"
-#include "rust-hir-visitor.h"
-#include "rust-hir-full.h"
 
 namespace Rust {
 namespace Compile {

diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index 3d47d434e5c3a49fe873bd47340877f05004a22d..8a0eadc8a02efaa27a7165ec81c489e5204b0700 100644 (file)
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -18,21 +18,19 @@
 
 #include "rust-compile-expr.h"
 #include "rust-compile-struct-field-expr.h"
-#include "rust-hir-trait-resolve.h"
 #include "rust-hir-path-probe.h"
-#include "rust-hir-type-bounds.h"
 #include "rust-compile-pattern.h"
 #include "rust-compile-resolve-path.h"
 #include "rust-compile-block.h"
 #include "rust-compile-implitem.h"
 #include "rust-constexpr.h"
 #include "rust-type-util.h"
+#include "rust-compile-type.h"
 #include "rust-gcc.h"
 
 #include "fold-const.h"
 #include "realmpfr.h"
 #include "convert.h"
-#include "print-tree.h"
 
 namespace Rust {
 namespace Compile {

diff --git a/gcc/rust/backend/rust-compile-extern.h b/gcc/rust/backend/rust-compile-extern.h
index ec3316567e121b5d4e1aea5366549f7f904e0e7b..30360df9ea01d5278dd1e95317d7cdf014ae8f6d 100644 (file)
--- a/gcc/rust/backend/rust-compile-extern.h
+++ b/gcc/rust/backend/rust-compile-extern.h
@@ -21,6 +21,7 @@
 
 #include "rust-compile-base.h"
 #include "rust-compile-intrinsic.h"
+#include "rust-compile-type.h"
 
 namespace Rust {
 namespace Compile {

diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc
index 20a550d2a02c550ac797385a9cdda66deeea4dd8..a96b1b9b1f359237158928dc5165b24418bc160b 100644 (file)
--- a/gcc/rust/backend/rust-compile-pattern.cc
+++ b/gcc/rust/backend/rust-compile-pattern.cc
@@ -20,6 +20,7 @@
 #include "rust-compile-expr.h"
 #include "rust-compile-resolve-path.h"
 #include "rust-constexpr.h"
+#include "rust-compile-type.h"
 
 namespace Rust {
 namespace Compile {

diff --git a/gcc/rust/backend/rust-compile.cc b/gcc/rust/backend/rust-compile.cc
index 96c7458fe760883ff3ebfb1c9227b58e5f4b19db..a081265fc978c740ba829cd374ddf86d180a5e8c 100644 (file)
--- a/gcc/rust/backend/rust-compile.cc
+++ b/gcc/rust/backend/rust-compile.cc
@@ -19,14 +19,8 @@
 #include "rust-compile.h"
 #include "rust-compile-item.h"
 #include "rust-compile-implitem.h"
-#include "rust-compile-expr.h"
-#include "rust-compile-struct-field-expr.h"
-#include "rust-compile-stmt.h"
-#include "rust-hir-trait-resolve.h"
-#include "rust-hir-path-probe.h"
 #include "rust-hir-type-bounds.h"
-#include "rust-hir-dot-operator.h"
-#include "rust-compile-block.h"
+#include "rust-compile-type.h"
 
 namespace Rust {
 namespace Compile {

diff --git a/gcc/rust/typecheck/rust-autoderef.cc b/gcc/rust/typecheck/rust-autoderef.cc
index b85be70a89d47a20f17c1eafe10e1004ffbd6cc5..d4a21ce1a262a3f9fc95a6f79e09c06e7bd96e6f 100644 (file)
--- a/gcc/rust/typecheck/rust-autoderef.cc
+++ b/gcc/rust/typecheck/rust-autoderef.cc
@@ -20,6 +20,7 @@
 #include "rust-hir-path-probe.h"
 #include "rust-hir-dot-operator.h"
 #include "rust-hir-trait-resolve.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-dot-operator.cc b/gcc/rust/typecheck/rust-hir-dot-operator.cc
index 005f146ad250960cef2f781ba94ba40319ba092d..67ff4ad43c640444290b9fc2ef4de063c7540e3d 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-dot-operator.cc
+++ b/gcc/rust/typecheck/rust-hir-dot-operator.cc
@@ -20,6 +20,7 @@
 #include "rust-hir-path-probe.h"
 #include "rust-hir-trait-resolve.h"
 #include "rust-hir-type-check-item.h"
+#include "rust-type-util.h"
 #include "rust-coercion.h"
 
 namespace Rust {

diff --git a/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h b/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h
index cf89a91a633e755e2712a8ff0c1b960053dbfe83..c6db896bb4fef40d3be317785da43b27e1851a9e 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h
+++ b/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h
@@ -20,7 +20,7 @@
 #define RUST_HIR_INHERENT_IMPL_ITEM_OVERLAP_H
 
 #include "rust-hir-type-check-base.h"
-#include "rust-hir-full.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-path-probe.cc b/gcc/rust/typecheck/rust-hir-path-probe.cc
index 8d2cf584edf8bee77ddd415dbaa56ffe14a0eafd..049c91e97b3920f659a72b8cd0d3621886f8e508 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-path-probe.cc
+++ b/gcc/rust/typecheck/rust-hir-path-probe.cc
@@ -17,8 +17,8 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-hir-path-probe.h"
-#include "rust-hir-type-check-item.h"
 #include "rust-hir-trait-resolve.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.cc b/gcc/rust/typecheck/rust-hir-trait-resolve.cc
index 92faa8c0cf85d0c5d8ff07331a1ad8c9d5e334e4..767e56c5929a19bdebf6d4ff260a6baba39fe46c 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-trait-resolve.cc
+++ b/gcc/rust/typecheck/rust-hir-trait-resolve.cc
@@ -18,6 +18,8 @@
 
 #include "rust-hir-trait-resolve.h"
 #include "rust-hir-type-check-expr.h"
+#include "rust-substitution-mapper.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-base.cc b/gcc/rust/typecheck/rust-hir-type-check-base.cc
index 6bacb81d6ed984eb3a936df228b6e102359484a2..4d53526fdc93b2d0dfa3bddaf5aa344f58cf5b58 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-base.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-base.cc
@@ -18,9 +18,8 @@
 
 #include "rust-hir-type-check-base.h"
 #include "rust-hir-type-check-expr.h"
-#include "rust-hir-type-check-implitem.h"
-#include "rust-hir-type-check-item.h"
 #include "rust-hir-type-check-type.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-base.h b/gcc/rust/typecheck/rust-hir-type-check-base.h
index 7afe6cd4859d25c96c15ac5625ab04fcbdb89034..5b654b616aa875ebddd137f1f1a4a137fbb746a0 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-base.h
+++ b/gcc/rust/typecheck/rust-hir-type-check-base.h
@@ -19,10 +19,8 @@
 #ifndef RUST_HIR_TYPE_CHECK_BASE
 #define RUST_HIR_TYPE_CHECK_BASE
 
-#include "rust-diagnostics.h"
 #include "rust-hir-map.h"
 #include "rust-hir-type-check.h"
-#include "rust-hir-visitor.h"
 #include "rust-name-resolver.h"
 
 namespace Rust {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc b/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc
index 6cb080f0a650e33486bb38caa3a50571fe0e55b7..bb02181c6553e31c68a20d6d9ebc0e14e8302164 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-enumitem.cc
@@ -16,10 +16,10 @@
 // along with GCC; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-#include "rust-hir-full.h"
 #include "rust-hir-type-check-type.h"
 #include "rust-hir-type-check-expr.h"
 #include "rust-hir-type-check-enumitem.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
index 6ffed66c25f3a76f82c3ead3e617a504609c3976..fc85c0102d8a0b930c2da49c35f2b44b053f0587 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
@@ -16,17 +16,16 @@
 // along with GCC; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-#include "rust-hir-full.h"
 #include "rust-tyty-call.h"
 #include "rust-hir-type-check-struct-field.h"
 #include "rust-hir-path-probe.h"
 #include "rust-substitution-mapper.h"
 #include "rust-hir-trait-resolve.h"
-#include "rust-hir-type-bounds.h"
 #include "rust-hir-dot-operator.h"
 #include "rust-hir-type-check-pattern.h"
 #include "rust-hir-type-check-expr.h"
 #include "rust-hir-type-check-stmt.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-implitem.cc b/gcc/rust/typecheck/rust-hir-type-check-implitem.cc
index c0833a4299203011d51357eeed35493fc4972e6d..b42b034d7dfe52429e579908416e2b0e3b52bfec 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-implitem.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-implitem.cc
@@ -18,10 +18,10 @@
 
 #include "rust-hir-type-check-implitem.h"
 #include "rust-hir-type-check-base.h"
-#include "rust-hir-full.h"
 #include "rust-hir-type-check-type.h"
 #include "rust-hir-type-check-expr.h"
 #include "rust-hir-type-check-pattern.h"
+#include "rust-type-util.h"
 #include "rust-tyty.h"
 
 namespace Rust {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.cc b/gcc/rust/typecheck/rust-hir-type-check-item.cc
index 9b5a19a00bcf9b4a33481f66bf30804aa0beef52..571e86c7369229b1b355a1abb4fb5811f216f30f 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-item.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-item.cc
@@ -16,15 +16,15 @@
 // along with GCC; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-#include "rust-hir-full.h"
 #include "rust-hir-type-check-item.h"
 #include "rust-hir-type-check-enumitem.h"
 #include "rust-hir-type-check-implitem.h"
 #include "rust-hir-type-check-type.h"
-#include "rust-hir-type-check-stmt.h"
 #include "rust-hir-type-check-expr.h"
 #include "rust-hir-type-check-pattern.h"
 #include "rust-hir-trait-resolve.h"
+#include "rust-substitution-mapper.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-path.cc b/gcc/rust/typecheck/rust-hir-type-check-path.cc
index ef77c5dbc4f16822c536072d8f77172f29f4e535..c56c1dc8d3de2502de3504f09148d45ee2a399d8 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-path.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-path.cc
@@ -19,6 +19,9 @@
 #include "rust-hir-type-check-expr.h"
 #include "rust-hir-type-check-type.h"
 #include "rust-hir-trait-resolve.h"
+#include "rust-substitution-mapper.h"
+#include "rust-hir-path-probe.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
index c2c39c962277af11c5171513843305ff05e6f658..5a606956804f8b6b1603fe73667e89721c677e23 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
@@ -18,6 +18,7 @@
 
 #include "rust-hir-type-check-pattern.h"
 #include "rust-hir-type-check-expr.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
index 316df6cf74a542cac88f429032655892d291bc76..d1fb45a8dbe32a6df2adf9918e287243c341ca37 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
@@ -17,13 +17,12 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-hir-type-check-stmt.h"
-#include "rust-hir-full.h"
 #include "rust-hir-type-check-type.h"
 #include "rust-hir-type-check-expr.h"
-#include "rust-hir-type-check-enumitem.h"
 #include "rust-hir-type-check-implitem.h"
 #include "rust-hir-type-check-item.h"
 #include "rust-hir-type-check-pattern.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-struct.cc b/gcc/rust/typecheck/rust-hir-type-check-struct.cc
index b6ccabc2a257770ed99c4b54ca8c2546cd8cdf46..ca04334843112141f01e1c600ddc80e6ce8bff42 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-struct.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-struct.cc
@@ -17,9 +17,9 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-hir-type-check.h"
-#include "rust-hir-full.h"
 #include "rust-hir-type-check-expr.h"
 #include "rust-hir-type-check-struct-field.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.cc b/gcc/rust/typecheck/rust-hir-type-check-type.cc
index 4da3aa0dd04470825551b1afed49d5db43553c0e..50a39fdf308e25d547cf6cba87e50408a258e409 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-type.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-type.cc
@@ -19,6 +19,10 @@
 #include "rust-hir-type-check-type.h"
 #include "rust-hir-trait-resolve.h"
 #include "rust-hir-type-check-expr.h"
+#include "rust-hir-path-probe.h"
+#include "rust-hir-type-bounds.h"
+#include "rust-substitution-mapper.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.h b/gcc/rust/typecheck/rust-hir-type-check-type.h
index 37579312c9a31e58394400645616664a467a2d48..2eeb12b12833cee1ea593a28792ce13b23e17496 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-type.h
+++ b/gcc/rust/typecheck/rust-hir-type-check-type.h
@@ -20,9 +20,6 @@
 #define RUST_HIR_TYPE_CHECK_TYPE
 
 #include "rust-hir-type-check-base.h"
-#include "rust-hir-full.h"
-#include "rust-substitution-mapper.h"
-#include "rust-hir-path-probe.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h
index 2cd58988a75f07f7aab90cbea213d223e7b6dc18..427c56be29f3237d57000d715b9fae0325c2ed88 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check.h
+++ b/gcc/rust/typecheck/rust-hir-type-check.h
@@ -19,8 +19,6 @@
 #ifndef RUST_HIR_TYPE_CHECK
 #define RUST_HIR_TYPE_CHECK
 
-#include "rust-type-util.h"
-#include "rust-hir-full-decls.h"
 #include "rust-hir-map.h"
 #include "rust-tyty.h"
 #include "rust-hir-trait-reference.h"

diff --git a/gcc/rust/typecheck/rust-tyty-bounds.cc b/gcc/rust/typecheck/rust-tyty-bounds.cc
index 5d25805f181b7a33c90d85090c23c52e2950b1f4..6c36303baca578c688ee970f3b95cc970aa40ce0 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty-bounds.cc
+++ b/gcc/rust/typecheck/rust-tyty-bounds.cc
@@ -18,7 +18,8 @@
 
 #include "rust-hir-type-bounds.h"
 #include "rust-hir-trait-resolve.h"
-#include "rust-hir-type-check-item.h"
+#include "rust-substitution-mapper.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace Resolver {

diff --git a/gcc/rust/typecheck/rust-tyty-call.cc b/gcc/rust/typecheck/rust-tyty-call.cc
index 156ed98205499c99b590f4335ab1fa188b21cd76..0f04d149fc84e60986983395484007892fd4dfed 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty-call.cc
+++ b/gcc/rust/typecheck/rust-tyty-call.cc
@@ -18,6 +18,7 @@
 
 #include "rust-tyty-call.h"
 #include "rust-hir-type-check-expr.h"
+#include "rust-type-util.h"
 
 namespace Rust {
 namespace TyTy {

diff --git a/gcc/rust/typecheck/rust-tyty-subst.cc b/gcc/rust/typecheck/rust-tyty-subst.cc
index 5ff76411ab91687154bcc3e4d71f31bae8ddda45..dd533d7b9a7ca1ced509af0cbaaecdd0e0e88266 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty-subst.cc
+++ b/gcc/rust/typecheck/rust-tyty-subst.cc
@@ -17,11 +17,11 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "rust-tyty-subst.h"
-#include "rust-hir-full.h"
 #include "rust-tyty.h"
 #include "rust-hir-type-check.h"
 #include "rust-substitution-mapper.h"
 #include "rust-hir-type-check-type.h"
+#include "rust-hir-type-bounds.h"
 
 namespace Rust {
 namespace TyTy {

diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc
index 508940e5480c3771fd7a6d5ba6cad8b0c16e13bd..8c542c5eb80e5b2c7ad7835931ed2aeded55e9a7 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty.cc
+++ b/gcc/rust/typecheck/rust-tyty.cc
@@ -27,6 +27,8 @@
 #include "rust-hir-trait-reference.h"
 #include "rust-hir-trait-resolve.h"
 #include "rust-tyty-cmp.h"
+#include "rust-type-util.h"
+#include "rust-hir-type-bounds.h"
 
 #include "options.h"