diff --git a/CMakeLists.txt b/CMakeLists.txt
index 141cea0cce..c61f788f83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,12 +105,6 @@ else()
 	set(NEO_ARCH "x86")
 endif()
 
-if(NOT GTPIN_HEADERS_DIR)
-	if((EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../igc/inc/ocl_igc_shared/gtpin") OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../igc/include/igc/ocl_igc_shared/gtpin"))
-		set(GTPIN_HEADERS_DIR TRUE)
-	endif()
-endif(NOT GTPIN_HEADERS_DIR)
-
 if(NOT KMDAF_HEADERS_DIR)
     if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../kmdaf/inc/common/kmDaf.h")
         get_filename_component(KMDAF_HEADERS_DIR "../kmdaf/inc/common/" ABSOLUTE)
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index c947c9cd10..995fb60f65 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -72,7 +72,6 @@ target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
   ${KHRONOS_HEADERS_DIR}
   ${CIF_BASE_DIR}
   ${GMM_INCLUDE_PATHS}
-  ${GTPIN_HEADERS_DIR}
   ${HW_SRC_INCLUDE_PATH}
   ${IGC_OCL_ADAPTOR_DIR}
   ${IGDRCL__IGC_INCLUDE_DIR}
@@ -142,7 +141,7 @@ if(${GENERATE_EXECUTABLE})
     add_dependencies(${NEO_DYNAMIC_LIB_NAME} ${GMMUMD_LIB_NAME})
   endif()
 
-  if(GTPIN_HEADERS_DIR)
+  if(NOT DISABLED_GTPIN_SUPPORT)
     macro(macro_for_each_gen)
       target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
     endmacro()
diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt
index c0222019ec..4646db0777 100644
--- a/runtime/dll/CMakeLists.txt
+++ b/runtime/dll/CMakeLists.txt
@@ -18,7 +18,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-if(GTPIN_HEADERS_DIR)
+if(NOT DISABLED_GTPIN_SUPPORT)
   set(GTPIN_INIT_FILE "gtpin/gtpin_init.cpp")
 else()
   set(GTPIN_INIT_FILE "")
diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake
index 2c30b548c1..df64500d97 100644
--- a/runtime/enable_gens.cmake
+++ b/runtime/enable_gens.cmake
@@ -122,7 +122,7 @@ macro(macro_for_each_gen)
   if(UNIX)
     list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_LINUX})
   endif()
-  if(GTPIN_HEADERS_DIR)
+  if(NOT DISABLED_GTPIN_SUPPORT)
     list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
   endif()
 
diff --git a/runtime/gtpin/CMakeLists.txt b/runtime/gtpin/CMakeLists.txt
index d53ba9b4ea..f2670e1378 100644
--- a/runtime/gtpin/CMakeLists.txt
+++ b/runtime/gtpin/CMakeLists.txt
@@ -18,7 +18,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-if(GTPIN_HEADERS_DIR)
+if(NOT DISABLED_GTPIN_SUPPORT)
   set(RUNTIME_SRCS_GTPIN
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_callbacks.cpp
diff --git a/unit_tests/gtpin/CMakeLists.txt b/unit_tests/gtpin/CMakeLists.txt
index 5ca4e0b66b..dd68530d76 100644
--- a/unit_tests/gtpin/CMakeLists.txt
+++ b/unit_tests/gtpin/CMakeLists.txt
@@ -26,6 +26,6 @@ macro(macro_for_each_gen)
   list(APPEND IGDRCL_SRCS_tests_gtpin ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
 endmacro()
 apply_macro_for_each_gen("TESTED")
-if(GTPIN_HEADERS_DIR)
+if(NOT DISABLED_GTPIN_SUPPORT)
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gtpin})
 endif()