From a87ac06524c106becfa867965197f192c3e17228 Mon Sep 17 00:00:00 2001
From: Dmitry Sidorov <dmitry.sidorov@intel.com>
Date: Thu, 16 Jan 2025 22:29:44 +0100
Subject: [PATCH] [NFC][SYCL] Fix self-contained matrix headers build (#16665)

Signed-off-by: Sidorov, Dmitry <dmitry.sidorov@intel.com>
---
 .../oneapi/matrix/matrix-unified-utils.hpp    |  1 +
 .../test/self-contained-headers/lit.local.cfg | 21 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp
index ec14cf6da1931..865735617bbd8 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp
@@ -11,6 +11,7 @@
 #include <optional>                     // std::optional
 #include <string_view>                  // std::string_view
 #include <sycl/__spirv/spirv_types.hpp> // __spv namespace
+#include <sycl/ext/oneapi/bfloat16.hpp> // bfloat16
 #include <utility>                      // std::pair
 
 namespace sycl {
diff --git a/sycl/test/self-contained-headers/lit.local.cfg b/sycl/test/self-contained-headers/lit.local.cfg
index 0f0e9e15b0e53..d61551742dd85 100644
--- a/sycl/test/self-contained-headers/lit.local.cfg
+++ b/sycl/test/self-contained-headers/lit.local.cfg
@@ -13,25 +13,4 @@ config.sycl_headers_xfail = [
     os.path.join(
         "sycl", "ext", "intel", "esimd", "detail", "types_elementary.hpp"
     ),
-    os.path.join(
-        "sycl", "ext", "oneapi", "matrix", "matrix-hip.hpp"
-    ),
-    os.path.join(
-        "sycl", "ext", "oneapi", "matrix", "matrix-intel.hpp"
-    ),
-    os.path.join(
-        "sycl", "ext", "oneapi", "matrix", "matrix-tensorcores.hpp"
-    ),
-    os.path.join(
-        "sycl", "ext", "oneapi", "matrix", "matrix-unified-utils.hpp"
-    ),
-    os.path.join(
-        "sycl", "ext", "oneapi", "matrix", "matrix-unified.hpp"
-    ),
-    os.path.join(
-        "sycl", "ext", "oneapi", "matrix", "matrix.hpp"
-    ),
-    os.path.join(
-        "sycl", "ext", "oneapi", "matrix", "static-query-use.hpp"
-    ),
 ]