--- a/shared/source/os_interface/os_library.h
+++ b/shared/source/os_interface/os_library.h
@@ -8,2 +8,3 @@
 #pragma once
+#include "uchar_string_traits.hpp"
 #include <string>

--- a/level_zero/core/source/kernel/kernel_shared_state.h
+++ b/level_zero/core/source/kernel/kernel_shared_state.h
@@ -11,4 +11,1 @@
-
-namespace std {
-class mutex;
-}
+#include <mutex>