From 344553ffd6f80dc717098235b1d2cf0d077f383d Mon Sep 17 00:00:00 2001
From: Jakub Czarnecki <jakub.czarnecki@intel.com>
Date: Tue, 22 Nov 2022 10:54:50 +0000
Subject: [PATCH]  Changed relative paths in #include directives

Changed relative paths to files in #include directives to their project
alternatives to avoid incorrect lookups.

(cherry picked from commit 982d253e0a2bb24130f42fd7ad27b257bed183c3)
---
 IGC/AdaptorCommon/API/igc.h                        |  2 +-
 IGC/AdaptorCommon/TypesLegalizationPass.cpp        |  2 +-
 IGC/AdaptorCommon/TypesLegalizationPass.hpp        |  2 +-
 IGC/AdaptorOCL/OCL/Patch/patch_parser.cpp          |  4 ++--
 IGC/AdaptorOCL/OCL/Platform/cmd_media_caps_g8.h    |  2 +-
 IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.cpp      |  6 +++---
 IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.h        |  2 +-
 IGC/AdaptorOCL/OCL/sp/sp_convert_g8.h              |  8 ++++----
 IGC/AdaptorOCL/OCL/sp/sp_g8.cpp                    | 12 ++++++------
 IGC/AdaptorOCL/OCL/sp/sp_g8.h                      | 14 +++++++-------
 IGC/AdaptorOCL/OCL/sp/spp_g8.cpp                   | 10 +++++-----
 IGC/AdaptorOCL/OCL/sp/spp_g8.h                     |  2 +-
 IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp            |  2 +-
 IGC/AdaptorOCL/SPIRV/SPIRVInternal.h               |  2 +-
 IGC/Compiler/CISACodeGen/CISACodeGen.h             |  2 +-
 .../CISACodeGen/FoldKnownWorkGroupSizes.cpp        |  6 +++---
 IGC/Compiler/CISACodeGen/Platform.hpp              |  6 +++---
 IGC/Compiler/CodeGenPublic.h                       |  6 +++---
 IGC/Compiler/CodeGenPublicEnums.h                  |  2 +-
 IGC/Compiler/CustomSafeOptPass.cpp                 |  2 +-
 IGC/Compiler/Optimizer/GatingSimilarSamples.hpp    |  2 +-
 IGC/Compiler/igc_workaround.h                      |  2 +-
 IGC/ElfPackager/main.cpp                           |  4 ++--
 IGC/GenISAIntrinsics/GenIntrinsics.cpp             |  2 +-
 IGC/LLVM3DBuilder/BuiltinsFrontend.hpp             |  8 ++++----
 IGC/common/ShaderOverride.cpp                      |  2 +-
 IGC/common/SystemThread.h                          |  2 +-
 visa/FC_linker/PatchInfoDumper.cpp                 |  2 +-
 visa/FC_linker/PatchInfoReader.cpp                 |  2 +-
 visa/FC_linker/PatchInfoRecord.h                   |  2 +-
 30 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/IGC/AdaptorCommon/API/igc.h b/IGC/AdaptorCommon/API/igc.h
index e073ac387..b813ff6bb 100644
--- a/IGC/AdaptorCommon/API/igc.h
+++ b/IGC/AdaptorCommon/API/igc.h
@@ -17,7 +17,7 @@ SPDX-License-Identifier: MIT
 
 #include <string>
 #include "../../common/EmUtils.h"
-#include "../IGC/Compiler/CodeGenPublicEnums.h"
+#include "../../Compiler/CodeGenPublicEnums.h"
 // TODO: add all external declarations so that external projects only need
 // to include this file only.
 
diff --git a/IGC/AdaptorCommon/TypesLegalizationPass.cpp b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
index 10da29ee2..8b40868cc 100644
--- a/IGC/AdaptorCommon/TypesLegalizationPass.cpp
+++ b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
 ============================= end_copyright_notice ===========================*/
 
 #include "TypesLegalizationPass.hpp"
