diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe2e62e86d..43713d2dbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,10 +106,7 @@ else()
 endif()
 
 if(NOT GTPIN_HEADERS_DIR)
-    if ((EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../internal/gtpin/gtpin_ocl_interface.h") AND (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../internal/gtpin/gtpin_driver_common.h"))
-	    get_filename_component(GTPIN_HEADERS_DIR "../internal/gtpin/" ABSOLUTE)
-        message(STATUS "GT-Pin headers dir: ${GTPIN_HEADERS_DIR}")
-    endif()
+    set(GTPIN_HEADERS_DIR TRUE)
 endif(NOT GTPIN_HEADERS_DIR)
 
 if(NOT KMDAF_HEADERS_DIR)
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index b67682944a..f65c97e272 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -22,7 +22,7 @@ components:
   internal:
     branch: master
     dest_dir: internal
-    revision: f7fda9d68e394a57152287b9cf8fbd19af158321
+    revision: 5a87a42ef15d3e1397c3af5daca8a5ca13394e2d
     type: git
   kmdaf:
     branch: kmdaf
diff --git a/runtime/gen10/gtpin_setup_gen10.cpp b/runtime/gen10/gtpin_setup_gen10.cpp
index 85fe4127ca..9f6681c270 100644
--- a/runtime/gen10/gtpin_setup_gen10.cpp
+++ b/runtime/gen10/gtpin_setup_gen10.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "gtpin_ocl_interface.h"
+#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 #include "runtime/gtpin/gtpin_hw_helper.h"
 #include "runtime/gtpin/gtpin_hw_helper.inl"
 
diff --git a/runtime/gen8/gtpin_setup_gen8.cpp b/runtime/gen8/gtpin_setup_gen8.cpp
index 46fb239da9..5b1c887b46 100644
--- a/runtime/gen8/gtpin_setup_gen8.cpp
+++ b/runtime/gen8/gtpin_setup_gen8.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "gtpin_ocl_interface.h"
+#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 #include "runtime/gtpin/gtpin_hw_helper.h"
 #include "runtime/gtpin/gtpin_hw_helper.inl"
 
diff --git a/runtime/gen9/gtpin_setup_gen9.cpp b/runtime/gen9/gtpin_setup_gen9.cpp
index 3d0e78f0d8..66de45aa2b 100644
--- a/runtime/gen9/gtpin_setup_gen9.cpp
+++ b/runtime/gen9/gtpin_setup_gen9.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "gtpin_ocl_interface.h"
+#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 #include "runtime/gtpin/gtpin_hw_helper.h"
 #include "runtime/gtpin/gtpin_hw_helper.inl"
 
diff --git a/runtime/gtpin/gtpin_callbacks.cpp b/runtime/gtpin/gtpin_callbacks.cpp
index abff0d146d..26ec7c907b 100644
--- a/runtime/gtpin/gtpin_callbacks.cpp
+++ b/runtime/gtpin/gtpin_callbacks.cpp
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "gtpin_ocl_interface.h"
+#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 #include "CL/cl.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
diff --git a/runtime/gtpin/gtpin_defs.h b/runtime/gtpin/gtpin_defs.h
index 6f26e2b083..9cb55c51e6 100644
--- a/runtime/gtpin/gtpin_defs.h
+++ b/runtime/gtpin/gtpin_defs.h
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "gtpin_ocl_interface.h"
+#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 #include "CL/cl.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/kernel/kernel.h"
diff --git a/runtime/gtpin/gtpin_helpers.cpp b/runtime/gtpin/gtpin_helpers.cpp
index c033653a96..b84cc2ba0f 100644
--- a/runtime/gtpin/gtpin_helpers.cpp
+++ b/runtime/gtpin/gtpin_helpers.cpp
@@ -21,7 +21,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "gtpin_ocl_interface.h"
+#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 #include "gtpin_helpers.h"
 #include "CL/cl.h"
 #include "runtime/context/context.h"
diff --git a/runtime/gtpin/gtpin_init.h b/runtime/gtpin/gtpin_init.h
index adac359eb2..3491882e6c 100644
--- a/runtime/gtpin/gtpin_init.h
+++ b/runtime/gtpin/gtpin_init.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include "gtpin_ocl_interface.h"
+#include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 
 #ifdef __cplusplus
 extern "C" {