diff --git a/level_zero/core/source/module/module_imp.h b/level_zero/core/source/module/module_imp.h
index 7073aa1409..1d9229a23e 100644
--- a/level_zero/core/source/module/module_imp.h
+++ b/level_zero/core/source/module/module_imp.h
@@ -13,6 +13,8 @@
 
 #include "level_zero/core/source/module/module.h"
 
+#include "igfxfmid.h"
+
 #include <list>
 #include <memory>
 #include <string>
diff --git a/shared/source/built_ins/sip.cpp b/shared/source/built_ins/sip.cpp
index 510725c42a..b9101f126d 100644
--- a/shared/source/built_ins/sip.cpp
+++ b/shared/source/built_ins/sip.cpp
@@ -14,6 +14,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/allocation_properties.h"
@@ -59,7 +60,7 @@ std::vector<char> readFile(const std::string &fileName, size_t &retSize) {
 
 SipKernel::~SipKernel() = default;
 
-SipKernel::SipKernel(SipKernelType type, GraphicsAllocation *sipAlloc, std::vector<char> ssah) : stateSaveAreaHeader(ssah), sipAllocation(sipAlloc), type(type) {
+SipKernel::SipKernel(SipKernelType type, GraphicsAllocation *sipAlloc, std::vector<char> ssah) : stateSaveAreaHeader(std::move(ssah)), sipAllocation(sipAlloc), type(type) {
 }
 
 GraphicsAllocation *SipKernel::getSipAllocation() const {
@@ -74,7 +75,7 @@ size_t SipKernel::getStateSaveAreaSize(Device *device) const {
     auto &hwInfo = device->getHardwareInfo();
     auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
     auto maxDbgSurfaceSize = hwHelper.getSipKernelMaxDbgSurfaceSize(hwInfo);
-    auto stateSaveAreaHeader = getStateSaveAreaHeader();
+    const auto &stateSaveAreaHeader = getStateSaveAreaHeader();
     if (stateSaveAreaHeader.empty()) {
         return maxDbgSurfaceSize;
     }
diff --git a/shared/source/built_ins/sip.h b/shared/source/built_ins/sip.h
index c7c7aa14b9..7e2d59d229 100644
--- a/shared/source/built_ins/sip.h
+++ b/shared/source/built_ins/sip.h
@@ -6,17 +6,21 @@
  */
 
 #pragma once
-#include "shared/source/built_ins/sip_kernel_type.h"
-#include "shared/source/helpers/hw_info.h"
-#include "shared/source/program/program_info.h"
 
+#include "shared/source/built_ins/sip_kernel_type.h"
+
+#include <cstddef>
 #include <memory>
+#include <string>
 #include <vector>
+
 namespace NEO {
 
 class Device;
 class GraphicsAllocation;
 class MemoryManager;
+
+struct HardwareInfo;
 struct RootDeviceEnvironment;
 
 class SipKernel {
@@ -68,4 +72,5 @@ class SipKernel {
     GraphicsAllocation *sipAllocation = nullptr;
     SipKernelType type = SipKernelType::COUNT;
 };
+
 } // namespace NEO
diff --git a/shared/source/compiler_interface/compiler_interface.inl b/shared/source/compiler_interface/compiler_interface.inl
index 4161c6ee77..8c413d7b8c 100644
--- a/shared/source/compiler_interface/compiler_interface.inl
+++ b/shared/source/compiler_interface/compiler_interface.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/validators.h"
 #include "shared/source/os_interface/os_library.h"