-#include "../Compiler/IGCPassSupport.h"
+#include "Compiler/IGCPassSupport.h"
 #include "Probe/Assertion.h"
 
 #include "common/LLVMWarningsPush.hpp"
diff --git a/IGC/AdaptorCommon/TypesLegalizationPass.hpp b/IGC/AdaptorCommon/TypesLegalizationPass.hpp
index 73bdf282a..c90bad772 100644
--- a/IGC/AdaptorCommon/TypesLegalizationPass.hpp
+++ b/IGC/AdaptorCommon/TypesLegalizationPass.hpp
@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT
 #include <llvm/IR/InstVisitor.h>
 #include <llvmWrapper/IR/IRBuilder.h>
 #include "common/LLVMWarningsPop.hpp"
-#include "../Compiler/IGCPassSupport.h"
+#include "Compiler/IGCPassSupport.h"
 
 
 class TypesLegalizationPass: public llvm::FunctionPass,public llvm::InstVisitor<TypesLegalizationPass>
diff --git a/IGC/AdaptorOCL/OCL/Patch/patch_parser.cpp b/IGC/AdaptorOCL/OCL/Patch/patch_parser.cpp
index 2afc6c1b3..75c7e1484 100644
--- a/IGC/AdaptorOCL/OCL/Patch/patch_parser.cpp
+++ b/IGC/AdaptorOCL/OCL/Patch/patch_parser.cpp
@@ -8,14 +8,14 @@ SPDX-License-Identifier: MIT
 
 #include <exception>
 #include <cinttypes>
-#include "../../3d/common/iStdLib/iStdLib.h"
+#include <3d/common/iStdLib/iStdLib.h>
 #include "IGC/common/igc_debug.h"
 #include "IGC/common/igc_regkeys.hpp"
 #include "patch_g7.h"
 #include "patch_g8.h"
 #include "patch_g9.h"
 #include "visa/include/RelocationInfo.h"
-#include "../sp/sp_debug.h"
+#include "OCL/sp/sp_debug.h"
 #include "Probe/Assertion.h"
 
 namespace iOpenCL
diff --git a/IGC/AdaptorOCL/OCL/Platform/cmd_media_caps_g8.h b/IGC/AdaptorOCL/OCL/Platform/cmd_media_caps_g8.h
index 46d08e78c..9ac1faee1 100644
--- a/IGC/AdaptorOCL/OCL/Platform/cmd_media_caps_g8.h
+++ b/IGC/AdaptorOCL/OCL/Platform/cmd_media_caps_g8.h
@@ -8,7 +8,7 @@ SPDX-License-Identifier: MIT
 
 #pragma once
 
-#include "../sp/sp_types.h"
+#include "OCL/sp/sp_types.h"
 
 namespace G6HWC
 {
diff --git a/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.cpp b/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.cpp
index 77532c664..413ebead2 100644
--- a/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.cpp
+++ b/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.cpp
@@ -7,10 +7,10 @@ SPDX-License-Identifier: MIT
 ============================= end_copyright_notice ===========================*/
 
 #include "IGC/common/igc_debug.h"
-#include "../sp/sp_types.h"
+#include "OCL/sp/sp_types.h"
 
-#include "../sp/sp_debug.h"
-#include "../inc/common/igfxfmid.h"
+#include "OCL/sp/sp_debug.h"
+#include "common/igfxfmid.h"
 
 #include "cmd_shared_def_g8.h"
 #include "cmd_media_def_g8.h"
diff --git a/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.h b/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.h
index 970858da4..d83d09b2c 100644
--- a/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.h
+++ b/IGC/AdaptorOCL/OCL/Platform/cmd_parser_g8.h
@@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
 #pragma once
 
 //#include "ContextTypes.h"
-#include "../inc/common/igfxfmid.h"
+#include "common/igfxfmid.h"
 
 namespace G6HWC
 {
diff --git a/IGC/AdaptorOCL/OCL/sp/sp_convert_g8.h b/IGC/AdaptorOCL/OCL/sp/sp_convert_g8.h
index a7e36642e..cb93442c6 100644
--- a/IGC/AdaptorOCL/OCL/sp/sp_convert_g8.h
+++ b/IGC/AdaptorOCL/OCL/sp/sp_convert_g8.h
@@ -10,11 +10,11 @@ SPDX-License-Identifier: MIT
 
 #include "inc/common/Compiler/API/ShaderTypesEnum.h"
 #include "inc/common/Compiler/API/SurfaceFormats.h"
-#include "../Platform/cmd_media_enum_g8.h"
-#include "../Platform/cmd_shared_enum_g8.h"
+#include "OCL/Platform/cmd_media_enum_g8.h"
+#include "OCL/Platform/cmd_shared_enum_g8.h"
 #include "patch_list.h"
-#include "../CommandStream/SamplerTypes.h"
-#include "../CommandStream/SurfaceTypes.h"
+#include "OCL/CommandStream/SamplerTypes.h"
+#include "OCL/CommandStream/SurfaceTypes.h"
 
 namespace iOpenCL
 {
diff --git a/IGC/AdaptorOCL/OCL/sp/sp_g8.cpp b/IGC/AdaptorOCL/OCL/sp/sp_g8.cpp
index ca0ebac4b..6f8846280 100644
--- a/IGC/AdaptorOCL/OCL/sp/sp_g8.cpp
+++ b/IGC/AdaptorOCL/OCL/sp/sp_g8.cpp
@@ -14,11 +14,11 @@ SPDX-License-Identifier: MIT
 #include "sp_convert_g8.h"
 #include "sp_debug.h"
 
-#include "../util/BinaryStream.h"
+#include "OCL/util/BinaryStream.h"
 
-#include "../Platform/cmd_shared_init_g8.h"
-#include "../Platform/cmd_media_init_g8.h"
-#include "../Platform/cmd_parser_g8.h"
+#include "OCL/Platform/cmd_shared_init_g8.h"
+#include "OCL/Platform/cmd_media_init_g8.h"
+#include "OCL/Platform/cmd_parser_g8.h"
 
 #include "common/allocator.h"
 #include "common/igc_regkeys.hpp"
@@ -36,9 +36,9 @@ SPDX-License-Identifier: MIT
 #include "patch_g7.h"
 #include "patch_g8.h"
 
-#include "../../../Compiler/CodeGenPublic.h"
+#include <Compiler/CodeGenPublic.h>
 
-#include "../../../visa/include/visaBuilder_interface.h"
+#include <visa/include/visaBuilder_interface.h>
 
 #include <algorithm>
 #include <cstdint>
diff --git a/IGC/AdaptorOCL/OCL/sp/sp_g8.h b/IGC/AdaptorOCL/OCL/sp/sp_g8.h
index e6119fccc..5ff43f87a 100644
--- a/IGC/AdaptorOCL/OCL/sp/sp_g8.h
+++ b/IGC/AdaptorOCL/OCL/sp/sp_g8.h
@@ -11,16 +11,16 @@ SPDX-License-Identifier: MIT
 #include <vector>
 #include <memory>
 
-#include "../Platform/cmd_media_caps_g8.h"
-#include "../../inc/common/igfxfmid.h"
+#include "OCL/Platform/cmd_media_caps_g8.h"
+#include "common/igfxfmid.h"
 
-#include "../CommandStream/SamplerTypes.h"
-#include "../CommandStream/SurfaceTypes.h"
+#include "OCL/CommandStream/SamplerTypes.h"
+#include "OCL/CommandStream/SurfaceTypes.h"
 
-#include "../KernelAnnotations.hpp"
-#include "../util/BinaryStream.h"
+#include "OCL/KernelAnnotations.hpp"
+#include "OCL/util/BinaryStream.h"
 
-#include "../Patch/patch_parser.h"
+#include "OCL/Patch/patch_parser.h"
 #include "inc/common/Compiler/API/SurfaceFormats.h"
 #include "common/shaderHash.hpp"
 #include "usc.h"
diff --git a/IGC/AdaptorOCL/OCL/sp/spp_g8.cpp b/IGC/AdaptorOCL/OCL/sp/spp_g8.cpp
index bd948ce34..284173566 100644
--- a/IGC/AdaptorOCL/OCL/sp/spp_g8.cpp
+++ b/IGC/AdaptorOCL/OCL/sp/spp_g8.cpp
@@ -8,12 +8,12 @@ SPDX-License-Identifier: MIT
 
 #include "llvm/Config/llvm-config.h"
 #include "spp_g8.h"
-#include "../../../Compiler/CodeGenPublic.h"
+#include "Compiler/CodeGenPublic.h"
 #include "program_debug_data.h"
-#include "../../../common/SystemThread.h"
-#include "../../../common/Types.hpp"
-#include "../../../common/shaderOverride.hpp"
-#include "../../../Compiler/CISACodeGen/OpenCLKernelCodeGen.hpp"
+#include "IGC/common/SystemThread.h"
+#include "IGC/common/Types.hpp"
+#include "IGC/common/shaderOverride.hpp"
+#include "Compiler/CISACodeGen/OpenCLKernelCodeGen.hpp"
 
 #include <iomanip>
 #include <fstream>
diff --git a/IGC/AdaptorOCL/OCL/sp/spp_g8.h b/IGC/AdaptorOCL/OCL/sp/spp_g8.h
index 86d04cd32..c863e67c3 100644
--- a/IGC/AdaptorOCL/OCL/sp/spp_g8.h
+++ b/IGC/AdaptorOCL/OCL/sp/spp_g8.h
@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT
 #pragma once
 
 #include <memory>
-#include "../util/BinaryStream.h"
+#include "OCL/util/BinaryStream.h"
 #include "usc.h"
 #include "sp_g8.h"
 #include "zebin_builder.hpp"
diff --git a/IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp b/IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp
index a02662126..fbe2ee7ed 100644
--- a/IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp
+++ b/IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp
@@ -8,7 +8,7 @@ SPDX-License-Identifier: MIT
 
 #include "zebin_builder.hpp"
 
-#include "../../../Compiler/CodeGenPublic.h"
+#include "Compiler/CodeGenPublic.h"
 
 #include "common/LLVMWarningsPush.hpp"
 #include "llvm/ADT/SmallVector.h"
diff --git a/IGC/AdaptorOCL/SPIRV/SPIRVInternal.h b/IGC/AdaptorOCL/SPIRV/SPIRVInternal.h
index e1f425937..82e67d2e6 100644
--- a/IGC/AdaptorOCL/SPIRV/SPIRVInternal.h
+++ b/IGC/AdaptorOCL/SPIRV/SPIRVInternal.h
@@ -76,7 +76,7 @@ THE SOFTWARE.
 
 #include "common/LLVMWarningsPop.hpp"
 
-#include "../../inc/common/UFO/portable_compiler.h"
+#include "common/UFO/portable_compiler.h"
 
 #include <utility>
 #include <functional>
diff --git a/IGC/Compiler/CISACodeGen/CISACodeGen.h b/IGC/Compiler/CISACodeGen/CISACodeGen.h
index 9f661ca09..3b5bf0a93 100644
--- a/IGC/Compiler/CISACodeGen/CISACodeGen.h
+++ b/IGC/Compiler/CISACodeGen/CISACodeGen.h
@@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
 #pragma once
 #include "Compiler/CodeGenPublic.h"
 #include "visaBuilder_interface.h"
-#include "../../inc/common/UFO/portable_compiler.h"
+#include "common/UFO/portable_compiler.h"
 
 namespace USC
 {
diff --git a/IGC/Compiler/CISACodeGen/FoldKnownWorkGroupSizes.cpp b/IGC/Compiler/CISACodeGen/FoldKnownWorkGroupSizes.cpp
index 97dba1448..070ff4a0a 100644
--- a/IGC/Compiler/CISACodeGen/FoldKnownWorkGroupSizes.cpp
+++ b/IGC/Compiler/CISACodeGen/FoldKnownWorkGroupSizes.cpp
@@ -8,9 +8,9 @@ SPDX-License-Identifier: MIT
 
 #include "Compiler/Optimizer/OpenCLPasses/WIFuncs/WIFuncsAnalysis.hpp"
 #include "FoldKnownWorkGroupSizes.h"
-#include "../IGCPassSupport.h"
-#include "../CodeGenPublic.h"
-#include "../MetaDataApi/MetaDataApi.h"
+#include "Compiler/IGCPassSupport.h"
+#include "Compiler/CodeGenPublic.h"
+#include "Compiler/MetaDataApi/MetaDataApi.h"
 
 #include "LLVMWarningsPush.hpp"
 #include "llvm/IR/Function.h"
diff --git a/IGC/Compiler/CISACodeGen/Platform.hpp b/IGC/Compiler/CISACodeGen/Platform.hpp
index 470ddf25c..241d507c4 100644
--- a/IGC/Compiler/CISACodeGen/Platform.hpp
+++ b/IGC/Compiler/CISACodeGen/Platform.hpp
@@ -15,9 +15,9 @@ SPDX-License-Identifier: MIT
 #include "Probe/Assertion.h"
 #include "common/igc_regkeys.hpp"
 
-#include "../../../skuwa/iacm_g10_rev_id.h"
-#include "../../../skuwa/iacm_g11_rev_id.h"
-#include "../../../skuwa/iacm_g12_rev_id.h"
+#include "skuwa/iacm_g10_rev_id.h"
+#include "skuwa/iacm_g11_rev_id.h"
+#include "skuwa/iacm_g12_rev_id.h"
 
 namespace IGC
 {
diff --git a/IGC/Compiler/CodeGenPublic.h b/IGC/Compiler/CodeGenPublic.h
index bb82d1f45..c7bae550b 100644
--- a/IGC/Compiler/CodeGenPublic.h
+++ b/IGC/Compiler/CodeGenPublic.h
@@ -32,9 +32,9 @@ SPDX-License-Identifier: MIT
 #include "visa/include/RelocationInfo.h"
 #include "ZEBinWriter/zebin/source/autogen/ZEInfo.hpp"
 
-#include "../AdaptorOCL/OCL/sp/spp_g8.h"
-#include "../GenISAIntrinsics/GenIntrinsics.h"
-#include "../GenISAIntrinsics/GenIntrinsicInst.h"
+#include "AdaptorOCL/OCL/sp/spp_g8.h"
+#include "GenISAIntrinsics/GenIntrinsics.h"
+#include "GenISAIntrinsics/GenIntrinsicInst.h"
 #include "common/LLVMWarningsPush.hpp"
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/ADT/DenseMap.h>
diff --git a/IGC/Compiler/CodeGenPublicEnums.h b/IGC/Compiler/CodeGenPublicEnums.h
index 992cfd245..ca44dd061 100644
--- a/IGC/Compiler/CodeGenPublicEnums.h
+++ b/IGC/Compiler/CodeGenPublicEnums.h
@@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
 #ifndef CODE_GEN_PUBLIC_ENUMS_H_
 #define CODE_GEN_PUBLIC_ENUMS_H_
 
-#include "../IGC/common/EmUtils.h"
+#include "../common/EmUtils.h"
 
 namespace IGC
 {
diff --git a/IGC/Compiler/CustomSafeOptPass.cpp b/IGC/Compiler/CustomSafeOptPass.cpp
index f256aa1ad..31e6d53fd 100644
--- a/IGC/Compiler/CustomSafeOptPass.cpp
+++ b/IGC/Compiler/CustomSafeOptPass.cpp
@@ -86,7 +86,7 @@ cmp+sel to avoid expensive VxH mov.
 #include <llvm/Analysis/ValueTracking.h>
 #include "common/LLVMWarningsPop.hpp"
 #include <set>
-#include "../inc/common/secure_mem.h"
+#include "common/secure_mem.h"
 #include "Probe/Assertion.h"
 
 using namespace llvm;
diff --git a/IGC/Compiler/Optimizer/GatingSimilarSamples.hpp b/IGC/Compiler/Optimizer/GatingSimilarSamples.hpp
index 7305daacc..723f1fa1f 100644
--- a/IGC/Compiler/Optimizer/GatingSimilarSamples.hpp
+++ b/IGC/Compiler/Optimizer/GatingSimilarSamples.hpp
@@ -8,7 +8,7 @@ SPDX-License-Identifier: MIT
 
 #pragma once
 
-#include "../IGCPassSupport.h"
+#include "Compiler/IGCPassSupport.h"
 #include "Compiler/CodeGenPublic.h"
 #include "common/LLVMWarningsPush.hpp"
 #include "llvm/Pass.h"
diff --git a/IGC/Compiler/igc_workaround.h b/IGC/Compiler/igc_workaround.h
index edd03e50f..5d43c320b 100644
--- a/IGC/Compiler/igc_workaround.h
+++ b/IGC/Compiler/igc_workaround.h
@@ -10,7 +10,7 @@ SPDX-License-Identifier: MIT
 
 #include "inc/common/sku_wa.h"
 #include "inc/common/igfxfmid.h"
-#include "../../skuwa/wa_def.h"
+#include "skuwa/wa_def.h"
 #include "Compiler/CISACodeGen/Platform.hpp"
 
 namespace IGC
diff --git a/IGC/ElfPackager/main.cpp b/IGC/ElfPackager/main.cpp
index ae85a997c..1f350a3d0 100644
--- a/IGC/ElfPackager/main.cpp
+++ b/IGC/ElfPackager/main.cpp
@@ -34,14 +34,14 @@ SPDX-License-Identifier: MIT
 #include "llvmWrapper/ADT/STLExtras.h"
 
 #include "common/LLVMWarningsPop.hpp"
-#include "../GenISAIntrinsics/GenIntrinsics.h"
+#include "GenISAIntrinsics/GenIntrinsics.h"
 
 #include "ElfReader.h"
 #include "ElfWriter.h"
 
 #include "CLElfTypes.h"
 
-#include "../AdaptorOCL/OCL/LoadBuffer.h"
+#include "AdaptorOCL/OCL/LoadBuffer.h"
 
 #include <string>
 #include <list>
diff --git a/IGC/GenISAIntrinsics/GenIntrinsics.cpp b/IGC/GenISAIntrinsics/GenIntrinsics.cpp
index 48c6f2096..72f388b45 100644
--- a/IGC/GenISAIntrinsics/GenIntrinsics.cpp
+++ b/IGC/GenISAIntrinsics/GenIntrinsics.cpp
@@ -18,7 +18,7 @@ SPDX-License-Identifier: MIT
 #include <llvm/ADT/StringMap.h>
 #include <llvm/CodeGen/ValueTypes.h>
 #include "common/LLVMWarningsPop.hpp"
-#include "../../inc/common/UFO/portable_compiler.h"
+#include "inc/common/UFO/portable_compiler.h"
 #include <cstring>
 #include "Probe/Assertion.h"
 
diff --git a/IGC/LLVM3DBuilder/BuiltinsFrontend.hpp b/IGC/LLVM3DBuilder/BuiltinsFrontend.hpp
index 6eb902778..65a50844f 100644
--- a/IGC/LLVM3DBuilder/BuiltinsFrontend.hpp
+++ b/IGC/LLVM3DBuilder/BuiltinsFrontend.hpp
@@ -22,10 +22,10 @@ SPDX-License-Identifier: MIT
 #include "inc/common/Compiler/API/SurfaceFormats.h"
 #include "inc/common/igfxfmid.h"
 #include "common/IGCIRBuilder.h"
-#include "../common/EmUtils.h"
-#include "../../../skuwa/iacm_g10_rev_id.h"
-#include "../../../skuwa/iacm_g11_rev_id.h"
-#include "../../../skuwa/iacm_g12_rev_id.h"
+#include "common/EmUtils.h"
+#include "skuwa/iacm_g10_rev_id.h"
+#include "skuwa/iacm_g11_rev_id.h"
+#include "skuwa/iacm_g12_rev_id.h"
 
 namespace llvm {
     class GenIntrinsicInst;
diff --git a/IGC/common/ShaderOverride.cpp b/IGC/common/ShaderOverride.cpp
index e9978662d..d8f7f01af 100644
--- a/IGC/common/ShaderOverride.cpp
+++ b/IGC/common/ShaderOverride.cpp
@@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT
 
 ============================= end_copyright_notice ===========================*/
 
-#include "../../../visa/iga/IGALibrary/api/igad.h"
+#include "visa/iga/IGALibrary/api/igad.h"
 #include <iostream>
 #include <fstream>
 #include <iostream>
diff --git a/IGC/common/SystemThread.h b/IGC/common/SystemThread.h
index 7a8daca9b..39f94bb7a 100644
--- a/IGC/common/SystemThread.h
+++ b/IGC/common/SystemThread.h
@@ -29,7 +29,7 @@ SPDX-License-Identifier: MIT
 
 #include "usc.h"
 
-#include "../AdaptorOCL/OCL/LoadBuffer.h"
+#include "AdaptorOCL/OCL/LoadBuffer.h"
 #include "Compiler/CISACodeGen/Platform.hpp"
 #include "common/debug/Debug.hpp"
 #include "Probe/Assertion.h"
diff --git a/visa/FC_linker/PatchInfoDumper.cpp b/visa/FC_linker/PatchInfoDumper.cpp
index bd25083af..fc4db6d7c 100644
--- a/visa/FC_linker/PatchInfoDumper.cpp
+++ b/visa/FC_linker/PatchInfoDumper.cpp
@@ -17,7 +17,7 @@ SPDX-License-Identifier: MIT
 #include <tuple>
 #include <vector>
 
-#include "../PatchInfo.h"
+#include "visa/PatchInfo.h"
 
 namespace {
 
diff --git a/visa/FC_linker/PatchInfoReader.cpp b/visa/FC_linker/PatchInfoReader.cpp
index e0d001c77..d7685aad9 100644
--- a/visa/FC_linker/PatchInfoReader.cpp
+++ b/visa/FC_linker/PatchInfoReader.cpp
@@ -13,7 +13,7 @@ SPDX-License-Identifier: MIT
 #include <cstddef>
 #include <map>
 
-#include "../PatchInfo.h"
+#include "visa/PatchInfo.h"
 #include "PatchInfoRecord.h"
 #include "PatchInfoReader.h"
 
diff --git a/visa/FC_linker/PatchInfoRecord.h b/visa/FC_linker/PatchInfoRecord.h
index 5b99605d2..b29e98a2a 100644
--- a/visa/FC_linker/PatchInfoRecord.h
+++ b/visa/FC_linker/PatchInfoRecord.h
@@ -24,7 +24,7 @@ SPDX-License-Identifier: MIT
 #include <string>
 #include <tuple>
 
-#include "../PatchInfo.h"
+#include "visa/PatchInfo.h"
 
 namespace cm {
 
-- 
2.20.1

