diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
index 8eade257b15..4bf4d28b472 100644
--- a/inference-engine/thirdparty/CMakeLists.txt
+++ b/inference-engine/thirdparty/CMakeLists.txt
@@ -18,13 +18,7 @@ if(ENABLE_LTO)
 endif()
 
 if (ENABLE_INTEL_GPU)
-    if (ENABLE_TESTS)
-        set(CLDNN__INCLUDE_TESTS ON CACHE BOOL "" FORCE)
-    else()
-        set(CLDNN__INCLUDE_TESTS OFF CACHE BOOL "" FORCE)
-    endif()
     add_subdirectory(clDNN)
-    ov_install_static_lib(clDNN_lib gpu)
 endif()
 
 function(ie_add_mkldnn)
diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
index 26e249d0ba2..55b7e614208 100644
--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
@@ -2,56 +2,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Name of project (helper constant variable).
-set(CLDNN__PROJ_NAME "clDNN")
-
-# Default languages: C, C++.
-project("${CLDNN__PROJ_NAME}")
-
-# ======================================================================================================
-# ====================================== HELPER CONSTANT VARIABLES =====================================
-# ======================================================================================================
-# ======================================================================================================
-
 if(ENABLE_GPU_DEBUG_CAPS)
   add_definitions(-DGPU_DEBUG_CONFIG=1)
 endif()
 
-# Path which points to main directory of project.
-set(CLDNN__MAIN_DIR      "${CMAKE_CURRENT_SOURCE_DIR}")
+set(MAIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/api")
 
-# Path which points to directory with interface for framework.
-set(CLDNN__API_DIR       "${CMAKE_CURRENT_SOURCE_DIR}/api")
-
-# Path which points to directory with interface for framework.
-set(CLDNN__KERNEL_SELECTOR_DIR       "${CMAKE_CURRENT_SOURCE_DIR}/kernel_selector")
-
-# Path which points to directory with runtime
-set(CLDNN__RUNTIME_DIR       "${CMAKE_CURRENT_SOURCE_DIR}/runtime")
-
-# Code generation settings.
-
-# Path which points to root directory where code generated elements are created.
-set(CLDNN__CODEGEN_BASEDIR "${CMAKE_CURRENT_BINARY_DIR}/codegen")
-# Path which points to root directory where code generated elements are created
-# (specific to build configuration).
-set(CLDNN__CODEGEN_DIR     "${CLDNN__CODEGEN_BASEDIR}")
-
-# Path which points to automatically included directory with code generated elements
-# (to support "copy-if-different" optimization).
-set(CLDNN__CODEGEN_INCDIR  "${CLDNN__CODEGEN_DIR}/include")
-
-# ======================================================================================================
-# ============================================ CMAKE OPTIONS ===========================================
-# ======================================================================================================
-
-# Include and build: Tests (unit tests and small acceptance tests) for clDNN framework.
-set(CLDNN__INCLUDE_TESTS ON CACHE BOOL "Include and build: clDNN framework's tests.")
-mark_as_advanced(CLDNN__INCLUDE_TESTS)
-
-# ======================================================================================================
-
-# Check for python 3 interpreter (required tool).
 find_package(PythonInterp 3 QUIET)
 if(NOT PYTHONINTERP_FOUND)
   message(WARNING "[clDNN] Project requires Python 3.x interpreter to build (with python loader). CMake could not detect it correctly.
@@ -59,35 +16,11 @@ if(NOT PYTHONINTERP_FOUND)
     )
 endif()
 
-# ======================================================================================================
-set(CLDNN_UTILS__RAPIDJSON_INCDIRS "utils/rapidjson" CACHE INTERNAL "Paths to interface headers for rapidjson.")
-
-# ======================================================================================================
-# ==================================== COMMON BUILD CONFIGURATION ======================================
-# ======================================================================================================
-
-# =================================== Main targets names and labels ====================================
-
-set(CLDNN_BUILD__PROJ__clDNN       "clDNN_lib")
-set(CLDNN_BUILD__PROJ_LABEL__clDNN "clDNN")
-
-# ===================================== Include/Link directories =======================================
-
-include_directories(
-    ${CLDNN_UTILS__RAPIDJSON_INCDIRS}
-    "${CLDNN__CODEGEN_INCDIR}"
-    "${CLDNN__API_DIR}"
-    $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-
-# =================================== Link targets and dependencies ====================================
-add_subdirectory(src)
 add_subdirectory(runtime)
+add_subdirectory(kernel_selector)
+add_subdirectory(src)
+add_subdirectory(utils)
 
-if(CLDNN__INCLUDE_TESTS)
+if(ENABLE_TESTS)
   add_subdirectory(tests)
 endif()
-
-add_subdirectory(kernel_selector)
-
-target_link_libraries(${CLDNN_BUILD__PROJ__clDNN} PRIVATE inference_engine)
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/graph/build_options.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/build_options.hpp
similarity index 99%
rename from inference-engine/thirdparty/clDNN/api/cldnn/graph/build_options.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/graph/build_options.hpp
index f1ddb9cb4d0..497a50134e7 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/graph/build_options.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/build_options.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/primitives/implementation_desc.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/primitives/implementation_desc.hpp"
 
 #include "topology.hpp"
 
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/graph/network.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/network.hpp
similarity index 97%
rename from inference-engine/thirdparty/clDNN/api/cldnn/graph/network.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/graph/network.hpp
index 6f8062683de..97c76d33e28 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/graph/network.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/network.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "cldnn/graph/topology.hpp"
-#include "cldnn/graph/program.hpp"
-#include "cldnn/runtime/compounds.hpp"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/event.hpp"
-#include "cldnn/runtime/stream.hpp"
+#include "intel_gpu/graph/topology.hpp"
+#include "intel_gpu/graph/program.hpp"
+#include "intel_gpu/runtime/compounds.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/event.hpp"
+#include "intel_gpu/runtime/stream.hpp"
 
 #include <map>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/graph/program.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/program.hpp
similarity index 99%
rename from inference-engine/thirdparty/clDNN/api/cldnn/graph/program.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/graph/program.hpp
index 0d65175db0e..dcda8f1a7cd 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/graph/program.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/program.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/stream.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/stream.hpp"
 #include "build_options.hpp"
 
 #include <list>
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/graph/topology.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/topology.hpp
similarity index 93%
rename from inference-engine/thirdparty/clDNN/api/cldnn/graph/topology.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/graph/topology.hpp
index b2be5d1300b..12e0f4a7ec9 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/graph/topology.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/graph/topology.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/primitives/primitive.hpp"
-#include "cldnn/primitives/input_layout.hpp"
+#include "intel_gpu/primitives/primitive.hpp"
+#include "intel_gpu/primitives/input_layout.hpp"
 
 #include <map>
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/activation.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/activation.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/activation.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/activation.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/arg_max_min.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/arg_max_min.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/arg_max_min.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/arg_max_min.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/average_unpooling.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/average_unpooling.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/average_unpooling.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/average_unpooling.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/batch_to_space.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/batch_to_space.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/batch_to_space.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/batch_to_space.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/binary_convolution.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/binary_convolution.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/binary_convolution.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/binary_convolution.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/border.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/border.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/border.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/border.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/broadcast.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/broadcast.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/broadcast.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/broadcast.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/concatenation.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/concatenation.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/concatenation.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/concatenation.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/condition.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/condition.hpp
similarity index 98%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/condition.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/condition.hpp
index 791522d3254..5ec419a21b8 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/condition.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/condition.hpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 #include "primitive.hpp"
-#include "cldnn/graph/topology.hpp"
+#include "intel_gpu/graph/topology.hpp"
 #include <vector>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/convolution.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/convolution.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/convolution.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/convolution.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/crop.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/crop.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/crop.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/crop.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/ctc_greedy_decoder.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/ctc_greedy_decoder.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/ctc_greedy_decoder.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/ctc_greedy_decoder.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/cum_sum.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/cum_sum.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/cum_sum.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/cum_sum.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/custom_gpu_primitive.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/custom_gpu_primitive.hpp
similarity index 98%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/custom_gpu_primitive.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/custom_gpu_primitive.hpp
index 163f7276319..030d710a712 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/custom_gpu_primitive.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/custom_gpu_primitive.hpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 #include "primitive.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 #include <vector>
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/data.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/data.hpp
similarity index 97%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/data.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/data.hpp
index 571175d4d04..a082d776f62 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/data.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/data.hpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 #include "primitive.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 
 namespace cldnn {
 /// @addtogroup cpp_api C++ API
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/deconvolution.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/deconvolution.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/deconvolution.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/deconvolution.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/depth_to_space.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/depth_to_space.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/depth_to_space.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/depth_to_space.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/detection_output.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/detection_output.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/detection_output.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/detection_output.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/eltwise.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/eltwise.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/eltwise.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/eltwise.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/embedding_bag.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/embedding_bag.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/embedding_bag.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/embedding_bag.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/experimental_detectron_roi_feature_extractor.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/experimental_detectron_roi_feature_extractor.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/extract_image_patches.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/extract_image_patches.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/extract_image_patches.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/extract_image_patches.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/fully_connected.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/fully_connected.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/fully_connected.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/fully_connected.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather_elements.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather_elements.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather_elements.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather_elements.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather_nd.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather_nd.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather_nd.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather_nd.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather_tree.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather_tree.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/gather_tree.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gather_tree.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/gemm.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gemm.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/gemm.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/gemm.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/grn.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/grn.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/grn.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/grn.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/implementation_desc.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/implementation_desc.hpp
similarity index 98%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/implementation_desc.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/implementation_desc.hpp
index 841d9b20913..d50f11329b0 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/implementation_desc.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/implementation_desc.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "cldnn/runtime/tensor.hpp"
+#include "intel_gpu/runtime/tensor.hpp"
 
 #include <map>
 #include <ostream>
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/input_layout.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/input_layout.hpp
similarity index 97%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/input_layout.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/input_layout.hpp
index e73b9e1cac1..76de1d8cb4d 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/input_layout.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/input_layout.hpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 #include "primitive.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 
 namespace cldnn {
 /// @addtogroup cpp_api C++ API
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/loop.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/loop.hpp
similarity index 99%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/loop.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/loop.hpp
index b888f1f9f7d..09be6aaa7af 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/loop.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/loop.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 #include <functional>
 #include "primitive.hpp"
-#include "cldnn/graph/topology.hpp"
+#include "intel_gpu/graph/topology.hpp"
 
 #define DEFAULT_MAX_NUM_ITERATION 256
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/lrn.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lrn.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/lrn.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lrn.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic_input.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic_input.hpp
similarity index 98%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic_input.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic_input.hpp
index 6737267c251..86eda558cb3 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic_input.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic_input.hpp
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/primitive.hpp"
+#include "intel_gpu/primitives/primitive.hpp"
 #include <vector>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic_timeloop.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic_timeloop.hpp
similarity index 98%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic_timeloop.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic_timeloop.hpp
index ed8a596c1e8..1db614dba01 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/lstm_dynamic_timeloop.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/lstm_dynamic_timeloop.hpp
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/primitive.hpp"
+#include "intel_gpu/primitives/primitive.hpp"
 #include <vector>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/max_unpooling.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/max_unpooling.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/max_unpooling.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/max_unpooling.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/mutable_data.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/mutable_data.hpp
similarity index 98%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/mutable_data.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/mutable_data.hpp
index 769e5655cc0..1a8cc77c1c5 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/mutable_data.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/mutable_data.hpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 #include "primitive.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 #include <vector>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/mvn.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/mvn.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/mvn.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/mvn.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/non_max_suppression.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/non_max_suppression.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/non_max_suppression.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/non_max_suppression.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/normalize.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/normalize.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/normalize.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/normalize.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/one_hot.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/one_hot.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/one_hot.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/one_hot.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/permute.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/permute.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/permute.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/permute.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/pooling.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/pooling.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/pooling.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/pooling.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/primitive.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/primitive.hpp
similarity index 98%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/primitive.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/primitive.hpp
index c57b07789a1..a5385a83a2b 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/primitive.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/primitive.hpp
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/compounds.hpp"
-#include "cldnn/runtime/layout.hpp"
+#include "intel_gpu/runtime/compounds.hpp"
+#include "intel_gpu/runtime/layout.hpp"
 
 #include <algorithm>
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/prior_box.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/prior_box.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/prior_box.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/prior_box.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/proposal.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/proposal.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/proposal.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/proposal.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/pyramid_roi_align.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/pyramid_roi_align.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/pyramid_roi_align.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/pyramid_roi_align.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/quantize.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/quantize.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/quantize.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/quantize.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/reduce.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reduce.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/reduce.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reduce.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/region_yolo.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/region_yolo.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/region_yolo.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/region_yolo.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/reorder.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reorder.hpp
similarity index 99%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/reorder.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reorder.hpp
index feb7a6d0afa..cd030242221 100644
--- a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/reorder.hpp
+++ b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reorder.hpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 #include "primitive.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 #include <vector>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/reorg_yolo.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reorg_yolo.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/reorg_yolo.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reorg_yolo.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/resample.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/resample.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/resample.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/resample.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/reshape.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reshape.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/reshape.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reshape.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/reverse_sequence.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reverse_sequence.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/reverse_sequence.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/reverse_sequence.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/roi_align.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/roi_align.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/roi_align.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/roi_align.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/roi_pooling.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/roi_pooling.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/roi_pooling.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/roi_pooling.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/scale.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scale.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/scale.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scale.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/scatter_elements_update.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scatter_elements_update.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/scatter_elements_update.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scatter_elements_update.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/scatter_nd_update.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scatter_nd_update.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/scatter_nd_update.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scatter_nd_update.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/scatter_update.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scatter_update.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/scatter_update.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/scatter_update.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/select.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/select.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/select.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/select.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/shuffle_channels.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/shuffle_channels.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/shuffle_channels.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/shuffle_channels.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/softmax.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/softmax.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/softmax.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/softmax.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/space_to_batch.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/space_to_batch.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/space_to_batch.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/space_to_batch.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/space_to_depth.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/space_to_depth.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/space_to_depth.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/space_to_depth.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/split.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/split.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/split.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/split.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/strided_slice.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/strided_slice.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/strided_slice.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/strided_slice.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/primitives/tile.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/tile.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/primitives/tile.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/primitives/tile.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/compounds.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/compounds.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/compounds.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/compounds.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/debug_configuration.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/debug_configuration.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/debug_configuration.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/debug_configuration.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/device.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/device.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/device.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/device.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/device_info.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/device_info.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/device_info.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/device_info.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/device_query.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/device_query.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/device_query.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/device_query.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/engine.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/engine.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/engine.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/engine.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/engine_configuration.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/engine_configuration.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/engine_configuration.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/engine_configuration.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/error_handler.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/error_handler.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/error_handler.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/error_handler.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/event.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/event.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/event.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/event.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/half.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/half.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/half.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/half.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/kernel.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/kernel.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/kernel.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/kernel.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/kernel_args.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/kernel_args.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/kernel_args.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/kernel_args.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/layout.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/layout.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/layout.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/layout.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/memory.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/memory.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/memory.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/memory.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/memory_caps.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/memory_caps.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/memory_caps.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/memory_caps.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/memory_pool.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/memory_pool.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/memory_pool.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/memory_pool.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/profiling.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/profiling.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/profiling.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/profiling.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/stream.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/stream.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/stream.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/stream.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/tensor.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/tensor.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/tensor.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/tensor.hpp
diff --git a/inference-engine/thirdparty/clDNN/api/cldnn/runtime/utils.hpp b/inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/utils.hpp
similarity index 100%
rename from inference-engine/thirdparty/clDNN/api/cldnn/runtime/utils.hpp
rename to inference-engine/thirdparty/clDNN/api/intel_gpu/runtime/utils.hpp
diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/CMakeLists.txt b/inference-engine/thirdparty/clDNN/kernel_selector/CMakeLists.txt
index a8f804318a7..afe3811ad5f 100644
--- a/inference-engine/thirdparty/clDNN/kernel_selector/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/kernel_selector/CMakeLists.txt
@@ -2,171 +2,92 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# =================================== Name / Output settings from parent ===============================
+set(TARGET_NAME "ov_intel_gpu_kernels")
 
-set(CLDNN_BUILD__PROJ             "cldnn_kernel_selector")
-set(CLDNN_BUILD__PROJ_LABEL       "${CLDNN_BUILD__PROJ}")
-
-# ========================================= Source/Header files ========================================
-
-set(__CLDNN_Directory__main           "${CMAKE_CURRENT_SOURCE_DIR}")
-set(__CLDNN_Label__main                "")
-file(GLOB __CLDNN_Sources__main
-    "${__CLDNN_Directory__main}/*.h"
-    "${__CLDNN_Directory__main}/*.hpp"
-    "${__CLDNN_Directory__main}/*.cpp"
+file(GLOB_RECURSE LIBRARY_SRC
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
   )
 
-set(__CLDNN_Directory__core           "${__CLDNN_Directory__main}/core")
-set(__CLDNN_Label__core               "core")
-file(GLOB __CLDNN_Sources__core
-    "${__CLDNN_Directory__core}/*.h"
-    "${__CLDNN_Directory__core}/*.hpp"
-    "${__CLDNN_Directory__core}/*.cpp"
+file(GLOB_RECURSE KERNELS
+    "${CMAKE_CURRENT_SOURCE_DIR}/core/cl_kernels/*.cl"
   )
 
-set(__CLDNN_Directory__common          "${__CLDNN_Directory__main}/common")
-set(__CLDNN_Label__common              "common")
-file(GLOB __CLDNN_Sources__common
-    "${__CLDNN_Directory__common}/*.h"
-    "${__CLDNN_Directory__common}/*.hpp"
-    "${__CLDNN_Directory__common}/*.cpp"
-  )
+# Path which points to root directory where code generated elements are created
+# (specific to build configuration).
+set(CODEGEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/codegen")
+set(CODEGEN_CACHE_DIR  "${CODEGEN_DIR}/cache")
 
-set(__CLDNN_Directory__core_common          "${__CLDNN_Directory__core}/common")
-set(__CLDNN_Label__core_common              "${__CLDNN_Label__core}\\common")
-file(GLOB __CLDNN_Sources__core_common
-    "${__CLDNN_Directory__core_common}/*.h"
-    "${__CLDNN_Directory__core_common}/*.hpp"
-    "${__CLDNN_Directory__core_common}/*.cpp"
-  )
+# Path which points to automatically included directory with code generated elements
+# (to support "copy-if-different" optimization).
+set(CODEGEN_INCDIR  "${CODEGEN_DIR}/include")
 
-set(__CLDNN_Directory__core_cache          "${__CLDNN_Directory__core}/cache")
-set(__CLDNN_Label__core_cache              "${__CLDNN_Label__core}\\cache")
-file(GLOB __CLDNN_Sources__core_cache
-    "${__CLDNN_Directory__core_cache}/*.h"
-    "${__CLDNN_Directory__core_cache}/*.hpp"
-    "${__CLDNN_Directory__core_cache}/*.cpp"
-  )
 
-set(__CLDNN_Directory__actual_kernels "${__CLDNN_Directory__core}/actual_kernels")
-set(__CLDNN_Label__actual_kernels     "${__CLDNN_Label__core}\\actual_kernels")
-file(GLOB_RECURSE __CLDNN_Sources__actual_kernels
-    "${__CLDNN_Directory__actual_kernels}/*.h"
-    "${__CLDNN_Directory__actual_kernels}/*.hpp"
-    "${__CLDNN_Directory__actual_kernels}/*.cpp"
-  )
-foreach(__CLDNN_FilePath ${__CLDNN_Sources__actual_kernels})
-  string(REPLACE ";" "\;" __CLDNN_FilePath "${__CLDNN_FilePath}") # [WA#1] Must escape ; again if occurred in item.
-  get_filename_component(__CLDNN_FileDir "${__CLDNN_FilePath}" DIRECTORY)
-  get_filename_component(__CLDNN_DirName "${__CLDNN_FileDir}" NAME)
+set(PRIM_DB "ks_primitive_db.inc")
+set(PRIM_DB_BATCH_HEADERS "ks_primitive_db_batch_headers.inc")
+set(CODEGEN_CACHE_SOURCES "${CODEGEN_INCDIR}/${PRIM_DB}"
+                          "${CODEGEN_INCDIR}/${PRIM_DB_BATCH_HEADERS}")
 
-  set(__CLDNN_FileLabel "${__CLDNN_Label__actual_kernels}\\${__CLDNN_DirName}")
-  source_group("${__CLDNN_FileLabel}" FILES ${__CLDNN_FilePath})
-endforeach()
-
-set(__CLDNN_Directory__cl_kernels      "${__CLDNN_Directory__core}/cl_kernels")
-set(__CLDNN_Label__cl_kernels          "${__CLDNN_Label__core}\\cl_kernels")
-file(GLOB_RECURSE __CLDNN_Sources__cl_kernels
-    "${__CLDNN_Directory__cl_kernels}/*.cl"
-  )
-
-set(__CLDNN_Directory__cg_cache        "${CLDNN__CODEGEN_INCDIR}")
-set(__CLDNN_CGDirectory__cg_cache      "${CLDNN__CODEGEN_DIR}/cache")
-set(__CLDNN_Label__cg_cache            "${__CLDNN_Label__core}\\codegen")
-set(__CLDNN_Label__cg_cache_batch_headers            "${__CLDNN_Label__core}\\codegen")
-set(__CLDNN_File__cg_cache__prim_db    "ks_primitive_db.inc")
-set(__CLDNN_File__cg_cache__prim_db_batch_headers    "ks_primitive_db_batch_headers.inc")
-set(__CLDNN_Sources__cg_cache
-    "${__CLDNN_Directory__cg_cache}/${__CLDNN_File__cg_cache__prim_db}"
-    "${__CLDNN_Directory__cg_cache}/${__CLDNN_File__cg_cache__prim_db_batch_headers}"
-  )
-
-set(__CLDNN_AllSources
-    ${__CLDNN_Sources__main}
-    ${__CLDNN_Sources__core}
-    ${__CLDNN_Sources__common}
-    ${__CLDNN_Sources__core_common}
-    ${__CLDNN_Sources__core_cache}
-    ${__CLDNN_Sources__actual_kernels}
-    ${__CLDNN_Sources__cl_kernels}
-    ${__CLDNN_Sources__cg_cache}
-  )
+set(CODEGEN_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/core/common/primitive_db_gen.py")
 # Helping with some generators.
-set_property(SOURCE ${__CLDNN_Sources__cg_cache} PROPERTY GENERATED TRUE)
+set_property(SOURCE ${CODEGEN_CACHE_SOURCES} PROPERTY GENERATED TRUE)
 
-# =============================================== Filters ==============================================
+add_custom_command(OUTPUT "${CODEGEN_CACHE_DIR}/${PRIM_DB}"
+  COMMAND "${CMAKE_COMMAND}" -E make_directory "${CODEGEN_CACHE_DIR}"
+  COMMAND "${PYTHON_EXECUTABLE}" "${CODEGEN_SCRIPT}" -out_path "${CODEGEN_CACHE_DIR}"
+                                                     -out_file_name_prim_db "${PRIM_DB}"
+                                                     -out_file_name_batch_headers "${PRIM_DB_BATCH_HEADERS}"
+                                                     -kernels "${CMAKE_CURRENT_SOURCE_DIR}/core/cl_kernels/"
+  DEPENDS ${KERNELS} "${CODEGEN_SCRIPT}"
+  COMMENT "Generating ${CODEGEN_CACHE_DIR}/${PRIM_DB} ..."
+)
 
-source_group("${__CLDNN_Label__main}"             FILES ${__CLDNN_Sources__main})
-source_group("${__CLDNN_Label__core}"             FILES ${__CLDNN_Sources__core})
-source_group("${__CLDNN_Label__common}"           FILES ${__CLDNN_Sources__common})
-source_group("${__CLDNN_Label__core_common}"      FILES ${__CLDNN_Sources__core_common})
-source_group("${__CLDNN_Label__core_cache}"      FILES ${__CLDNN_Sources__core_cache})
-#source_group("${__CLDNN_Label__actual_kernels}"  FILES ${__CLDNN_Sources__actual_kernels})
-source_group("${__CLDNN_Label__cl_kernels}"       FILES ${__CLDNN_Sources__cl_kernels})
-source_group("${__CLDNN_Label__cg_cache}"         FILES ${__CLDNN_Sources__cg_cache})
+add_custom_command(OUTPUT "${CODEGEN_INCDIR}/${PRIM_DB}"
+  COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CODEGEN_CACHE_DIR}/${PRIM_DB}" "${CODEGEN_INCDIR}/${PRIM_DB}"
+  COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CODEGEN_CACHE_DIR}/${PRIM_DB_BATCH_HEADERS}" "${CODEGEN_INCDIR}/${PRIM_DB_BATCH_HEADERS}"
+  DEPENDS "${CODEGEN_CACHE_DIR}/${PRIM_DB}" "${KERNELS}" "${CODEGEN_SCRIPT}"
+  COMMENT "Updating file if the file changed (${PRIM_DB}) ..."
+)
 
-# ===================================== Include/Link directories =======================================
+add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${CODEGEN_CACHE_SOURCES})
 
-include_directories(
-    "${CLDNN__MAIN_DIR}"
-    "${__CLDNN_Directory__main}"
-    "${__CLDNN_Directory__core}"
-    "${__CLDNN_Directory__core}/common"
-    "${__CLDNN_Directory__core}/cache"
-    "${__CLDNN_Directory__actual_kernels}"
-    "${__CLDNN_Directory__common}"
-  )
+target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${INCLUDE_DIR}>
+                                                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                                                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/core/>
+                                                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/core/common/>
+                                                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/core/actual_kernels/>
+                                                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/core/cache/>
+                                                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common/>
+                                                 $<BUILD_INTERFACE:${CODEGEN_INCDIR}>)
 
-# =================================== Link targets and dependencies ====================================
-
-# Main shared library.
-add_library("${CLDNN_BUILD__PROJ}" STATIC
-    ${__CLDNN_AllSources}
-  )
-
-target_compile_options("${CLDNN_BUILD__PROJ}" PRIVATE
+target_compile_options(${TARGET_NAME} PRIVATE
   $<$<CONFIG:Release>:$<IF:$<CXX_COMPILER_ID:MSVC>,/Os,-Os>>)
 
-set_property(TARGET "${CLDNN_BUILD__PROJ}" PROPERTY PROJECT_LABEL "${CLDNN_BUILD__PROJ_LABEL}")
-
 if(COMMAND add_cpplint_target)
-  add_cpplint_target("${CLDNN_BUILD__PROJ}_cpplint" FOR_TARGETS "${CLDNN_BUILD__PROJ}")
+  add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
 endif()
 
-target_link_libraries("${CLDNN_BUILD__PROJ}"
-    OpenCL
-  )
+target_link_libraries(${TARGET_NAME} PUBLIC OpenCL rapidjson inference_engine_plugin_api)
 
 if(WIN32)
-  target_link_libraries("${CLDNN_BUILD__PROJ}" setupapi)
+  target_link_libraries(${TARGET_NAME} PRIVATE setupapi)
 elseif((NOT ANDROID) AND (UNIX))
-  target_link_libraries("${CLDNN_BUILD__PROJ}" pthread)
+  target_link_libraries(${TARGET_NAME} PRIVATE pthread)
 endif()
 
-# =================================== Custom pre- and post-steps =======================================
-add_custom_command(OUTPUT "${__CLDNN_CGDirectory__cg_cache}/${__CLDNN_File__cg_cache__prim_db}"
-    COMMAND "${CMAKE_COMMAND}" -E make_directory "${__CLDNN_CGDirectory__cg_cache}"
-    COMMAND "${PYTHON_EXECUTABLE}" "${__CLDNN_Directory__core_common}/primitive_db_gen.py" -out_path "${__CLDNN_CGDirectory__cg_cache}" -out_file_name_prim_db "${__CLDNN_File__cg_cache__prim_db}" -out_file_name_batch_headers "${__CLDNN_File__cg_cache__prim_db_batch_headers}" -kernels "${__CLDNN_Directory__cl_kernels}"
-    DEPENDS ${__CLDNN_Sources__cl_kernels} "${__CLDNN_Directory__core_common}/primitive_db_gen.py"
-    COMMENT "Generating ${__CLDNN_File__cg_cache__prim_db} ..."
-  )
-add_custom_command(OUTPUT "${__CLDNN_Directory__cg_cache}/${__CLDNN_File__cg_cache__prim_db}"
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__CLDNN_CGDirectory__cg_cache}/${__CLDNN_File__cg_cache__prim_db}" "${__CLDNN_Directory__cg_cache}/${__CLDNN_File__cg_cache__prim_db}"
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__CLDNN_CGDirectory__cg_cache}/${__CLDNN_File__cg_cache__prim_db_batch_headers}" "${__CLDNN_Directory__cg_cache}/${__CLDNN_File__cg_cache__prim_db_batch_headers}"
-    DEPENDS "${__CLDNN_CGDirectory__cg_cache}/${__CLDNN_File__cg_cache__prim_db}" ${__CLDNN_Sources__cl_kernels} "${__CLDNN_Directory__core_common}/primitive_db_gen.py"
-    COMMENT "Updating file if the file changed (${__CLDNN_File__cg_cache__prim_db}) ..."
-  )
 if(WIN32)
-  set(CLDNN_CACHE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>")
+  set(TUNING_CACHE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>")
 else((NOT ANDROID) AND (UNIX))
-  set(CLDNN_CACHE_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/")
+  set(TUNING_CACHE_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/")
 endif()
 
 add_custom_command(
-    TARGET "${CLDNN_BUILD__PROJ}" POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${__CLDNN_Directory__core}/cache/cache.json ${CLDNN_CACHE_PATH}/cache.json)
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json)
 
-ov_install_static_lib("${CLDNN_BUILD__PROJ}" gpu)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json
+        DESTINATION ${IE_CPACK_RUNTIME_PATH}
+        COMPONENT gpu)
 
-# ======================================================================================================
+ov_install_static_lib(${TARGET_NAME} gpu)
diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_os_iyx_osv16.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_os_iyx_osv16.h
index a62eaeb31ce..6a0ac7cbf54 100644
--- a/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_os_iyx_osv16.h
+++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/actual_kernels/convolution/convolution_kernel_bfyx_os_iyx_osv16.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "api/cldnn/runtime/device_info.hpp"
+#include "intel_gpu/runtime/device_info.hpp"
 #include "convolution_kernel_base.h"
 #include <string>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/kernel_selector/core/kernel_selector_common.h b/inference-engine/thirdparty/clDNN/kernel_selector/core/kernel_selector_common.h
index d0b0054f1b2..d2876d7f3e2 100644
--- a/inference-engine/thirdparty/clDNN/kernel_selector/core/kernel_selector_common.h
+++ b/inference-engine/thirdparty/clDNN/kernel_selector/core/kernel_selector_common.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "kernel_selector_params.h"
-#include "cldnn/runtime/kernel_args.hpp"
+#include "intel_gpu/runtime/kernel_args.hpp"
 
 #include <cfloat>
 #include <cstdint>
diff --git a/inference-engine/thirdparty/clDNN/runtime/CMakeLists.txt b/inference-engine/thirdparty/clDNN/runtime/CMakeLists.txt
index 26d02fba2f7..30c8508d4bb 100644
--- a/inference-engine/thirdparty/clDNN/runtime/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/runtime/CMakeLists.txt
@@ -2,81 +2,56 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# =================================== Name / Output settings from parent ===============================
+set(TARGET_NAME "ov_intel_gpu_runtime")
 
-set(CLDNN_BUILD__PROJ             "cldnn_runtime")
-set(CLDNN_BUILD__PROJ_LABEL       "${CLDNN_BUILD__PROJ}")
-
-# ========================================= Source/Header files ========================================
-
-set(__CLDNN_Directory__main           "${CMAKE_CURRENT_SOURCE_DIR}")
-set(__CLDNN_Label__main                "")
-file(GLOB __CLDNN_Sources__main
-    "${__CLDNN_Directory__main}/*.h"
-    "${__CLDNN_Directory__main}/*.hpp"
-    "${__CLDNN_Directory__main}/*.cpp"
+file(GLOB LIBRARY_SOURCES_MAIN
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
   )
 
-file(GLOB __CLDNN_Sources__ocl
-    "${__CLDNN_Directory__main}/ocl/*.h"
-    "${__CLDNN_Directory__main}/ocl/*.hpp"
-    "${__CLDNN_Directory__main}/ocl/*.cpp"
+file(GLOB LIBRARY_SOURCES_OCL
+    "${CMAKE_CURRENT_SOURCE_DIR}/ocl/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ocl/*.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ocl/*.cpp"
 )
 
-set(__CLDNN_AllSources
-    ${__CLDNN_Sources__main}
-    ${__CLDNN_Sources__ocl}
+set(LIBRARY_SOURCES_ALL
+    ${LIBRARY_SOURCES_MAIN}
+    ${LIBRARY_SOURCES_OCL}
   )
 
-# =============================================== Filters ==============================================
+add_library(${TARGET_NAME} STATIC ${LIBRARY_SOURCES_ALL})
 
-source_group("${__CLDNN_Label__main}"             FILES ${__CLDNN_Sources__main})
+target_include_directories(${TARGET_NAME} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${INCLUDE_DIR}>)
 
-# ===================================== Include/Link directories =======================================
-
-include_directories(
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${__CLDNN_Directory__main}"
-    $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
-  )
-
-# =================================== Link targets and dependencies ====================================
-
-# Main static library.
-add_library("${CLDNN_BUILD__PROJ}" STATIC
-    ${__CLDNN_AllSources}
-  )
-
-target_compile_options("${CLDNN_BUILD__PROJ}" PRIVATE
+target_compile_options(${TARGET_NAME} PRIVATE
   $<$<CONFIG:Release>:$<IF:$<CXX_COMPILER_ID:MSVC>,/Os,-Os>>)
 
-set_property(TARGET "${CLDNN_BUILD__PROJ}" PROPERTY PROJECT_LABEL "${CLDNN_BUILD__PROJ_LABEL}")
-
 if(COMMAND add_cpplint_target)
-  add_cpplint_target("${CLDNN_BUILD__PROJ}_cpplint" FOR_TARGETS "${CLDNN_BUILD__PROJ}")
+  add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
 endif()
 
 if(COMMAND set_ie_threading_interface_for)
-  set_ie_threading_interface_for("${CLDNN_BUILD__PROJ}")
+  set_ie_threading_interface_for(${TARGET_NAME})
 endif()
 
-target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE
+target_link_libraries(${TARGET_NAME} PRIVATE
     OpenCL
     openvino::itt
+    inference_engine_plugin_api
   )
 
 if(ENABLE_ONEDNN_FOR_GPU)
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PUBLIC onednn_gpu_tgt)
+  target_link_libraries(${TARGET_NAME} PUBLIC onednn_gpu_tgt)
 endif()
 
 if(WIN32)
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE setupapi)
+  target_link_libraries(${TARGET_NAME} PRIVATE setupapi)
 elseif((NOT ANDROID) AND (UNIX))
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE pthread)
+  target_link_libraries(${TARGET_NAME} PRIVATE pthread)
 endif()
 
-target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE inference_engine)
-
-ov_install_static_lib("${CLDNN_BUILD__PROJ}" gpu)
-
-# ======================================================================================================
+ov_install_static_lib(${TARGET_NAME} gpu)
diff --git a/inference-engine/thirdparty/clDNN/runtime/debug_configuration.cpp b/inference-engine/thirdparty/clDNN/runtime/debug_configuration.cpp
index b8b4c357c7d..893cee58e56 100644
--- a/inference-engine/thirdparty/clDNN/runtime/debug_configuration.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/debug_configuration.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 #include <iostream>
 #include <memory>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/runtime/device_query.cpp b/inference-engine/thirdparty/clDNN/runtime/device_query.cpp
index 07e5cbe1f04..04a40736368 100644
--- a/inference-engine/thirdparty/clDNN/runtime/device_query.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/device_query.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/runtime/device_query.hpp"
+#include "intel_gpu/runtime/device_query.hpp"
 #include "ocl/ocl_device_detector.hpp"
 
 #include <map>
diff --git a/inference-engine/thirdparty/clDNN/runtime/engine.cpp b/inference-engine/thirdparty/clDNN/runtime/engine.cpp
index df15924c1c3..e4671f206ca 100644
--- a/inference-engine/thirdparty/clDNN/runtime/engine.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/engine.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/event.hpp"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/stream.hpp"
-#include "cldnn/runtime/device_query.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/event.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/stream.hpp"
+#include "intel_gpu/runtime/device_query.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include "ocl/ocl_engine_factory.hpp"
 
diff --git a/inference-engine/thirdparty/clDNN/runtime/event.cpp b/inference-engine/thirdparty/clDNN/runtime/event.cpp
index e443166632d..ee820484b2b 100644
--- a/inference-engine/thirdparty/clDNN/runtime/event.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/event.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/runtime/event.hpp"
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/event.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 
 #include <list>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/runtime/kernels_cache.cpp b/inference-engine/thirdparty/clDNN/runtime/kernels_cache.cpp
index b9943418e4c..65f228d06d8 100644
--- a/inference-engine/thirdparty/clDNN/runtime/kernels_cache.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/kernels_cache.cpp
@@ -5,7 +5,7 @@
 #include "kernels_factory.hpp"
 #include "kernels_cache.hpp"
 #include "ocl/ocl_engine.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include <algorithm>
 #include <cassert>
diff --git a/inference-engine/thirdparty/clDNN/runtime/kernels_cache.hpp b/inference-engine/thirdparty/clDNN/runtime/kernels_cache.hpp
index ce6f33348f4..21209b5d8c1 100644
--- a/inference-engine/thirdparty/clDNN/runtime/kernels_cache.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/kernels_cache.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/kernel.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/kernel.hpp"
 
 #include <map>
 #include <mutex>
diff --git a/inference-engine/thirdparty/clDNN/runtime/kernels_factory.hpp b/inference-engine/thirdparty/clDNN/runtime/kernels_factory.hpp
index b3d03defcb2..baa03bd1e18 100644
--- a/inference-engine/thirdparty/clDNN/runtime/kernels_factory.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/kernels_factory.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/kernel.hpp"
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/kernel.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 #include "ocl/ocl_common.hpp"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/runtime/memory.cpp b/inference-engine/thirdparty/clDNN/runtime/memory.cpp
index b3510ca1b6f..28af640a4e3 100644
--- a/inference-engine/thirdparty/clDNN/runtime/memory.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/memory.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/stream.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/stream.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include "ocl/ocl_memory.hpp"
 
diff --git a/inference-engine/thirdparty/clDNN/runtime/memory_pool.cpp b/inference-engine/thirdparty/clDNN/runtime/memory_pool.cpp
index 30863de6aae..c257bff32dd 100644
--- a/inference-engine/thirdparty/clDNN/runtime/memory_pool.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/memory_pool.cpp
@@ -6,10 +6,10 @@
 #include <fstream>
 #include <vector>
 
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/memory_pool.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/memory_pool.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include <list>
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_base_event.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_base_event.hpp
index e34be492173..da13aed2a0c 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_base_event.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_base_event.hpp
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "ocl_common.hpp"
-#include "cldnn/runtime/event.hpp"
-#include "cldnn/runtime/utils.hpp"
+#include "intel_gpu/runtime/event.hpp"
+#include "intel_gpu/runtime/utils.hpp"
 
 #include <vector>
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.cpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.cpp
index b77eb023696..07f865a5ac5 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "ocl_command_queues_builder.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include <string>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.hpp
index 24d98302867..90619e3fb9b 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_command_queues_builder.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "ocl_common.hpp"
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.cpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.cpp
index 130f57e4436..4b0cc9e8e55 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.cpp
@@ -4,7 +4,7 @@
 
 #include "ocl_device.hpp"
 #include "ocl_common.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include <map>
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.hpp
index e68a6078490..700b5a2640f 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/device.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/device.hpp"
 #include "ocl_common.hpp"
 
 #include <map>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device_detector.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device_detector.hpp
index 81cf6d8836c..8d6b6741737 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device_detector.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_device_detector.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "cldnn/runtime/device.hpp"
+#include "intel_gpu/runtime/device.hpp"
 
 #include <list>
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine.hpp
index 49353ffcc2b..0ff4605a975 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/stream.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/stream.hpp"
 #include "ocl_device.hpp"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine_factory.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine_factory.hpp
index bcdd7cea720..ead0f167adf 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine_factory.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_engine_factory.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "cldnn/runtime/device.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/stream.hpp"
+#include "intel_gpu/runtime/device.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/stream.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_event.cpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_event.cpp
index c822bbbcef7..c5b7d4d6244 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_event.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_event.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "ocl_event.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include <cassert>
 #include <iostream>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_kernel.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_kernel.hpp
index 4bda3ef8f31..c37fba792bf 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_kernel.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_kernel.hpp
@@ -6,8 +6,8 @@
 
 #include "ocl_common.hpp"
 #include "ocl_memory.hpp"
-#include "cldnn/runtime/kernel_args.hpp"
-#include "cldnn/runtime/kernel.hpp"
+#include "intel_gpu/runtime/kernel_args.hpp"
+#include "intel_gpu/runtime/kernel.hpp"
 
 #include <memory>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.cpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.cpp
index 3bd44357aa4..04ed183221d 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/runtime/utils.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/utils.hpp"
 #include "ocl_memory.hpp"
 #include "ocl_engine.hpp"
 #include "ocl_stream.hpp"
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.hpp
index fa89bf42eb2..f57a5dec955 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_memory.hpp
@@ -7,7 +7,7 @@
 #include "ocl_common.hpp"
 #include "ocl_engine.hpp"
 #include "ocl_stream.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 
 #include <cassert>
 #include <iterator>
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_stream.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_stream.hpp
index bd5c9e93fe2..a7463ffa493 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_stream.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_stream.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/event.hpp"
-#include "cldnn/runtime/stream.hpp"
+#include "intel_gpu/runtime/event.hpp"
+#include "intel_gpu/runtime/stream.hpp"
 #include "ocl_common.hpp"
 #include "ocl_engine.hpp"
 
diff --git a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_user_event.hpp b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_user_event.hpp
index a2388d49fa0..0e4dbfb4b3b 100644
--- a/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_user_event.hpp
+++ b/inference-engine/thirdparty/clDNN/runtime/ocl/ocl_user_event.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "cldnn/runtime/profiling.hpp"
+#include "intel_gpu/runtime/profiling.hpp"
 #include "ocl_base_event.hpp"
 #include <memory>
 #include <list>
diff --git a/inference-engine/thirdparty/clDNN/runtime/stream.cpp b/inference-engine/thirdparty/clDNN/runtime/stream.cpp
index 5780d5d1631..38d60103f67 100644
--- a/inference-engine/thirdparty/clDNN/runtime/stream.cpp
+++ b/inference-engine/thirdparty/clDNN/runtime/stream.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/runtime/stream.hpp"
+#include "intel_gpu/runtime/stream.hpp"
 
 #include "ocl/ocl_stream.hpp"
 
diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
index 1da07e6055e..f4d66f8872e 100644
--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
@@ -2,150 +2,63 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# =================================== Name / Output settings from parent ===============================
+set(TARGET_NAME "ov_intel_gpu_graph")
 
-set(CLDNN_BUILD__PROJ             "${CLDNN_BUILD__PROJ__clDNN}")
-set(CLDNN_BUILD__PROJ_LABEL       "${CLDNN_BUILD__PROJ_LABEL__clDNN}")
-
-# ========================================= Source/Header files ========================================
-
-set(__CLDNN_Label__api                 "api")
-file(GLOB_RECURSE __CLDNN_Headers__api
-    "${CLDNN__API_DIR}/*.h"
-    "${CLDNN__API_DIR}/*.hpp"
-  )
-
-set(__CLDNN_Label__main                "")
-file(GLOB __CLDNN_Sources__main
+file(GLOB_RECURSE LIBRARY_SRC
+    "${INCLUDE_DIR}/*.h"
+    "${INCLUDE_DIR}/*.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
   )
 
-set(__CLDNN_Directory__graph_opt       "${CMAKE_CURRENT_SOURCE_DIR}/graph_optimizer")
-set(__CLDNN_Label__graph_opt           "graph_optimizer")
-file(GLOB __CLDNN_Sources__graph_opt
-    "${__CLDNN_Directory__graph_opt}/*.h"
-    "${__CLDNN_Directory__graph_opt}/*.hpp"
-    "${__CLDNN_Directory__graph_opt}/*.cpp"
-  )
-
-set(__CLDNN_Directory__include         "${CMAKE_CURRENT_SOURCE_DIR}/include")
-set(__CLDNN_Label__include             "include")
-file(GLOB __CLDNN_Headers__include
-    "${__CLDNN_Directory__include}/*.h"
-    "${__CLDNN_Directory__include}/*.hpp"
-  )
-
-set(__CLDNN_Directory__impls             "${CMAKE_CURRENT_SOURCE_DIR}/impls")
-set(__CLDNN_Label__gpu                 "impls")
-file(GLOB __CLDNN_Sources__gpu
-    "${__CLDNN_Directory__impls}/common/*.hpp"
-    "${__CLDNN_Directory__impls}/common/*.cpp"
-    "${__CLDNN_Directory__impls}/cpu/*.hpp"
-    "${__CLDNN_Directory__impls}/cpu/*.cpp"
-    "${__CLDNN_Directory__impls}/ocl/*.hpp"
-    "${__CLDNN_Directory__impls}/ocl/*.cpp"
-  )
-
-if (ENABLE_ONEDNN_FOR_GPU)
-  file(GLOB __CLDNN_Sources__onednn
-      "${__CLDNN_Directory__impls}/onednn/*.hpp"
-      "${__CLDNN_Directory__impls}/onednn/*.cpp"
-    )
-  list(APPEND __CLDNN_Sources__gpu ${__CLDNN_Sources__onednn})
+if (NOT ENABLE_ONEDNN_FOR_GPU)
+    set(EXCLUDE_DIR "/onednn/")
+    foreach (SOURCE_FILE ${LIBRARY_SRC})
+        string (FIND ${SOURCE_FILE} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
+        if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
+            list (REMOVE_ITEM LIBRARY_SRC ${SOURCE_FILE})
+        endif ()
+    endforeach(SOURCE_FILE)
 endif()
 
-set(__CLDNN_Directory__cg_cache        "${CLDNN__CODEGEN_INCDIR}")
-set(__CLDNN_CGDirectory__cg_cache      "${CLDNN__CODEGEN_DIR}/cache")
-set(__CLDNN_Label__cg_cache            "${__CLDNN_Label__cache}\\codegen")
+add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC})
 
-set(__CLDNN_Directory__ks_main           "${CLDNN__KERNEL_SELECTOR_DIR}")
-set(__CLDNN_Directory__ks_core           "${CLDNN__KERNEL_SELECTOR_DIR}/core")
-set(__CLDNN_Directory__ks_common         "${CLDNN__KERNEL_SELECTOR_DIR}/common")
-set(__CLDNN_Directory__ks_core_common    "${__CLDNN_Directory__ks_core}/common")
-set(__CLDNN_Directory__ks_actual_kernels "${__CLDNN_Directory__ks_core}/actual_kernels")
-set(__CLDNN_Directory__ks_cache          "${__CLDNN_Directory__ks_core}/cache")
+target_include_directories(${TARGET_NAME} PUBLIC
+                                          $<BUILD_INTERFACE:${MAIN_DIR}>
+                                          $<BUILD_INTERFACE:${INCLUDE_DIR}>
+                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                                          $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/>)
 
-set(__CLDNN_AllSources
-    ${__CLDNN_Headers__api}
-    ${__CLDNN_Sources__graph_opt}
-    ${__CLDNN_Headers__include}
-    ${__CLDNN_Sources__main}
-    ${__CLDNN_Sources__gpu}
-    ${__CLDNN_Sources__cache}
-    ${__CLDNN_Sources__ch_kernels}
-    ${__CLDNN_Sources__cg_cache}
-  )
-# Helping with some generators.
-set_property(SOURCE ${__CLDNN_Sources__cg_cache} PROPERTY GENERATED TRUE)
-
-# =============================================== Filters ==============================================
-
-source_group("${__CLDNN_Label__api}"                  FILES ${__CLDNN_Headers__api})
-source_group("${__CLDNN_Label__include}"              FILES ${__CLDNN_Headers__include})
-source_group("${__CLDNN_Label__graph_opt}"            FILES ${__CLDNN_Sources__graph_opt})
-source_group("${__CLDNN_Label__main}"                 FILES ${__CLDNN_Sources__main})
-source_group("${__CLDNN_Label__gpu}"                  FILES ${__CLDNN_Sources__gpu})
-source_group("${__CLDNN_Label__cache}"                FILES ${__CLDNN_Sources__cache})
-source_group("${__CLDNN_Label__ch_kernels}"           FILES ${__CLDNN_Sources__ch_kernels})
-source_group("${__CLDNN_Label__cg_cache}"             FILES ${__CLDNN_Sources__cg_cache})
-
-# ===================================== Include/Link directories =======================================
-
-include_directories(
-    "${CLDNN__MAIN_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${CLDNN__RUNTIME_DIR}"
-    "${__CLDNN_Directory__include}"
-    "${__CLDNN_Directory__ks_core}"
-    "${__CLDNN_Directory__ks_core}/common"
-    "${__CLDNN_Directory__ks_actual_kernels}"
-    "${__CLDNN_Directory__ks_common}"
-  )
-
-# =================================== Link targets and dependencies ====================================
-
-# Main static library.
-add_library("${CLDNN_BUILD__PROJ}" STATIC
-    ${__CLDNN_AllSources}
-  )
-
-target_compile_options("${CLDNN_BUILD__PROJ}" PRIVATE
+target_compile_options(${TARGET_NAME} PRIVATE
   $<$<CONFIG:Release>:$<IF:$<CXX_COMPILER_ID:MSVC>,/Os,-Os>>)
 
-set_property(TARGET "${CLDNN_BUILD__PROJ}" PROPERTY PROJECT_LABEL "${CLDNN_BUILD__PROJ_LABEL}")
-
-target_link_libraries("${CLDNN_BUILD__PROJ}" PUBLIC
-    OpenCL
-  )
-
-target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE
-    cldnn_kernel_selector
-    openvino::itt
-    cldnn_runtime
-)
+target_link_libraries(${TARGET_NAME} PUBLIC OpenCL)
+target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_kernels
+                                             ov_intel_gpu_runtime
+                                             openvino::itt
+                                             inference_engine_plugin_api
+                                             inference_engine)
 
 if(ENABLE_ONEDNN_FOR_GPU)
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PUBLIC onednn_gpu_tgt)
+    target_link_libraries(${TARGET_NAME} PUBLIC onednn_gpu_tgt)
 endif()
 
 if(COMMAND add_cpplint_target)
-  add_cpplint_target("${CLDNN_BUILD__PROJ}_cpplint" FOR_TARGETS "${CLDNN_BUILD__PROJ}")
+  add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
 endif()
 
 if(COMMAND set_ie_threading_interface_for)
-  set_ie_threading_interface_for("${CLDNN_BUILD__PROJ}")
+  set_ie_threading_interface_for(${TARGET_NAME})
 endif()
 
 if(WIN32)
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE setupapi)
+  target_link_libraries(${TARGET_NAME} PRIVATE setupapi)
 elseif((NOT ANDROID) AND (UNIX))
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE pthread)
+  target_link_libraries(${TARGET_NAME} PRIVATE pthread)
 endif()
 
-# ======================================================================================================
+ov_install_static_lib(${TARGET_NAME} gpu)
 
 ie_sse42_optimization_flags(sse4_2_flags)
-set_source_files_properties(impls/cpu/detection_output.cpp half.cpp
-  PROPERTIES COMPILE_FLAGS "${sse4_2_flags}")
+set_source_files_properties(impls/cpu/detection_output.cpp half.cpp PROPERTIES COMPILE_FLAGS "${sse4_2_flags}")
diff --git a/inference-engine/thirdparty/clDNN/src/activation.cpp b/inference-engine/thirdparty/clDNN/src/activation.cpp
index b1c478fd3a0..e38a7901e1e 100644
--- a/inference-engine/thirdparty/clDNN/src/activation.cpp
+++ b/inference-engine/thirdparty/clDNN/src/activation.cpp
@@ -4,7 +4,7 @@
 
 #include "activation_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/arg_max_min.cpp b/inference-engine/thirdparty/clDNN/src/arg_max_min.cpp
index a264d8f9ff0..c3ba6b70b0b 100644
--- a/inference-engine/thirdparty/clDNN/src/arg_max_min.cpp
+++ b/inference-engine/thirdparty/clDNN/src/arg_max_min.cpp
@@ -5,7 +5,7 @@
 #include "arg_max_min_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <limits>
diff --git a/inference-engine/thirdparty/clDNN/src/average_unpooling.cpp b/inference-engine/thirdparty/clDNN/src/average_unpooling.cpp
index 121269847c9..9c481ccca0e 100644
--- a/inference-engine/thirdparty/clDNN/src/average_unpooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/average_unpooling.cpp
@@ -5,7 +5,7 @@
 #include "average_unpooling_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/batch_to_space.cpp b/inference-engine/thirdparty/clDNN/src/batch_to_space.cpp
index bfa50bf8115..4107de52c7b 100644
--- a/inference-engine/thirdparty/clDNN/src/batch_to_space.cpp
+++ b/inference-engine/thirdparty/clDNN/src/batch_to_space.cpp
@@ -5,7 +5,7 @@
 #include "batch_to_space_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "data_inst.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/binary_convolution.cpp b/inference-engine/thirdparty/clDNN/src/binary_convolution.cpp
index 9e0320f8a9a..d10ee575a93 100644
--- a/inference-engine/thirdparty/clDNN/src/binary_convolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/binary_convolution.cpp
@@ -8,7 +8,7 @@
 #include "reorder_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/border.cpp b/inference-engine/thirdparty/clDNN/src/border.cpp
index 478acf99fb8..76a4c41484d 100644
--- a/inference-engine/thirdparty/clDNN/src/border.cpp
+++ b/inference-engine/thirdparty/clDNN/src/border.cpp
@@ -4,7 +4,7 @@
 
 #include "border_inst.h"
 
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "primitive_type_base.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/broadcast.cpp b/inference-engine/thirdparty/clDNN/src/broadcast.cpp
index f3d97a27ff8..586c3243bf3 100644
--- a/inference-engine/thirdparty/clDNN/src/broadcast.cpp
+++ b/inference-engine/thirdparty/clDNN/src/broadcast.cpp
@@ -4,7 +4,7 @@
 
 #include "broadcast_inst.h"
 
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "primitive_type_base.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/concatenation.cpp b/inference-engine/thirdparty/clDNN/src/concatenation.cpp
index 253ff0812e0..14b8b627dff 100644
--- a/inference-engine/thirdparty/clDNN/src/concatenation.cpp
+++ b/inference-engine/thirdparty/clDNN/src/concatenation.cpp
@@ -4,7 +4,7 @@
 
 #include "concatenation_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/condition.cpp b/inference-engine/thirdparty/clDNN/src/condition.cpp
index 0b7d2ecc8bb..8ffd84c1292 100644
--- a/inference-engine/thirdparty/clDNN/src/condition.cpp
+++ b/inference-engine/thirdparty/clDNN/src/condition.cpp
@@ -4,7 +4,7 @@
 
 #include "condition_inst.h"
 
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "primitive_type_base.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/convolution.cpp b/inference-engine/thirdparty/clDNN/src/convolution.cpp
index 3b4a43b1910..0c478a0da6c 100644
--- a/inference-engine/thirdparty/clDNN/src/convolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/convolution.cpp
@@ -7,7 +7,7 @@
 #include "convolution_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/crop.cpp b/inference-engine/thirdparty/clDNN/src/crop.cpp
index fe45ed3baf8..a595e596ae8 100644
--- a/inference-engine/thirdparty/clDNN/src/crop.cpp
+++ b/inference-engine/thirdparty/clDNN/src/crop.cpp
@@ -4,8 +4,8 @@
 
 #include "crop_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/cum_sum.cpp b/inference-engine/thirdparty/clDNN/src/cum_sum.cpp
index c04685f4314..52c94517d46 100644
--- a/inference-engine/thirdparty/clDNN/src/cum_sum.cpp
+++ b/inference-engine/thirdparty/clDNN/src/cum_sum.cpp
@@ -5,7 +5,7 @@
 #include "cum_sum_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/data.cpp b/inference-engine/thirdparty/clDNN/src/data.cpp
index 368e96b0feb..434885cdb0d 100644
--- a/inference-engine/thirdparty/clDNN/src/data.cpp
+++ b/inference-engine/thirdparty/clDNN/src/data.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "data_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 
 #include "json_object.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/deconvolution.cpp b/inference-engine/thirdparty/clDNN/src/deconvolution.cpp
index c4f6331b152..c506c77d058 100644
--- a/inference-engine/thirdparty/clDNN/src/deconvolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/deconvolution.cpp
@@ -6,7 +6,7 @@
 #include "deconvolution_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/deformable_convolution.cpp b/inference-engine/thirdparty/clDNN/src/deformable_convolution.cpp
index 2477ba55e5e..a77ec5160a7 100644
--- a/inference-engine/thirdparty/clDNN/src/deformable_convolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/deformable_convolution.cpp
@@ -6,7 +6,7 @@
 #include "deformable_convolution_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/depth_to_space.cpp b/inference-engine/thirdparty/clDNN/src/depth_to_space.cpp
index 8e329a818c8..8394fa22b51 100644
--- a/inference-engine/thirdparty/clDNN/src/depth_to_space.cpp
+++ b/inference-engine/thirdparty/clDNN/src/depth_to_space.cpp
@@ -5,7 +5,7 @@
 #include "depth_to_space_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/detection_output.cpp b/inference-engine/thirdparty/clDNN/src/detection_output.cpp
index fab8a936de6..eff033f0144 100644
--- a/inference-engine/thirdparty/clDNN/src/detection_output.cpp
+++ b/inference-engine/thirdparty/clDNN/src/detection_output.cpp
@@ -4,7 +4,7 @@
 
 #include "detection_output_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/eltwise.cpp b/inference-engine/thirdparty/clDNN/src/eltwise.cpp
index a5986521060..76506e9ce5f 100644
--- a/inference-engine/thirdparty/clDNN/src/eltwise.cpp
+++ b/inference-engine/thirdparty/clDNN/src/eltwise.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "eltwise_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/embedding_bag.cpp b/inference-engine/thirdparty/clDNN/src/embedding_bag.cpp
index a2a51a583f5..b147b73acc6 100644
--- a/inference-engine/thirdparty/clDNN/src/embedding_bag.cpp
+++ b/inference-engine/thirdparty/clDNN/src/embedding_bag.cpp
@@ -5,7 +5,7 @@
 #include "embedding_bag_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/error_handler.cpp b/inference-engine/thirdparty/clDNN/src/error_handler.cpp
index bb7ce522412..8f6df94b3e8 100644
--- a/inference-engine/thirdparty/clDNN/src/error_handler.cpp
+++ b/inference-engine/thirdparty/clDNN/src/error_handler.cpp
@@ -3,7 +3,7 @@
 //
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include <string>
 #include <vector>
 
diff --git a/inference-engine/thirdparty/clDNN/src/experimental_detectron_roi_feature_extractor.cpp b/inference-engine/thirdparty/clDNN/src/experimental_detectron_roi_feature_extractor.cpp
index e06eb88606c..e2c8e304532 100644
--- a/inference-engine/thirdparty/clDNN/src/experimental_detectron_roi_feature_extractor.cpp
+++ b/inference-engine/thirdparty/clDNN/src/experimental_detectron_roi_feature_extractor.cpp
@@ -4,7 +4,7 @@
 
 #include "experimental_detectron_roi_feature_extractor_inst.hpp"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/extract_image_patches.cpp b/inference-engine/thirdparty/clDNN/src/extract_image_patches.cpp
index 8e7c067aa11..e17dc426e4d 100644
--- a/inference-engine/thirdparty/clDNN/src/extract_image_patches.cpp
+++ b/inference-engine/thirdparty/clDNN/src/extract_image_patches.cpp
@@ -5,7 +5,7 @@
 #include "extract_image_patches_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/fully_connected.cpp b/inference-engine/thirdparty/clDNN/src/fully_connected.cpp
index c90cbf0afe3..62dbd1635a7 100644
--- a/inference-engine/thirdparty/clDNN/src/fully_connected.cpp
+++ b/inference-engine/thirdparty/clDNN/src/fully_connected.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "fully_connected_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/gather.cpp b/inference-engine/thirdparty/clDNN/src/gather.cpp
index a8f0d2f97e9..30e1dfd791b 100644
--- a/inference-engine/thirdparty/clDNN/src/gather.cpp
+++ b/inference-engine/thirdparty/clDNN/src/gather.cpp
@@ -5,7 +5,7 @@
 #include "gather_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/gather_elements.cpp b/inference-engine/thirdparty/clDNN/src/gather_elements.cpp
index 74daa47115d..df3f2e11a2e 100644
--- a/inference-engine/thirdparty/clDNN/src/gather_elements.cpp
+++ b/inference-engine/thirdparty/clDNN/src/gather_elements.cpp
@@ -5,7 +5,7 @@
 #include "gather_elements_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/gather_nd.cpp b/inference-engine/thirdparty/clDNN/src/gather_nd.cpp
index 01b664e1995..a379f0576d9 100644
--- a/inference-engine/thirdparty/clDNN/src/gather_nd.cpp
+++ b/inference-engine/thirdparty/clDNN/src/gather_nd.cpp
@@ -5,7 +5,7 @@
 #include "gather_nd_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/gather_tree.cpp b/inference-engine/thirdparty/clDNN/src/gather_tree.cpp
index d26bd44187f..814091e42f6 100644
--- a/inference-engine/thirdparty/clDNN/src/gather_tree.cpp
+++ b/inference-engine/thirdparty/clDNN/src/gather_tree.cpp
@@ -4,7 +4,7 @@
 
 #include "gather_tree_inst.h"
 
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "primitive_type_base.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/gemm.cpp b/inference-engine/thirdparty/clDNN/src/gemm.cpp
index 9c2cbeabf0c..07114ed5932 100644
--- a/inference-engine/thirdparty/clDNN/src/gemm.cpp
+++ b/inference-engine/thirdparty/clDNN/src/gemm.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "gemm_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <utility>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/basic_memory_dependencies.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/basic_memory_dependencies.cpp
index 306c16b58e8..c2d98a0e6f0 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/basic_memory_dependencies.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/basic_memory_dependencies.cpp
@@ -7,7 +7,7 @@
 #include "pass_manager.h"
 #include "program_node.h"
 #include "layout_optimizer.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "program_helpers.h"
 #include "runtime/cldnn_itt.hpp"
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/calculate_prior_boxes.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/calculate_prior_boxes.cpp
index 73aa0cc34f1..81942360c6f 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/calculate_prior_boxes.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/calculate_prior_boxes.cpp
@@ -7,7 +7,7 @@
 #include "pass_manager.h"
 #include "prior_box_inst.h"
 #include "program_node.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include <memory>
 
 using namespace cldnn;
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/compile_graph.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/compile_graph.cpp
index 4dac88c97d9..3f46a445a3d 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/compile_graph.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/compile_graph.cpp
@@ -8,7 +8,7 @@
 #include "data_inst.h"
 #include "mutable_data_inst.h"
 #include "program_node.h"
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 #include "runtime/cldnn_itt.hpp"
 #include <iostream>
 #include <cmath>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/concat_input_order.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/concat_input_order.cpp
index bd1055cdd6a..5831be56dda 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/concat_input_order.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/concat_input_order.cpp
@@ -9,8 +9,8 @@
 #include "convolution_inst.h"
 #include "fully_connected_inst.h"
 #include "data_inst.h"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/graph/program.hpp"
 
 #include <vector>
 #include <tuple>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/eltwise_remove_stride.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/eltwise_remove_stride.cpp
index dd8b3cdfe87..c0b52e05c56 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/eltwise_remove_stride.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/eltwise_remove_stride.cpp
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "cldnn/runtime/tensor.hpp"
+#include "intel_gpu/runtime/tensor.hpp"
 
 #include "pass_manager.h"
 
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/handle_input_padding.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/handle_input_padding.cpp
index e29dabcfeb5..51476e643b1 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/handle_input_padding.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/handle_input_padding.cpp
@@ -7,7 +7,7 @@
 #include "pass_manager.h"
 #include "border_inst.h"
 #include "convolution_inst.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include <memory>
 
 using namespace cldnn;
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/mark_nodes.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/mark_nodes.cpp
index 9621e31b3a0..e9c2f711c43 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/mark_nodes.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/mark_nodes.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "pass_manager.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/oooq_memory_dependencies.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/oooq_memory_dependencies.cpp
index 248b9b7e57a..dbf1819400f 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/oooq_memory_dependencies.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/oooq_memory_dependencies.cpp
@@ -7,7 +7,7 @@
 #include "pass_manager.h"
 #include "program_node.h"
 #include "layout_optimizer.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "program_helpers.h"
 #include "runtime/cldnn_itt.hpp"
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_optimize_bias.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_optimize_bias.cpp
index 1a27c30d617..738cdc29737 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_optimize_bias.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_optimize_bias.cpp
@@ -7,7 +7,7 @@
 #include "pass_manager.h"
 #include "program_node.h"
 #include "layout_optimizer.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "program_helpers.h"
 #include "fully_connected_inst.h"
 
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_replace_deconv.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_replace_deconv.cpp
index 1d95823d426..65cee07e14f 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_replace_deconv.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/pre_replace_deconv.cpp
@@ -16,7 +16,7 @@
 #include <memory>
 #include <string>
 #include <utility>
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 void pre_replace_deconv::run(program& p) {
     bool update_processing_order = false;
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_primitive_fusing.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_primitive_fusing.cpp
index 11684215433..ae3f15469f4 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_primitive_fusing.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_primitive_fusing.cpp
@@ -50,7 +50,7 @@
 #include <string>
 #include <utility>
 #include <deque>
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 void prepare_primitive_fusing::run(program& p) {
     fuse_reorders(p);
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_quantization.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_quantization.cpp
index ff4298dcec9..e3cc68e5152 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_quantization.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/prepare_quantization.cpp
@@ -15,7 +15,7 @@
 #include "pass_manager.h"
 #include "program_helpers.h"
 #include "to_string_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 #include <algorithm>
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/propagate_constants.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/propagate_constants.cpp
index ad78e700f49..b92c868f67a 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/propagate_constants.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/propagate_constants.cpp
@@ -6,9 +6,9 @@
 
 #include "pass_manager.h"
 #include "program_node.h"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/graph/program.hpp"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/graph/program.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "data_inst.h"
 #include "runtime/cldnn_itt.hpp"
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/reorder_inputs.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/reorder_inputs.cpp
index 9058231933b..f0869e06b2a 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/reorder_inputs.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/reorder_inputs.cpp
@@ -7,8 +7,8 @@
 #include "pass_manager.h"
 #include "program_node.h"
 #include "layout_optimizer.h"
-#include "cldnn/graph/program.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/graph/program.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 #include "program_helpers.h"
 #include "binary_convolution_inst.h"
 #include "mvn_inst.h"
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/skipped_branch_memory_dependencies.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/skipped_branch_memory_dependencies.cpp
index 73cd13d2177..1347f2ee375 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/skipped_branch_memory_dependencies.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/skipped_branch_memory_dependencies.cpp
@@ -7,7 +7,7 @@
 #include "pass_manager.h"
 #include "program_node.h"
 #include "layout_optimizer.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "program_helpers.h"
 #include "runtime/cldnn_itt.hpp"
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/graph_optimizer/strided_slice_optimize.cpp b/inference-engine/thirdparty/clDNN/src/graph_optimizer/strided_slice_optimize.cpp
index 9ea65a9b3e5..96934c0ac46 100644
--- a/inference-engine/thirdparty/clDNN/src/graph_optimizer/strided_slice_optimize.cpp
+++ b/inference-engine/thirdparty/clDNN/src/graph_optimizer/strided_slice_optimize.cpp
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "pass_manager.h"
 #include "program_helpers.h"
 #include "strided_slice_inst.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/common/register.hpp b/inference-engine/thirdparty/clDNN/src/impls/common/register.hpp
index d2d13ed3902..67b6e95c030 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/common/register.hpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/common/register.hpp
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "cldnn/primitives/condition.hpp"
-#include "cldnn/primitives/loop.hpp"
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/primitives/input_layout.hpp"
-#include "cldnn/primitives/prior_box.hpp"
+#include "intel_gpu/primitives/condition.hpp"
+#include "intel_gpu/primitives/loop.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/primitives/input_layout.hpp"
+#include "intel_gpu/primitives/prior_box.hpp"
 
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/cpu/proposal.cpp b/inference-engine/thirdparty/clDNN/src/impls/cpu/proposal.cpp
index 3887f1f500f..2141ad6a6a7 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/cpu/proposal.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/cpu/proposal.cpp
@@ -3,9 +3,9 @@
 //
 
 #include "proposal_inst.h"
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "register.hpp"
 
 #include <algorithm>
diff --git a/inference-engine/thirdparty/clDNN/src/impls/cpu/register.hpp b/inference-engine/thirdparty/clDNN/src/impls/cpu/register.hpp
index c8f9319895e..cd3e0ba8ccb 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/cpu/register.hpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/cpu/register.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "cldnn/primitives/detection_output.hpp"
-#include "cldnn/primitives/proposal.hpp"
-#include "cldnn/primitives/non_max_suppression.hpp"
+#include "intel_gpu/primitives/detection_output.hpp"
+#include "intel_gpu/primitives/proposal.hpp"
+#include "intel_gpu/primitives/non_max_suppression.hpp"
 
 namespace cldnn {
 namespace cpu {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/activation.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/activation.cpp
index 37124b87e54..a6d96dd6db5 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/activation.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/activation.cpp
@@ -5,7 +5,7 @@
 #include "activation_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "activation/activation_kernel_selector.h"
 #include "activation/activation_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/arg_max_min.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/arg_max_min.cpp
index 42506385954..2068b3eb840 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/arg_max_min.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/arg_max_min.cpp
@@ -5,7 +5,7 @@
 #include "arg_max_min_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "arg_max_min/arg_max_min_kernel_selector.h"
 #include "arg_max_min/arg_max_min_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/average_unpooling.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/average_unpooling.cpp
index ab4728bb7ab..df2411109a7 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/average_unpooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/average_unpooling.cpp
@@ -5,7 +5,7 @@
 #include "average_unpooling_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "average_unpooling/average_unpooling_kernel_selector.h"
 #include "average_unpooling/average_unpooling_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/batch_to_space.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/batch_to_space.cpp
index 55c860b5883..8e160d65971 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/batch_to_space.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/batch_to_space.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "batch_to_space/batch_to_space_kernel_selector.h"
 #include "batch_to_space/batch_to_space_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "data_inst.h"
 #include <vector>
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/binary_convolution.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/binary_convolution.cpp
index 70ed417db6a..c9500edbbf0 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/binary_convolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/binary_convolution.cpp
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/primitives/scale.hpp"
-#include "cldnn/primitives/quantize.hpp"
+#include "intel_gpu/primitives/scale.hpp"
+#include "intel_gpu/primitives/quantize.hpp"
 #include "binary_convolution_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "kernel_runner.h"
 #include "kernel_selector/core/actual_kernels/binary_convolution/binary_convolution_kernel_selector.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/border.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/border.cpp
index c95189ea099..02a3d1657f5 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/border.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/border.cpp
@@ -9,7 +9,7 @@
 #include "kernel_selector_helper.h"
 #include "border/border_kernel_selector.h"
 #include "border/border_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/broadcast.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/broadcast.cpp
index 170ef56b10f..4acdbaece39 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/broadcast.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/broadcast.cpp
@@ -9,7 +9,7 @@
 #include "kernel_selector_helper.h"
 #include "broadcast/broadcast_kernel_selector.h"
 #include "broadcast/broadcast_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/concatenation.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/concatenation.cpp
index 3897185b3cd..ad88386cb8d 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/concatenation.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/concatenation.cpp
@@ -5,7 +5,7 @@
 #include "concatenation_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "concatenation/concatenation_kernel_selector.h"
 #include "concatenation/concatenation_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/convolution.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/convolution.cpp
index ff96abd67f5..a0c8a0874a1 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/convolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/convolution.cpp
@@ -6,7 +6,7 @@
 #include "eltwise_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "kernel_runner.h"
 #include "convolution/convolution_kernel_selector.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/crop.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/crop.cpp
index f170d07307e..2ab916606e4 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/crop.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/crop.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "eltwise/eltwise_kernel_selector.h"
 #include "eltwise/eltwise_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/ctc_greedy_decoder.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/ctc_greedy_decoder.cpp
index 4eb4779a805..ce453587596 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/ctc_greedy_decoder.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/ctc_greedy_decoder.cpp
@@ -5,7 +5,7 @@
 #include "ctc_greedy_decoder_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "ctc_greedy_decoder/ctc_greedy_decoder_kernel_selector.h"
 #include "ctc_greedy_decoder/ctc_greedy_decoder_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/cum_sum.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/cum_sum.cpp
index c62649499f8..21f9b353559 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/cum_sum.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/cum_sum.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "cum_sum/cum_sum_kernel_selector.h"
 #include "cum_sum/cum_sum_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/custom_primitive.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/custom_primitive.cpp
index 0a574125a12..edca1356f0d 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/custom_primitive.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/custom_primitive.cpp
@@ -3,11 +3,11 @@
 //
 
 #include "custom_gpu_primitive_inst.h"
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 #include "impls/implementation_map.hpp"
 #include "kernel_selector_helper.h"
 #include "jitter.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "register.hpp"
 
 #include <map>
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/deconvolution.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/deconvolution.cpp
index b2101e13ff8..60bb284c0b6 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/deconvolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/deconvolution.cpp
@@ -5,7 +5,7 @@
 #include "deconvolution_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "deconvolution/deconvolution_kernel_selector.h"
 #include "deconvolution/deconvolution_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/deformable_convolution.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/deformable_convolution.cpp
index 18460e4af0c..b9b31c012df 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/deformable_convolution.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/deformable_convolution.cpp
@@ -5,7 +5,7 @@
 #include "deformable_convolution_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "kernel_runner.h"
 #include "convolution/convolution_kernel_selector.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/depth_to_space.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/depth_to_space.cpp
index 710ee9ab691..153e0c77c9e 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/depth_to_space.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/depth_to_space.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "depth_to_space/depth_to_space_kernel_selector.h"
 #include "depth_to_space/depth_to_space_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "common_types.h"
 
 using namespace cldnn;
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/detection_output.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/detection_output.cpp
index e4ffde3ff76..b5b54124e2b 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/detection_output.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/detection_output.cpp
@@ -5,7 +5,7 @@
 #include "detection_output_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "detection_output/detection_output_kernel_selector.h"
 #include "detection_output/detection_output_kernel_ref.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/eltwise.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/eltwise.cpp
index 4df57b30d16..3e8c233e126 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/eltwise.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/eltwise.cpp
@@ -5,7 +5,7 @@
 #include "eltwise_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "eltwise/eltwise_kernel_selector.h"
 #include "eltwise/eltwise_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/embedding_bag.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/embedding_bag.cpp
index 0756a622d91..55ac3b3f2d6 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/embedding_bag.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/embedding_bag.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "embedding_bag/embedding_bag_kernel_selector.h"
 #include "embedding_bag/embedding_bag_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "data_inst.h"
 
 using namespace cldnn;
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/experimental_detectron_roi_feature_extractor.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/experimental_detectron_roi_feature_extractor.cpp
index 3a0937fcc6f..2589fbe4ac0 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/experimental_detectron_roi_feature_extractor.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/experimental_detectron_roi_feature_extractor.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/primitives/experimental_detectron_roi_feature_extractor.hpp"
+#include "intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp"
 #include "experimental_detectron_roi_feature_extractor_inst.hpp"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/extract_image_patches.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/extract_image_patches.cpp
index e31d3ec04ca..2f8063c9208 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/extract_image_patches.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/extract_image_patches.cpp
@@ -5,7 +5,7 @@
 #include "extract_image_patches_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 
 #include "extract_image_patches/extract_image_patches_kernel_selector.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/fully_connected.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/fully_connected.cpp
index 8a98a16e0f4..65643e6df19 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/fully_connected.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/fully_connected.cpp
@@ -11,11 +11,11 @@
 #include "fully_connected/fully_connected_kernel_selector.h"
 #include "fully_connected/fully_connected_params.h"
 
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_runner.h"
 
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/input_layout.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/input_layout.hpp"
 #include <memory>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/gather.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/gather.cpp
index dc77a7e1db9..82169c75ba3 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/gather.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/gather.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "gather/gather_kernel_selector.h"
 #include "gather/gather_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_elements.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_elements.cpp
index 968eb6bbb7d..4b24524fe4a 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_elements.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_elements.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "gather/gather_elements_kernel_selector.h"
 #include "gather/gather_elements_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_tree.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_tree.cpp
index 05269e90399..f3116152bf3 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_tree.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/gather_tree.cpp
@@ -9,7 +9,7 @@
 #include "kernel_selector_helper.h"
 #include "gather_tree/gather_tree_kernel_selector.h"
 #include "gather_tree/gather_tree_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/gemm.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/gemm.cpp
index 4ac001cdfc7..bfa09c40d1b 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/gemm.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/gemm.cpp
@@ -9,7 +9,7 @@
 #include "kernel_selector_helper.h"
 #include "gemm/gemm_kernel_selector.h"
 #include "gemm/gemm_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/generic_layer.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/generic_layer.cpp
index 495a9110a5e..befacf91ef5 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/generic_layer.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/generic_layer.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "generic_layer_inst.h"
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 #include "impls/implementation_map.hpp"
 #include "kernel_selector_helper.h"
 #include "register.hpp"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/grn.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/grn.cpp
index c254a70f7a9..9c3079bbf94 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/grn.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/grn.cpp
@@ -5,7 +5,7 @@
 #include "grn_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "grn/grn_kernel_selector.h"
 #include "grn/grn_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/lrn.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/lrn.cpp
index 947182d1fde..448cb98cde0 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/lrn.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/lrn.cpp
@@ -5,7 +5,7 @@
 #include "lrn_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "lrn/lrn_kernel_selector.h"
 #include "lrn/lrn_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_input.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_input.cpp
index 732a012ae0a..d7bb52506fd 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_input.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_input.cpp
@@ -10,7 +10,7 @@
 #include "kernel_selector_helper.h"
 #include "lstm_dynamic/lstm_dynamic_input_kernel_selector.h"
 #include "lstm_dynamic/lstm_dynamic_input_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_timeloop.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_timeloop.cpp
index 400e3596566..d6656fb9186 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_timeloop.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_dynamic_timeloop.cpp
@@ -10,7 +10,7 @@
 #include "kernel_selector_helper.h"
 #include "lstm_dynamic/lstm_dynamic_timeloop_kernel_selector.h"
 #include "lstm_dynamic/lstm_dynamic_timeloop_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_elt.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_elt.cpp
index d7abfcf3db0..52738c82825 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_elt.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_elt.cpp
@@ -10,7 +10,7 @@
 #include "kernel_selector_helper.h"
 #include "lstm/lstm_elt_kernel_selector.h"
 #include "lstm/lstm_elt_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_gemm.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_gemm.cpp
index fc5f01fff16..506efb65cdf 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_gemm.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/lstm_gemm.cpp
@@ -10,7 +10,7 @@
 #include "kernel_selector_helper.h"
 #include "lstm/lstm_gemm_kernel_selector.h"
 #include "lstm/lstm_gemm_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/max_unpooling.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/max_unpooling.cpp
index 169ec3b24a0..2210bc970f5 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/max_unpooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/max_unpooling.cpp
@@ -5,8 +5,8 @@
 #include "max_unpooling_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "kernel_selector_helper.h"
 #include "max_unpooling/max_unpooling_kernel_selector.h"
 #include "max_unpooling/max_unpooling_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/mvn.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/mvn.cpp
index 49fe48e443d..c81b36703f6 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/mvn.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/mvn.cpp
@@ -5,7 +5,7 @@
 #include "mvn_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "mvn/mvn_kernel_selector.h"
 #include "mvn/mvn_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/normalize.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/normalize.cpp
index 22414d656a5..8c58d2d3c38 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/normalize.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/normalize.cpp
@@ -5,7 +5,7 @@
 #include "normalize_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "normalize/normalize_kernel_selector.h"
 #include "normalize/normalize_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/one_hot.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/one_hot.cpp
index 186a7908a68..5e4ee64f254 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/one_hot.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/one_hot.cpp
@@ -9,7 +9,7 @@
 #include "kernel_selector_helper.h"
 #include "one_hot/one_hot_kernel_selector.h"
 #include "one_hot/one_hot_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include <vector>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/permute.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/permute.cpp
index d014e6287a3..a7821f3c9ed 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/permute.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/permute.cpp
@@ -5,7 +5,7 @@
 #include "permute_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "permute/permute_kernel_selector.h"
 #include "permute/permute_kernel_ref.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/pooling.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/pooling.cpp
index 0bb78ca0b38..1128fd1f2da 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/pooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/pooling.cpp
@@ -5,7 +5,7 @@
 #include "pooling_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "pooling/pooling_kernel_selector.h"
 #include "pooling/pooling_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/primitive_base.hpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/primitive_base.hpp
index 5255be02258..1df41266750 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/primitive_base.hpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/primitive_base.hpp
@@ -7,10 +7,10 @@
 
 #include <thread>
 #include "primitive_inst.h"
-#include "cldnn/graph/program.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/graph/program.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "register.hpp"
 #include <vector>
 #include <list>
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/pyramid_roi_align.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/pyramid_roi_align.cpp
index 8e94639697e..d85c09b2949 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/pyramid_roi_align.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/pyramid_roi_align.cpp
@@ -7,7 +7,7 @@
 #include "kernel_selector_helper.h"
 #include "pyramid_roi_align/pyramid_roi_align_kernel_selector.h"
 #include "pyramid_roi_align/pyramid_roi_align_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "pyramid_roi_align_inst.h"
 
 #include <cmath>
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/quantize.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/quantize.cpp
index 1fe009d7f45..3bf7674d99a 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/quantize.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/quantize.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "quantize/quantize_kernel_selector.h"
 #include "quantize/quantize_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/reduce.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/reduce.cpp
index e63cf6dd315..5ec15edd47a 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/reduce.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/reduce.cpp
@@ -9,7 +9,7 @@
 #include "reduce/reduce_kernel_selector.h"
 #include "reduce/reduce_kernel_ref.h"
 #include "reduce/reduce_kernel_b_fs_yx_fsv16.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "data_inst.h"
 
 using namespace cldnn;
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/region_yolo.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/region_yolo.cpp
index ab756d1a3f6..9e7153f53db 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/region_yolo.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/region_yolo.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "region_yolo/region_yolo_kernel_selector.h"
 #include "region_yolo/region_yolo_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/register.hpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/register.hpp
index bb8a690a1ee..43fa0adf82c 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/register.hpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/register.hpp
@@ -5,64 +5,64 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/activation.hpp"
-#include "cldnn/primitives/arg_max_min.hpp"
-#include "cldnn/primitives/average_unpooling.hpp"
-#include "cldnn/primitives/batch_to_space.hpp"
-#include "cldnn/primitives/binary_convolution.hpp"
-#include "cldnn/primitives/border.hpp"
-#include "cldnn/primitives/broadcast.hpp"
-#include "cldnn/primitives/concatenation.hpp"
-#include "cldnn/primitives/convolution.hpp"
-#include "cldnn/primitives/crop.hpp"
-#include "cldnn/primitives/custom_gpu_primitive.hpp"
-#include "cldnn/primitives/deconvolution.hpp"
-#include "cldnn/primitives/depth_to_space.hpp"
-#include "cldnn/primitives/detection_output.hpp"
-#include "cldnn/primitives/eltwise.hpp"
-#include "cldnn/primitives/experimental_detectron_roi_feature_extractor.hpp"
-#include "cldnn/primitives/fully_connected.hpp"
-#include "cldnn/primitives/gather.hpp"
-#include "cldnn/primitives/gather_nd.hpp"
-#include "cldnn/primitives/gather_elements.hpp"
-#include "cldnn/primitives/gemm.hpp"
-#include "cldnn/primitives/lrn.hpp"
-#include "cldnn/primitives/lstm.hpp"
-#include "cldnn/primitives/lstm_dynamic.hpp"
-#include "cldnn/primitives/max_unpooling.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/primitives/mvn.hpp"
-#include "cldnn/primitives/non_max_suppression.hpp"
-#include "cldnn/primitives/normalize.hpp"
-#include "cldnn/primitives/one_hot.hpp"
-#include "cldnn/primitives/permute.hpp"
-#include "cldnn/primitives/pooling.hpp"
-#include "cldnn/primitives/pyramid_roi_align.hpp"
-#include "cldnn/primitives/quantize.hpp"
-#include "cldnn/primitives/reduce.hpp"
-#include "cldnn/primitives/region_yolo.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/reorg_yolo.hpp"
-#include "cldnn/primitives/reshape.hpp"
-#include "cldnn/primitives/reverse_sequence.hpp"
-#include "cldnn/primitives/roi_align.hpp"
-#include "cldnn/primitives/roi_pooling.hpp"
-#include "cldnn/primitives/scale.hpp"
-#include "cldnn/primitives/scatter_update.hpp"
-#include "cldnn/primitives/scatter_elements_update.hpp"
-#include "cldnn/primitives/scatter_nd_update.hpp"
-#include "cldnn/primitives/select.hpp"
-#include "cldnn/primitives/shuffle_channels.hpp"
-#include "cldnn/primitives/softmax.hpp"
-#include "cldnn/primitives/space_to_batch.hpp"
-#include "cldnn/primitives/strided_slice.hpp"
-#include "cldnn/primitives/tile.hpp"
-#include "cldnn/primitives/resample.hpp"
-#include "cldnn/primitives/gather_tree.hpp"
-#include "cldnn/primitives/lstm_dynamic_input.hpp"
-#include "cldnn/primitives/lstm_dynamic_timeloop.hpp"
-#include "cldnn/primitives/grn.hpp"
-#include "cldnn/primitives/ctc_greedy_decoder.hpp"
+#include "intel_gpu/primitives/activation.hpp"
+#include "intel_gpu/primitives/arg_max_min.hpp"
+#include "intel_gpu/primitives/average_unpooling.hpp"
+#include "intel_gpu/primitives/batch_to_space.hpp"
+#include "intel_gpu/primitives/binary_convolution.hpp"
+#include "intel_gpu/primitives/border.hpp"
+#include "intel_gpu/primitives/broadcast.hpp"
+#include "intel_gpu/primitives/concatenation.hpp"
+#include "intel_gpu/primitives/convolution.hpp"
+#include "intel_gpu/primitives/crop.hpp"
+#include "intel_gpu/primitives/custom_gpu_primitive.hpp"
+#include "intel_gpu/primitives/deconvolution.hpp"
+#include "intel_gpu/primitives/depth_to_space.hpp"
+#include "intel_gpu/primitives/detection_output.hpp"
+#include "intel_gpu/primitives/eltwise.hpp"
+#include "intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp"
+#include "intel_gpu/primitives/fully_connected.hpp"
+#include "intel_gpu/primitives/gather.hpp"
+#include "intel_gpu/primitives/gather_nd.hpp"
+#include "intel_gpu/primitives/gather_elements.hpp"
+#include "intel_gpu/primitives/gemm.hpp"
+#include "intel_gpu/primitives/lrn.hpp"
+#include "intel_gpu/primitives/lstm.hpp"
+#include "intel_gpu/primitives/lstm_dynamic.hpp"
+#include "intel_gpu/primitives/max_unpooling.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/mvn.hpp"
+#include "intel_gpu/primitives/non_max_suppression.hpp"
+#include "intel_gpu/primitives/normalize.hpp"
+#include "intel_gpu/primitives/one_hot.hpp"
+#include "intel_gpu/primitives/permute.hpp"
+#include "intel_gpu/primitives/pooling.hpp"
+#include "intel_gpu/primitives/pyramid_roi_align.hpp"
+#include "intel_gpu/primitives/quantize.hpp"
+#include "intel_gpu/primitives/reduce.hpp"
+#include "intel_gpu/primitives/region_yolo.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reorg_yolo.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
+#include "intel_gpu/primitives/reverse_sequence.hpp"
+#include "intel_gpu/primitives/roi_align.hpp"
+#include "intel_gpu/primitives/roi_pooling.hpp"
+#include "intel_gpu/primitives/scale.hpp"
+#include "intel_gpu/primitives/scatter_update.hpp"
+#include "intel_gpu/primitives/scatter_elements_update.hpp"
+#include "intel_gpu/primitives/scatter_nd_update.hpp"
+#include "intel_gpu/primitives/select.hpp"
+#include "intel_gpu/primitives/shuffle_channels.hpp"
+#include "intel_gpu/primitives/softmax.hpp"
+#include "intel_gpu/primitives/space_to_batch.hpp"
+#include "intel_gpu/primitives/strided_slice.hpp"
+#include "intel_gpu/primitives/tile.hpp"
+#include "intel_gpu/primitives/resample.hpp"
+#include "intel_gpu/primitives/gather_tree.hpp"
+#include "intel_gpu/primitives/lstm_dynamic_input.hpp"
+#include "intel_gpu/primitives/lstm_dynamic_timeloop.hpp"
+#include "intel_gpu/primitives/grn.hpp"
+#include "intel_gpu/primitives/ctc_greedy_decoder.hpp"
 #include "generic_layer.hpp"
 
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/reorder.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/reorder.cpp
index a51e4bfc0b6..90371e5593e 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/reorder.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/reorder.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "reorder/reorder_kernel_selector.h"
 #include "reorder/reorder_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/reorg_yolo.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/reorg_yolo.cpp
index 223ed3fd513..cf5b7c3559e 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/reorg_yolo.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/reorg_yolo.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "reorg_yolo/reorg_yolo_kernel_selector.h"
 #include "reorg_yolo/reorg_yolo_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/resample.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/resample.cpp
index c5871c0ff0a..ca2564f11d4 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/resample.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/resample.cpp
@@ -5,7 +5,7 @@
 #include "resample_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "kernel_selector/core/actual_kernels/resample/resample_kernel_selector.h"
 #include "kernel_selector/core/actual_kernels/resample/resample_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/reshape.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/reshape.cpp
index 66c5e0ecd1a..ad41b77cbaa 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/reshape.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/reshape.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "reshape/reshape_kernel_ref.h"
 #include "reshape/reshape_kernel_selector.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/reverse_sequence.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/reverse_sequence.cpp
index a957185e9b7..10ac0edd3c5 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/reverse_sequence.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/reverse_sequence.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "reverse_sequence/reverse_sequence_kernel_selector.h"
 #include "reverse_sequence/reverse_sequence_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_align.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_align.cpp
index 6312023233a..3ba674c46c2 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_align.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_align.cpp
@@ -4,7 +4,7 @@
 #include "roi_align_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "roi_align/roi_align_kernel_selector.h"
 #include "roi_align/roi_align_kernel_ref.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_pooling.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_pooling.cpp
index 41acf052424..07f7b5f3037 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_pooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/roi_pooling.cpp
@@ -5,7 +5,7 @@
 #include "roi_pooling_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "roi_pooling/roi_pooling_kernel_selector.h"
 #include "roi_pooling/roi_pooling_kernel_ref.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/scale.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/scale.cpp
index 3e1e90d6c8c..54f054d7abc 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/scale.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/scale.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "eltwise/eltwise_kernel_selector.h"
 #include "eltwise/eltwise_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_elements_update.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_elements_update.cpp
index 3b41755f2a4..7e0850aeaaf 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_elements_update.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_elements_update.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "scatter_update/scatter_elements_update_kernel_selector.h"
 #include "scatter_update/scatter_elements_update_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_nd_update.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_nd_update.cpp
index 83f14957841..fbc5dea5b66 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_nd_update.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_nd_update.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "scatter_update/scatter_nd_update_kernel_selector.h"
 #include "scatter_update/scatter_nd_update_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_update.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_update.cpp
index 6821a0f24a1..703906aeea0 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_update.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/scatter_update.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "scatter_update/scatter_update_kernel_selector.h"
 #include "scatter_update/scatter_update_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/select.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/select.cpp
index 101bcec39bd..ae1f3a1274f 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/select.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/select.cpp
@@ -5,7 +5,7 @@
 #include "select_inst.h"
 #include "primitive_base.hpp"
 #include "impls/implementation_map.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "kernel_selector_helper.h"
 #include "select/select_kernel_selector.h"
 #include "select/select_kernel_base.h"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/shuffle_channels.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/shuffle_channels.cpp
index e8e76c7483b..50d9b2b220b 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/shuffle_channels.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/shuffle_channels.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "shuffle_channels/shuffle_channels_kernel_selector.h"
 #include "shuffle_channels/shuffle_channels_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/softmax.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/softmax.cpp
index 3db5e891633..041846e373f 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/softmax.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/softmax.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "softmax/softmax_kernel_selector.h"
 #include "softmax/softmax_kernel_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 namespace cldnn {
 namespace ocl {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_batch.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_batch.cpp
index 1d78ffda114..599a5a0ce63 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_batch.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_batch.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "space_to_batch/space_to_batch_kernel_selector.h"
 #include "space_to_batch/space_to_batch_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "data_inst.h"
 #include <vector>
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_depth.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_depth.cpp
index c0a0c692f3c..5930d1d4ed7 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_depth.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/space_to_depth.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "space_to_depth/space_to_depth_kernel_selector.h"
 #include "space_to_depth/space_to_depth_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/strided_slice.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/strided_slice.cpp
index 81c3d1c4737..8ef8c01fdbf 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/strided_slice.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/strided_slice.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "strided_slice/strided_slice_kernel_ref.h"
 #include "strided_slice/strided_slice_kernel_selector.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "data_inst.h"
 #include <vector>
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/tile.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/tile.cpp
index 74d6eb78136..b266ecf2fc3 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/ocl/tile.cpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/ocl/tile.cpp
@@ -8,7 +8,7 @@
 #include "kernel_selector_helper.h"
 #include "tile/tile_kernel_selector.h"
 #include "tile/tile_kernel_ref.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 using namespace cldnn;
 
diff --git a/inference-engine/thirdparty/clDNN/src/impls/onednn/primitive_onednn_base.h b/inference-engine/thirdparty/clDNN/src/impls/onednn/primitive_onednn_base.h
index 4f0bcc3a874..b8e202f2d72 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/onednn/primitive_onednn_base.h
+++ b/inference-engine/thirdparty/clDNN/src/impls/onednn/primitive_onednn_base.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "primitive_inst.h"
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 #include "to_string_utils.h"
 #include "register.hpp"
 #include "utils.hpp"
diff --git a/inference-engine/thirdparty/clDNN/src/impls/onednn/register.hpp b/inference-engine/thirdparty/clDNN/src/impls/onednn/register.hpp
index 447475be727..b4fe7db343c 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/onednn/register.hpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/onednn/register.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "cldnn/primitives/convolution.hpp"
+#include "intel_gpu/primitives/convolution.hpp"
 
 namespace cldnn {
 namespace onednn {
diff --git a/inference-engine/thirdparty/clDNN/src/impls/onednn/utils.hpp b/inference-engine/thirdparty/clDNN/src/impls/onednn/utils.hpp
index 1d2b4b1a409..c89da4d8a34 100644
--- a/inference-engine/thirdparty/clDNN/src/impls/onednn/utils.hpp
+++ b/inference-engine/thirdparty/clDNN/src/impls/onednn/utils.hpp
@@ -6,10 +6,10 @@
 
 #include <oneapi/dnnl/dnnl.hpp>
 
-#include <cldnn/runtime/layout.hpp>
-#include <cldnn/runtime/engine.hpp>
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/primitives/activation.hpp>
+#include <intel_gpu/runtime/layout.hpp>
+#include <intel_gpu/runtime/engine.hpp>
+#include <intel_gpu/runtime/memory.hpp>
+#include <intel_gpu/primitives/activation.hpp>
 #include <data_inst.h>
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/src/include/activation_inst.h b/inference-engine/thirdparty/clDNN/src/include/activation_inst.h
index 38c3b17c5ec..733d6bcf465 100644
--- a/inference-engine/thirdparty/clDNN/src/include/activation_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/activation_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/activation.hpp"
+#include "intel_gpu/primitives/activation.hpp"
 #include "primitive_inst.h"
 #include "kernel_selector/core/actual_kernels/activation/activation_kernel_base.h"
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/arg_max_min_inst.h b/inference-engine/thirdparty/clDNN/src/include/arg_max_min_inst.h
index 2cf1481f847..2a63506d544 100644
--- a/inference-engine/thirdparty/clDNN/src/include/arg_max_min_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/arg_max_min_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/arg_max_min.hpp"
+#include "intel_gpu/primitives/arg_max_min.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/average_unpooling_inst.h b/inference-engine/thirdparty/clDNN/src/include/average_unpooling_inst.h
index 4998c8b04d8..502c08acc97 100644
--- a/inference-engine/thirdparty/clDNN/src/include/average_unpooling_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/average_unpooling_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/average_unpooling.hpp"
+#include "intel_gpu/primitives/average_unpooling.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/batch_to_space_inst.h b/inference-engine/thirdparty/clDNN/src/include/batch_to_space_inst.h
index 860c5bad5d0..60bdbdd3740 100644
--- a/inference-engine/thirdparty/clDNN/src/include/batch_to_space_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/batch_to_space_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/batch_to_space.hpp"
+#include "intel_gpu/primitives/batch_to_space.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/binary_convolution_inst.h b/inference-engine/thirdparty/clDNN/src/include/binary_convolution_inst.h
index ae008ac3b5d..29b686d4807 100644
--- a/inference-engine/thirdparty/clDNN/src/include/binary_convolution_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/binary_convolution_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/binary_convolution.hpp"
+#include "intel_gpu/primitives/binary_convolution.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/border_inst.h b/inference-engine/thirdparty/clDNN/src/include/border_inst.h
index a6aeb22d4d2..489763534b4 100644
--- a/inference-engine/thirdparty/clDNN/src/include/border_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/border_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/border.hpp"
+#include "intel_gpu/primitives/border.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/broadcast_inst.h b/inference-engine/thirdparty/clDNN/src/include/broadcast_inst.h
index 75f3efc1a36..c962fe41e18 100644
--- a/inference-engine/thirdparty/clDNN/src/include/broadcast_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/broadcast_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/broadcast.hpp"
+#include "intel_gpu/primitives/broadcast.hpp"
 
 #include "primitive_inst.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/concatenation_inst.h b/inference-engine/thirdparty/clDNN/src/include/concatenation_inst.h
index 6d323fa4fef..876d3ecb166 100644
--- a/inference-engine/thirdparty/clDNN/src/include/concatenation_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/concatenation_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/concatenation.hpp"
+#include "intel_gpu/primitives/concatenation.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/condition_inst.h b/inference-engine/thirdparty/clDNN/src/include/condition_inst.h
index 9906d4113e9..f30a775697e 100644
--- a/inference-engine/thirdparty/clDNN/src/include/condition_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/condition_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <cldnn/primitives/condition.hpp>
+#include "intel_gpu/primitives/condition.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/convolution_inst.h b/inference-engine/thirdparty/clDNN/src/include/convolution_inst.h
index d16e3a9e79a..72697596143 100644
--- a/inference-engine/thirdparty/clDNN/src/include/convolution_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/convolution_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/convolution.hpp"
+#include "intel_gpu/primitives/convolution.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/crop_inst.h b/inference-engine/thirdparty/clDNN/src/include/crop_inst.h
index a288bc437f5..9f1a97997a0 100644
--- a/inference-engine/thirdparty/clDNN/src/include/crop_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/crop_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/crop.hpp"
+#include "intel_gpu/primitives/crop.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/ctc_greedy_decoder_inst.h b/inference-engine/thirdparty/clDNN/src/include/ctc_greedy_decoder_inst.h
index 6d67c4ef87b..5438cddf534 100644
--- a/inference-engine/thirdparty/clDNN/src/include/ctc_greedy_decoder_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/ctc_greedy_decoder_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/ctc_greedy_decoder.hpp"
+#include "intel_gpu/primitives/ctc_greedy_decoder.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/cum_sum_inst.h b/inference-engine/thirdparty/clDNN/src/include/cum_sum_inst.h
index cc0f6c73bf3..56baf9ceb22 100644
--- a/inference-engine/thirdparty/clDNN/src/include/cum_sum_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/cum_sum_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/cum_sum.hpp"
+#include "intel_gpu/primitives/cum_sum.hpp"
 #include "primitive_inst.h"
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/src/include/custom_gpu_primitive_inst.h b/inference-engine/thirdparty/clDNN/src/include/custom_gpu_primitive_inst.h
index f75cc09afa2..dbdec1ef332 100644
--- a/inference-engine/thirdparty/clDNN/src/include/custom_gpu_primitive_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/custom_gpu_primitive_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/custom_gpu_primitive.hpp"
+#include "intel_gpu/primitives/custom_gpu_primitive.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/data_inst.h b/inference-engine/thirdparty/clDNN/src/include/data_inst.h
index 3071a53e69a..72535f361f8 100644
--- a/inference-engine/thirdparty/clDNN/src/include/data_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/data_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/data.hpp"
+#include "intel_gpu/primitives/data.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/deconvolution_inst.h b/inference-engine/thirdparty/clDNN/src/include/deconvolution_inst.h
index 8cbff911bdd..f62f89ddfe2 100644
--- a/inference-engine/thirdparty/clDNN/src/include/deconvolution_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/deconvolution_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/deconvolution.hpp"
+#include "intel_gpu/primitives/deconvolution.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/deformable_convolution_inst.h b/inference-engine/thirdparty/clDNN/src/include/deformable_convolution_inst.h
index 6fb54a3e245..85dc636745c 100644
--- a/inference-engine/thirdparty/clDNN/src/include/deformable_convolution_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/deformable_convolution_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/convolution.hpp"
+#include "intel_gpu/primitives/convolution.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/depth_to_space_inst.h b/inference-engine/thirdparty/clDNN/src/include/depth_to_space_inst.h
index 5042b969fd4..1ecd16afe2d 100644
--- a/inference-engine/thirdparty/clDNN/src/include/depth_to_space_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/depth_to_space_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/depth_to_space.hpp"
+#include "intel_gpu/primitives/depth_to_space.hpp"
 #include "primitive_inst.h"
 #include "kernel_selector/core/actual_kernels/depth_to_space/depth_to_space_kernel_base.h"
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/detection_output_inst.h b/inference-engine/thirdparty/clDNN/src/include/detection_output_inst.h
index f2df0539455..8eac9f4b751 100644
--- a/inference-engine/thirdparty/clDNN/src/include/detection_output_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/detection_output_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/detection_output.hpp"
+#include "intel_gpu/primitives/detection_output.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/eltwise_inst.h b/inference-engine/thirdparty/clDNN/src/include/eltwise_inst.h
index fe69b31b3d3..615e2844117 100644
--- a/inference-engine/thirdparty/clDNN/src/include/eltwise_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/eltwise_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/eltwise.hpp"
+#include "intel_gpu/primitives/eltwise.hpp"
 #include "primitive_inst.h"
 #include "kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_base.h"
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/embedding_bag_inst.h b/inference-engine/thirdparty/clDNN/src/include/embedding_bag_inst.h
index 2644a34f289..88b4ed06146 100644
--- a/inference-engine/thirdparty/clDNN/src/include/embedding_bag_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/embedding_bag_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/embedding_bag.hpp"
+#include "intel_gpu/primitives/embedding_bag.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/experimental_detectron_roi_feature_extractor_inst.hpp b/inference-engine/thirdparty/clDNN/src/include/experimental_detectron_roi_feature_extractor_inst.hpp
index e2a4c11cebe..66ec2a596b8 100644
--- a/inference-engine/thirdparty/clDNN/src/include/experimental_detectron_roi_feature_extractor_inst.hpp
+++ b/inference-engine/thirdparty/clDNN/src/include/experimental_detectron_roi_feature_extractor_inst.hpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include "cldnn/primitives/experimental_detectron_roi_feature_extractor.hpp"
+#include "intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp"
 #include "primitive_inst.h"
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/src/include/extract_image_patches_inst.h b/inference-engine/thirdparty/clDNN/src/include/extract_image_patches_inst.h
index 9602615f638..d112d11fb0c 100644
--- a/inference-engine/thirdparty/clDNN/src/include/extract_image_patches_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/extract_image_patches_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/extract_image_patches.hpp"
+#include "intel_gpu/primitives/extract_image_patches.hpp"
 #include "primitive_inst.h"
 
 namespace cldnn {
diff --git a/inference-engine/thirdparty/clDNN/src/include/fully_connected_inst.h b/inference-engine/thirdparty/clDNN/src/include/fully_connected_inst.h
index 3982507a937..c89e93c645d 100644
--- a/inference-engine/thirdparty/clDNN/src/include/fully_connected_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/fully_connected_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/fully_connected.hpp"
+#include "intel_gpu/primitives/fully_connected.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/gather_elements_inst.h b/inference-engine/thirdparty/clDNN/src/include/gather_elements_inst.h
index 5bf15b4930c..12ef647b400 100644
--- a/inference-engine/thirdparty/clDNN/src/include/gather_elements_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/gather_elements_inst.h
@@ -16,7 +16,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/gather_elements.hpp"
+#include "intel_gpu/primitives/gather_elements.hpp"
 #include "primitive_inst.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/gather_inst.h b/inference-engine/thirdparty/clDNN/src/include/gather_inst.h
index 9d733bbc1a8..8c7520a59ff 100644
--- a/inference-engine/thirdparty/clDNN/src/include/gather_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/gather_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/gather.hpp"
+#include "intel_gpu/primitives/gather.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/gather_nd_inst.h b/inference-engine/thirdparty/clDNN/src/include/gather_nd_inst.h
index 2d7ad62e4ac..d904e59ae00 100644
--- a/inference-engine/thirdparty/clDNN/src/include/gather_nd_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/gather_nd_inst.h
@@ -3,7 +3,7 @@
 //
 
 #pragma once
-#include "cldnn/primitives/gather_nd.hpp"
+#include "intel_gpu/primitives/gather_nd.hpp"
 #include "primitive_inst.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/gather_tree_inst.h b/inference-engine/thirdparty/clDNN/src/include/gather_tree_inst.h
index a08aeb3226c..85fef409a09 100644
--- a/inference-engine/thirdparty/clDNN/src/include/gather_tree_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/gather_tree_inst.h
@@ -3,7 +3,7 @@
 //
 
 #pragma once
-#include "cldnn/primitives/gather_tree.hpp"
+#include "intel_gpu/primitives/gather_tree.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/gemm_inst.h b/inference-engine/thirdparty/clDNN/src/include/gemm_inst.h
index 88f6e5a0d8d..af3c7ae3a93 100644
--- a/inference-engine/thirdparty/clDNN/src/include/gemm_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/gemm_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/gemm.hpp"
+#include "intel_gpu/primitives/gemm.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/generic_layer.hpp b/inference-engine/thirdparty/clDNN/src/include/generic_layer.hpp
index b7d84a211c1..f3b47515b62 100644
--- a/inference-engine/thirdparty/clDNN/src/include/generic_layer.hpp
+++ b/inference-engine/thirdparty/clDNN/src/include/generic_layer.hpp
@@ -4,8 +4,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/primitive.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/primitives/primitive.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 #include "kernel_selector_helper.h"
 
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/include/grn_inst.h b/inference-engine/thirdparty/clDNN/src/include/grn_inst.h
index db0e5f1f866..7fe1b747648 100644
--- a/inference-engine/thirdparty/clDNN/src/include/grn_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/grn_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/grn.hpp"
+#include "intel_gpu/primitives/grn.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/input_layout_inst.h b/inference-engine/thirdparty/clDNN/src/include/input_layout_inst.h
index 8e837b0e992..7cd31051f2d 100644
--- a/inference-engine/thirdparty/clDNN/src/include/input_layout_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/input_layout_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/input_layout.hpp"
+#include "intel_gpu/primitives/input_layout.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/kernel_selector_helper.h b/inference-engine/thirdparty/clDNN/src/include/kernel_selector_helper.h
index ab6c272da75..873709a69cc 100644
--- a/inference-engine/thirdparty/clDNN/src/include/kernel_selector_helper.h
+++ b/inference-engine/thirdparty/clDNN/src/include/kernel_selector_helper.h
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "cldnn/runtime/utils.hpp"
-#include "cldnn/runtime/tensor.hpp"
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/primitives/eltwise.hpp"
-#include "cldnn/primitives/scale.hpp"
-#include "cldnn/primitives/quantize.hpp"
-#include "cldnn/primitives/activation.hpp"
+#include "intel_gpu/runtime/utils.hpp"
+#include "intel_gpu/runtime/tensor.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/primitives/eltwise.hpp"
+#include "intel_gpu/primitives/scale.hpp"
+#include "intel_gpu/primitives/quantize.hpp"
+#include "intel_gpu/primitives/activation.hpp"
 
 #include "kernel_selector_params.h"
 #include "kernel_selector_common.h"
diff --git a/inference-engine/thirdparty/clDNN/src/include/layout_optimizer.h b/inference-engine/thirdparty/clDNN/src/include/layout_optimizer.h
index 79bca36995f..54d6312b71e 100644
--- a/inference-engine/thirdparty/clDNN/src/include/layout_optimizer.h
+++ b/inference-engine/thirdparty/clDNN/src/include/layout_optimizer.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/utils.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/utils.hpp"
 
 #include "data_inst.h"
 #include "reorder_inst.h"
diff --git a/inference-engine/thirdparty/clDNN/src/include/loop_inst.h b/inference-engine/thirdparty/clDNN/src/include/loop_inst.h
index 985d326932b..1b7d7036eb2 100644
--- a/inference-engine/thirdparty/clDNN/src/include/loop_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/loop_inst.h
@@ -5,13 +5,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/loop.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/primitives/input_layout.hpp"
-#include "cldnn/primitives/eltwise.hpp"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/primitives/loop.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/primitives/input_layout.hpp"
+#include "intel_gpu/primitives/eltwise.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 #include "primitive_inst.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/lrn_inst.h b/inference-engine/thirdparty/clDNN/src/include/lrn_inst.h
index 01320d60dba..cafb596258d 100644
--- a/inference-engine/thirdparty/clDNN/src/include/lrn_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/lrn_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/lrn.hpp"
+#include "intel_gpu/primitives/lrn.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_input_inst.h b/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_input_inst.h
index 0d7dbd41b08..24c899005ba 100644
--- a/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_input_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_input_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/lstm_dynamic_input.hpp"
+#include "intel_gpu/primitives/lstm_dynamic_input.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_inst.h b/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_inst.h
index 70618be4c75..2e0996d7a73 100644
--- a/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/lstm_dynamic.hpp"
+#include "intel_gpu/primitives/lstm_dynamic.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_timeloop_inst.h b/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_timeloop_inst.h
index 0dfeecb84c5..104765b193d 100644
--- a/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_timeloop_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/lstm_dynamic_timeloop_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/lstm_dynamic_timeloop.hpp"
+#include "intel_gpu/primitives/lstm_dynamic_timeloop.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/lstm_elt_inst.h b/inference-engine/thirdparty/clDNN/src/include/lstm_elt_inst.h
index 61f4f207d7e..48c963baf4c 100644
--- a/inference-engine/thirdparty/clDNN/src/include/lstm_elt_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/lstm_elt_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/lstm.hpp"
+#include "intel_gpu/primitives/lstm.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/lstm_gemm_inst.h b/inference-engine/thirdparty/clDNN/src/include/lstm_gemm_inst.h
index ece11765e35..8d838e9dfee 100644
--- a/inference-engine/thirdparty/clDNN/src/include/lstm_gemm_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/lstm_gemm_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/lstm.hpp"
+#include "intel_gpu/primitives/lstm.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/lstm_inst.h b/inference-engine/thirdparty/clDNN/src/include/lstm_inst.h
index 0e8648eac3a..a212d8ea8ea 100644
--- a/inference-engine/thirdparty/clDNN/src/include/lstm_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/lstm_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/lstm.hpp"
+#include "intel_gpu/primitives/lstm.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/max_unpooling_inst.h b/inference-engine/thirdparty/clDNN/src/include/max_unpooling_inst.h
index 944b446e153..2b8af08cf06 100644
--- a/inference-engine/thirdparty/clDNN/src/include/max_unpooling_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/max_unpooling_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/max_unpooling.hpp"
+#include "intel_gpu/primitives/max_unpooling.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/meta_utils.h b/inference-engine/thirdparty/clDNN/src/include/meta_utils.h
index 7c523ef2359..170b8f79c24 100644
--- a/inference-engine/thirdparty/clDNN/src/include/meta_utils.h
+++ b/inference-engine/thirdparty/clDNN/src/include/meta_utils.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "cldnn/runtime/utils.hpp"
+#include "intel_gpu/runtime/utils.hpp"
 
 #include <type_traits>
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/mutable_data_inst.h b/inference-engine/thirdparty/clDNN/src/include/mutable_data_inst.h
index c156925a836..97673ed6ccf 100644
--- a/inference-engine/thirdparty/clDNN/src/include/mutable_data_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/mutable_data_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/mvn_inst.h b/inference-engine/thirdparty/clDNN/src/include/mvn_inst.h
index 0d1429605c1..e88b790123f 100644
--- a/inference-engine/thirdparty/clDNN/src/include/mvn_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/mvn_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/mvn.hpp"
+#include "intel_gpu/primitives/mvn.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/non_max_suppression_inst.h b/inference-engine/thirdparty/clDNN/src/include/non_max_suppression_inst.h
index 537a04b6024..9f50724df3b 100644
--- a/inference-engine/thirdparty/clDNN/src/include/non_max_suppression_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/non_max_suppression_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/non_max_suppression.hpp"
+#include "intel_gpu/primitives/non_max_suppression.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/normalize_inst.h b/inference-engine/thirdparty/clDNN/src/include/normalize_inst.h
index 6efaec3aa65..6a40a29171e 100644
--- a/inference-engine/thirdparty/clDNN/src/include/normalize_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/normalize_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/normalize.hpp"
+#include "intel_gpu/primitives/normalize.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/one_hot_inst.h b/inference-engine/thirdparty/clDNN/src/include/one_hot_inst.h
index 0067f87784a..c79940e5556 100644
--- a/inference-engine/thirdparty/clDNN/src/include/one_hot_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/one_hot_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/one_hot.hpp"
+#include "intel_gpu/primitives/one_hot.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/pass_manager.h b/inference-engine/thirdparty/clDNN/src/include/pass_manager.h
index 7769fc57aa7..2081e8dbe5e 100644
--- a/inference-engine/thirdparty/clDNN/src/include/pass_manager.h
+++ b/inference-engine/thirdparty/clDNN/src/include/pass_manager.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "layout_optimizer.h"
 #include "split_inst.h"
 #include "lstm_inst.h"
diff --git a/inference-engine/thirdparty/clDNN/src/include/permute_inst.h b/inference-engine/thirdparty/clDNN/src/include/permute_inst.h
index 5444b3dc20d..789d0cfe3c8 100644
--- a/inference-engine/thirdparty/clDNN/src/include/permute_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/permute_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/permute.hpp"
+#include "intel_gpu/primitives/permute.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/pooling_inst.h b/inference-engine/thirdparty/clDNN/src/include/pooling_inst.h
index fa1649a97ac..f2b323820b7 100644
--- a/inference-engine/thirdparty/clDNN/src/include/pooling_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/pooling_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/pooling.hpp"
+#include "intel_gpu/primitives/pooling.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/primitive_inst.h b/inference-engine/thirdparty/clDNN/src/include/primitive_inst.h
index 604f3d2f981..9ca751dc5a5 100644
--- a/inference-engine/thirdparty/clDNN/src/include/primitive_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/primitive_inst.h
@@ -4,12 +4,12 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/primitive.hpp"
-#include "cldnn/primitives/concatenation.hpp"
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/runtime/event.hpp"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/primitives/primitive.hpp"
+#include "intel_gpu/primitives/concatenation.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/event.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "kernel_selector_helper.h"
 #include "meta_utils.h"
 #include "program_node.h"
diff --git a/inference-engine/thirdparty/clDNN/src/include/primitive_type.h b/inference-engine/thirdparty/clDNN/src/include/primitive_type.h
index 89e4e85018c..b2b4ba66de0 100644
--- a/inference-engine/thirdparty/clDNN/src/include/primitive_type.h
+++ b/inference-engine/thirdparty/clDNN/src/include/primitive_type.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/runtime/layout.hpp"
+#include "intel_gpu/runtime/layout.hpp"
 
 #include <memory>
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/primitive_type_base.h b/inference-engine/thirdparty/clDNN/src/include/primitive_type_base.h
index 58cbe823a17..2c11371ac3a 100644
--- a/inference-engine/thirdparty/clDNN/src/include/primitive_type_base.h
+++ b/inference-engine/thirdparty/clDNN/src/include/primitive_type_base.h
@@ -5,13 +5,13 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 
 #include "meta_utils.h"
 #include "primitive_type.h"
 #include "program_node.h"
 #include "primitive_inst.h"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "impls/implementation_map.hpp"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/prior_box_inst.h b/inference-engine/thirdparty/clDNN/src/include/prior_box_inst.h
index 9099ed068be..dfb513f9c78 100644
--- a/inference-engine/thirdparty/clDNN/src/include/prior_box_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/prior_box_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/prior_box.hpp"
+#include "intel_gpu/primitives/prior_box.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/program_dump_graph.h b/inference-engine/thirdparty/clDNN/src/include/program_dump_graph.h
index b46f09d5c98..0ae916d298a 100644
--- a/inference-engine/thirdparty/clDNN/src/include/program_dump_graph.h
+++ b/inference-engine/thirdparty/clDNN/src/include/program_dump_graph.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "program_node.h"
 #include <fstream>
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/program_helpers.h b/inference-engine/thirdparty/clDNN/src/include/program_helpers.h
index 26b06ddbcd2..28bf592873c 100644
--- a/inference-engine/thirdparty/clDNN/src/include/program_helpers.h
+++ b/inference-engine/thirdparty/clDNN/src/include/program_helpers.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "program_node.h"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "data_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/program_node.h b/inference-engine/thirdparty/clDNN/src/include/program_node.h
index 3804b285065..27f425fd7de 100644
--- a/inference-engine/thirdparty/clDNN/src/include/program_node.h
+++ b/inference-engine/thirdparty/clDNN/src/include/program_node.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "cldnn/primitives/primitive.hpp"
-#include "cldnn/primitives/activation.hpp"
-#include "cldnn/primitives/implementation_desc.hpp"
+#include "intel_gpu/primitives/primitive.hpp"
+#include "intel_gpu/primitives/activation.hpp"
+#include "intel_gpu/primitives/implementation_desc.hpp"
 
 #include "kernel_selector_helper.h"
 #include "meta_utils.h"
diff --git a/inference-engine/thirdparty/clDNN/src/include/proposal_inst.h b/inference-engine/thirdparty/clDNN/src/include/proposal_inst.h
index 8ebbd259e68..d56b3ea2970 100644
--- a/inference-engine/thirdparty/clDNN/src/include/proposal_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/proposal_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/proposal.hpp"
+#include "intel_gpu/primitives/proposal.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/pyramid_roi_align_inst.h b/inference-engine/thirdparty/clDNN/src/include/pyramid_roi_align_inst.h
index afda5677342..688aa390c88 100644
--- a/inference-engine/thirdparty/clDNN/src/include/pyramid_roi_align_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/pyramid_roi_align_inst.h
@@ -3,7 +3,7 @@
 //
 
 #pragma once
-#include "cldnn/primitives/pyramid_roi_align.hpp"
+#include "intel_gpu/primitives/pyramid_roi_align.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/quantize_inst.h b/inference-engine/thirdparty/clDNN/src/include/quantize_inst.h
index 4600a242e27..8e2583ce72f 100644
--- a/inference-engine/thirdparty/clDNN/src/include/quantize_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/quantize_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/quantize.hpp"
+#include "intel_gpu/primitives/quantize.hpp"
 #include "primitive_inst.h"
 #include "data_inst.h"
 #include "kernel_selector/core/actual_kernels/quantize/quantize_kernel_params.h"
diff --git a/inference-engine/thirdparty/clDNN/src/include/reduce_inst.h b/inference-engine/thirdparty/clDNN/src/include/reduce_inst.h
index f822682ef47..d93fc16d861 100644
--- a/inference-engine/thirdparty/clDNN/src/include/reduce_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/reduce_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/reduce.hpp"
+#include "intel_gpu/primitives/reduce.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/region_yolo_inst.h b/inference-engine/thirdparty/clDNN/src/include/region_yolo_inst.h
index f98ab0facfa..17c5718cf54 100644
--- a/inference-engine/thirdparty/clDNN/src/include/region_yolo_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/region_yolo_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/region_yolo.hpp"
+#include "intel_gpu/primitives/region_yolo.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/reorder_inst.h b/inference-engine/thirdparty/clDNN/src/include/reorder_inst.h
index 4f71c65f670..7991f3b1278 100644
--- a/inference-engine/thirdparty/clDNN/src/include/reorder_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/reorder_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 #include "primitive_inst.h"
 #include "kernel_selector/core/actual_kernels/reorder/reorder_kernel_base.h"
 #include "kernel_selector/common/tensor_type.h"
diff --git a/inference-engine/thirdparty/clDNN/src/include/reorg_yolo_inst.h b/inference-engine/thirdparty/clDNN/src/include/reorg_yolo_inst.h
index 09d60784629..b1b095f1a6c 100644
--- a/inference-engine/thirdparty/clDNN/src/include/reorg_yolo_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/reorg_yolo_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/reorg_yolo.hpp"
+#include "intel_gpu/primitives/reorg_yolo.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/resample_inst.h b/inference-engine/thirdparty/clDNN/src/include/resample_inst.h
index c7081b7577f..9809c6a5755 100644
--- a/inference-engine/thirdparty/clDNN/src/include/resample_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/resample_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/resample.hpp"
+#include "intel_gpu/primitives/resample.hpp"
 #include "primitive_inst.h"
 
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/reshape_inst.h b/inference-engine/thirdparty/clDNN/src/include/reshape_inst.h
index 4974836facf..796e69e75ef 100644
--- a/inference-engine/thirdparty/clDNN/src/include/reshape_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/reshape_inst.h
@@ -4,9 +4,9 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/reshape.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
 #include "primitive_inst.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 #include <string>
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/include/reverse_sequence_inst.h b/inference-engine/thirdparty/clDNN/src/include/reverse_sequence_inst.h
index a532814fc34..6c2a814f325 100644
--- a/inference-engine/thirdparty/clDNN/src/include/reverse_sequence_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/reverse_sequence_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/reverse_sequence.hpp"
+#include "intel_gpu/primitives/reverse_sequence.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/roi_align_inst.h b/inference-engine/thirdparty/clDNN/src/include/roi_align_inst.h
index 785387727b1..3c784e3ec40 100644
--- a/inference-engine/thirdparty/clDNN/src/include/roi_align_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/roi_align_inst.h
@@ -3,9 +3,9 @@
 //
 #pragma once
 
-#include <cldnn/primitives/roi_align.hpp>
+#include <intel_gpu/primitives/roi_align.hpp>
 #include "primitive_inst.h"
-#include <cldnn/runtime/error_handler.hpp>
+#include <intel_gpu/runtime/error_handler.hpp>
 
 namespace cldnn {
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/roi_pooling_inst.h b/inference-engine/thirdparty/clDNN/src/include/roi_pooling_inst.h
index 6d3cfcf9f38..75d2eddb487 100644
--- a/inference-engine/thirdparty/clDNN/src/include/roi_pooling_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/roi_pooling_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/roi_pooling.hpp"
+#include "intel_gpu/primitives/roi_pooling.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/scale_inst.h b/inference-engine/thirdparty/clDNN/src/include/scale_inst.h
index 6d0a581816a..0538a60345d 100644
--- a/inference-engine/thirdparty/clDNN/src/include/scale_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/scale_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/scale.hpp"
+#include "intel_gpu/primitives/scale.hpp"
 #include "primitive_inst.h"
 #include "kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_base.h"
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/scatter_elements_update_inst.h b/inference-engine/thirdparty/clDNN/src/include/scatter_elements_update_inst.h
index 00f994cada0..eddbaa99b22 100644
--- a/inference-engine/thirdparty/clDNN/src/include/scatter_elements_update_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/scatter_elements_update_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/scatter_elements_update.hpp"
+#include "intel_gpu/primitives/scatter_elements_update.hpp"
 #include "primitive_inst.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/scatter_nd_update_inst.h b/inference-engine/thirdparty/clDNN/src/include/scatter_nd_update_inst.h
index 725fb42a26f..09fe6c775ee 100644
--- a/inference-engine/thirdparty/clDNN/src/include/scatter_nd_update_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/scatter_nd_update_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/scatter_nd_update.hpp"
+#include "intel_gpu/primitives/scatter_nd_update.hpp"
 #include "primitive_inst.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/scatter_update_inst.h b/inference-engine/thirdparty/clDNN/src/include/scatter_update_inst.h
index b02bfd51568..03e6ff90ae5 100644
--- a/inference-engine/thirdparty/clDNN/src/include/scatter_update_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/scatter_update_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/scatter_update.hpp"
+#include "intel_gpu/primitives/scatter_update.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/select_inst.h b/inference-engine/thirdparty/clDNN/src/include/select_inst.h
index 3ed53f20a16..b25e6da7db0 100644
--- a/inference-engine/thirdparty/clDNN/src/include/select_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/select_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/select.hpp"
+#include "intel_gpu/primitives/select.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/shuffle_channels_inst.h b/inference-engine/thirdparty/clDNN/src/include/shuffle_channels_inst.h
index c1a1a6ecbb3..72f0e839904 100644
--- a/inference-engine/thirdparty/clDNN/src/include/shuffle_channels_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/shuffle_channels_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/shuffle_channels.hpp"
+#include "intel_gpu/primitives/shuffle_channels.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/sliding_window_utils.h b/inference-engine/thirdparty/clDNN/src/include/sliding_window_utils.h
index 398802671af..66380414f1b 100644
--- a/inference-engine/thirdparty/clDNN/src/include/sliding_window_utils.h
+++ b/inference-engine/thirdparty/clDNN/src/include/sliding_window_utils.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "cldnn/runtime/layout.hpp"
-#include "cldnn/runtime/tensor.hpp"
+#include "intel_gpu/runtime/layout.hpp"
+#include "intel_gpu/runtime/tensor.hpp"
 
 #include "meta_utils.h"
 
diff --git a/inference-engine/thirdparty/clDNN/src/include/softmax_inst.h b/inference-engine/thirdparty/clDNN/src/include/softmax_inst.h
index c663e59672d..2bf29735054 100644
--- a/inference-engine/thirdparty/clDNN/src/include/softmax_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/softmax_inst.h
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include "cldnn/primitives/softmax.hpp"
+#include "intel_gpu/primitives/softmax.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/space_to_batch_inst.h b/inference-engine/thirdparty/clDNN/src/include/space_to_batch_inst.h
index 073be33bafd..ad40abf48c6 100644
--- a/inference-engine/thirdparty/clDNN/src/include/space_to_batch_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/space_to_batch_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/space_to_batch.hpp"
+#include "intel_gpu/primitives/space_to_batch.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/space_to_depth_inst.h b/inference-engine/thirdparty/clDNN/src/include/space_to_depth_inst.h
index 8447e99d98b..e173d7b6ab7 100644
--- a/inference-engine/thirdparty/clDNN/src/include/space_to_depth_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/space_to_depth_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/space_to_depth.hpp"
+#include "intel_gpu/primitives/space_to_depth.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/split_inst.h b/inference-engine/thirdparty/clDNN/src/include/split_inst.h
index d78959f23b0..3de8a0afadb 100644
--- a/inference-engine/thirdparty/clDNN/src/include/split_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/split_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/split.hpp"
+#include "intel_gpu/primitives/split.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/strided_slice_inst.h b/inference-engine/thirdparty/clDNN/src/include/strided_slice_inst.h
index dfa60799b4e..a1af393d7c1 100644
--- a/inference-engine/thirdparty/clDNN/src/include/strided_slice_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/strided_slice_inst.h
@@ -5,9 +5,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/strided_slice.hpp"
+#include "intel_gpu/primitives/strided_slice.hpp"
 #include "primitive_inst.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 #include <string>
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/include/tile_inst.h b/inference-engine/thirdparty/clDNN/src/include/tile_inst.h
index 6bb942e9435..f43ed671695 100644
--- a/inference-engine/thirdparty/clDNN/src/include/tile_inst.h
+++ b/inference-engine/thirdparty/clDNN/src/include/tile_inst.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/primitives/tile.hpp"
+#include "intel_gpu/primitives/tile.hpp"
 #include "primitive_inst.h"
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h b/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h
index 44460add1d8..66975629a08 100644
--- a/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h
+++ b/inference-engine/thirdparty/clDNN/src/include/to_string_utils.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "cldnn/runtime/tensor.hpp"
-#include "cldnn/runtime/layout.hpp"
-#include "cldnn/runtime/device.hpp"
-#include "cldnn/primitives/primitive.hpp"
+#include "intel_gpu/runtime/tensor.hpp"
+#include "intel_gpu/runtime/layout.hpp"
+#include "intel_gpu/runtime/device.hpp"
+#include "intel_gpu/primitives/primitive.hpp"
 
 
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/input_layout.cpp b/inference-engine/thirdparty/clDNN/src/input_layout.cpp
index 58dd4591ddd..297ce92b9b6 100644
--- a/inference-engine/thirdparty/clDNN/src/input_layout.cpp
+++ b/inference-engine/thirdparty/clDNN/src/input_layout.cpp
@@ -5,8 +5,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "input_layout_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/kernel_runner.cpp b/inference-engine/thirdparty/clDNN/src/kernel_runner.cpp
index b5137ae1d49..3d287c1a105 100644
--- a/inference-engine/thirdparty/clDNN/src/kernel_runner.cpp
+++ b/inference-engine/thirdparty/clDNN/src/kernel_runner.cpp
@@ -6,7 +6,7 @@
 
 #include "kernel_runner.h"
 #include "runtime/kernels_cache.hpp"
-#include "cldnn/runtime/stream.hpp"
+#include "intel_gpu/runtime/stream.hpp"
 #include "weight_bias_params.h"
 #include "kernel_selector_helper.h"
 #include <chrono>
diff --git a/inference-engine/thirdparty/clDNN/src/kernel_runner.h b/inference-engine/thirdparty/clDNN/src/kernel_runner.h
index 53eadc90956..2824c96ea4e 100644
--- a/inference-engine/thirdparty/clDNN/src/kernel_runner.h
+++ b/inference-engine/thirdparty/clDNN/src/kernel_runner.h
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 #include "kernel_selector_common.h"
 #include "kernel_selector_helper.h"
 #include "kernel_runner_interface.h"
diff --git a/inference-engine/thirdparty/clDNN/src/kernel_selector_helper.cpp b/inference-engine/thirdparty/clDNN/src/kernel_selector_helper.cpp
index ec75b2e6047..f2d26b1ffa6 100644
--- a/inference-engine/thirdparty/clDNN/src/kernel_selector_helper.cpp
+++ b/inference-engine/thirdparty/clDNN/src/kernel_selector_helper.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 
 #include "kernel_selector_helper.h"
 #include "kernel_selector_params.h"
diff --git a/inference-engine/thirdparty/clDNN/src/layout_optimizer.cpp b/inference-engine/thirdparty/clDNN/src/layout_optimizer.cpp
index 10cc5ddddd1..bb564c50cdd 100644
--- a/inference-engine/thirdparty/clDNN/src/layout_optimizer.cpp
+++ b/inference-engine/thirdparty/clDNN/src/layout_optimizer.cpp
@@ -5,7 +5,7 @@
 #include "layout_optimizer.h"
 #include "primitive_inst.h"
 #include "program_helpers.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 
 #include "data_inst.h"
 #include "reorder_inst.h"
diff --git a/inference-engine/thirdparty/clDNN/src/loop.cpp b/inference-engine/thirdparty/clDNN/src/loop.cpp
index d36f9476bcb..8f681e2f789 100644
--- a/inference-engine/thirdparty/clDNN/src/loop.cpp
+++ b/inference-engine/thirdparty/clDNN/src/loop.cpp
@@ -7,8 +7,8 @@
 
 #include "json_object.h"
 #include "primitive_type_base.h"
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
 #include <string>
 #include <exception>
 #include <algorithm>
diff --git a/inference-engine/thirdparty/clDNN/src/lrn.cpp b/inference-engine/thirdparty/clDNN/src/lrn.cpp
index dd598660616..0a1766d3a0c 100644
--- a/inference-engine/thirdparty/clDNN/src/lrn.cpp
+++ b/inference-engine/thirdparty/clDNN/src/lrn.cpp
@@ -4,7 +4,7 @@
 
 #include "lrn_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/lstm.cpp b/inference-engine/thirdparty/clDNN/src/lstm.cpp
index a7113fdd3ae..8c310d41dec 100644
--- a/inference-engine/thirdparty/clDNN/src/lstm.cpp
+++ b/inference-engine/thirdparty/clDNN/src/lstm.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "lstm_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/lstm_dynamic.cpp b/inference-engine/thirdparty/clDNN/src/lstm_dynamic.cpp
index a6f02c7501f..9a2462009e1 100644
--- a/inference-engine/thirdparty/clDNN/src/lstm_dynamic.cpp
+++ b/inference-engine/thirdparty/clDNN/src/lstm_dynamic.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "lstm_dynamic_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/lstm_dynamic_input.cpp b/inference-engine/thirdparty/clDNN/src/lstm_dynamic_input.cpp
index d24a965dda1..23d24b4bab5 100644
--- a/inference-engine/thirdparty/clDNN/src/lstm_dynamic_input.cpp
+++ b/inference-engine/thirdparty/clDNN/src/lstm_dynamic_input.cpp
@@ -6,7 +6,7 @@
 #include "lstm_dynamic_input_inst.h"
 #include "lstm_dynamic_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/lstm_dynamic_timeloop.cpp b/inference-engine/thirdparty/clDNN/src/lstm_dynamic_timeloop.cpp
index 7ece007c67d..6b706ecb19d 100644
--- a/inference-engine/thirdparty/clDNN/src/lstm_dynamic_timeloop.cpp
+++ b/inference-engine/thirdparty/clDNN/src/lstm_dynamic_timeloop.cpp
@@ -6,7 +6,7 @@
 #include "lstm_dynamic_timeloop_inst.h"
 #include "lstm_dynamic_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/lstm_elt.cpp b/inference-engine/thirdparty/clDNN/src/lstm_elt.cpp
index 494988887bf..61d61bd09ad 100644
--- a/inference-engine/thirdparty/clDNN/src/lstm_elt.cpp
+++ b/inference-engine/thirdparty/clDNN/src/lstm_elt.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "lstm_elt_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/lstm_gemm.cpp b/inference-engine/thirdparty/clDNN/src/lstm_gemm.cpp
index 87180e6cfd8..a324c47b3b3 100644
--- a/inference-engine/thirdparty/clDNN/src/lstm_gemm.cpp
+++ b/inference-engine/thirdparty/clDNN/src/lstm_gemm.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "lstm_gemm_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/max_unpooling.cpp b/inference-engine/thirdparty/clDNN/src/max_unpooling.cpp
index 5d1f84e3f89..62c1078433b 100644
--- a/inference-engine/thirdparty/clDNN/src/max_unpooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/max_unpooling.cpp
@@ -5,7 +5,7 @@
 #include "max_unpooling_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/mutable_data.cpp b/inference-engine/thirdparty/clDNN/src/mutable_data.cpp
index afc6c8ed95e..d8bb3db53fe 100644
--- a/inference-engine/thirdparty/clDNN/src/mutable_data.cpp
+++ b/inference-engine/thirdparty/clDNN/src/mutable_data.cpp
@@ -5,9 +5,9 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "mutable_data_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 #include <random>
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 #include <memory>
diff --git a/inference-engine/thirdparty/clDNN/src/network.cpp b/inference-engine/thirdparty/clDNN/src/network.cpp
index 18bf78981cd..98b3a3160a3 100644
--- a/inference-engine/thirdparty/clDNN/src/network.cpp
+++ b/inference-engine/thirdparty/clDNN/src/network.cpp
@@ -4,19 +4,19 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/primitives/input_layout.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/input_layout.hpp"
 
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/event.hpp"
-#include "cldnn/runtime/stream.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/event.hpp"
+#include "intel_gpu/runtime/stream.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
-#include "cldnn/graph/program.hpp"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/graph/program.hpp"
+#include "intel_gpu/graph/network.hpp"
 
 #include "to_string_utils.h"
 #include "primitive_inst.h"
diff --git a/inference-engine/thirdparty/clDNN/src/nodes_ordering.cpp b/inference-engine/thirdparty/clDNN/src/nodes_ordering.cpp
index 160edccfef2..f062903c234 100644
--- a/inference-engine/thirdparty/clDNN/src/nodes_ordering.cpp
+++ b/inference-engine/thirdparty/clDNN/src/nodes_ordering.cpp
@@ -4,9 +4,9 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "program_node.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include <vector>
 #include <map>
 #include <algorithm>
diff --git a/inference-engine/thirdparty/clDNN/src/normalize.cpp b/inference-engine/thirdparty/clDNN/src/normalize.cpp
index 55fe2cac122..28cd6793599 100644
--- a/inference-engine/thirdparty/clDNN/src/normalize.cpp
+++ b/inference-engine/thirdparty/clDNN/src/normalize.cpp
@@ -4,7 +4,7 @@
 
 #include "normalize_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/one_hot.cpp b/inference-engine/thirdparty/clDNN/src/one_hot.cpp
index 93820d3c4dc..437f684384d 100644
--- a/inference-engine/thirdparty/clDNN/src/one_hot.cpp
+++ b/inference-engine/thirdparty/clDNN/src/one_hot.cpp
@@ -4,7 +4,7 @@
 
 #include "one_hot_inst.h"
 
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "primitive_type_base.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/pass_manager.cpp b/inference-engine/thirdparty/clDNN/src/pass_manager.cpp
index 2a1af23a4c0..c23608cb933 100644
--- a/inference-engine/thirdparty/clDNN/src/pass_manager.cpp
+++ b/inference-engine/thirdparty/clDNN/src/pass_manager.cpp
@@ -4,7 +4,7 @@
 
 #include "pass_manager.h"
 #include "program_dump_graph.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 
 #include <chrono>
 #include <ctime>
diff --git a/inference-engine/thirdparty/clDNN/src/permute.cpp b/inference-engine/thirdparty/clDNN/src/permute.cpp
index 7909c426077..35128428844 100644
--- a/inference-engine/thirdparty/clDNN/src/permute.cpp
+++ b/inference-engine/thirdparty/clDNN/src/permute.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "permute_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 
 #include <algorithm>
diff --git a/inference-engine/thirdparty/clDNN/src/pooling.cpp b/inference-engine/thirdparty/clDNN/src/pooling.cpp
index f7fa2c662f6..f3be62db63b 100644
--- a/inference-engine/thirdparty/clDNN/src/pooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/pooling.cpp
@@ -5,7 +5,7 @@
 #include "pooling_inst.h"
 #include "primitive_type_base.h"
 #include "sliding_window_utils.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/primitive_inst.cpp b/inference-engine/thirdparty/clDNN/src/primitive_inst.cpp
index ed6d4c6a554..cd63c4647c3 100644
--- a/inference-engine/thirdparty/clDNN/src/primitive_inst.cpp
+++ b/inference-engine/thirdparty/clDNN/src/primitive_inst.cpp
@@ -9,12 +9,12 @@
 #include "input_layout_inst.h"
 #include "arg_max_min_inst.h"
 
-#include "cldnn/graph/network.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/graph/network.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 #include "json_object.h"
 #include <string>
 #include <stack>
diff --git a/inference-engine/thirdparty/clDNN/src/prior_box.cpp b/inference-engine/thirdparty/clDNN/src/prior_box.cpp
index 59bd9e8d5f7..d27b94ff748 100644
--- a/inference-engine/thirdparty/clDNN/src/prior_box.cpp
+++ b/inference-engine/thirdparty/clDNN/src/prior_box.cpp
@@ -4,7 +4,7 @@
 
 #include "prior_box_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 
 #include <cmath>
diff --git a/inference-engine/thirdparty/clDNN/src/program.cpp b/inference-engine/thirdparty/clDNN/src/program.cpp
index 895b2213ef0..9a4bd27cc6b 100644
--- a/inference-engine/thirdparty/clDNN/src/program.cpp
+++ b/inference-engine/thirdparty/clDNN/src/program.cpp
@@ -4,11 +4,11 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "cldnn/runtime/error_handler.hpp"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
+#include "intel_gpu/graph/program.hpp"
 
 #include "kernel_selector_helper.h"
 #include "device_cache_reader.h"
diff --git a/inference-engine/thirdparty/clDNN/src/program_helpers.cpp b/inference-engine/thirdparty/clDNN/src/program_helpers.cpp
index 3701f7f17d9..e4fa2685495 100644
--- a/inference-engine/thirdparty/clDNN/src/program_helpers.cpp
+++ b/inference-engine/thirdparty/clDNN/src/program_helpers.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "program_helpers.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "data_inst.h"
 #include <algorithm>
 #include <utility>
diff --git a/inference-engine/thirdparty/clDNN/src/program_node.cpp b/inference-engine/thirdparty/clDNN/src/program_node.cpp
index b2b432e8cfd..56bac3b47e3 100644
--- a/inference-engine/thirdparty/clDNN/src/program_node.cpp
+++ b/inference-engine/thirdparty/clDNN/src/program_node.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "program_node.h"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "primitive_inst.h"
 
 #ifdef ENABLE_ONEDNN_FOR_GPU
diff --git a/inference-engine/thirdparty/clDNN/src/pyramid_roi_align.cpp b/inference-engine/thirdparty/clDNN/src/pyramid_roi_align.cpp
index 3bd092abf48..ee28bc51ab7 100644
--- a/inference-engine/thirdparty/clDNN/src/pyramid_roi_align.cpp
+++ b/inference-engine/thirdparty/clDNN/src/pyramid_roi_align.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "pyramid_roi_align_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/quantize.cpp b/inference-engine/thirdparty/clDNN/src/quantize.cpp
index 49991b80ddd..6834cf8ace2 100644
--- a/inference-engine/thirdparty/clDNN/src/quantize.cpp
+++ b/inference-engine/thirdparty/clDNN/src/quantize.cpp
@@ -5,8 +5,8 @@
 #include "quantize_inst.h"
 #include "binary_convolution_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "data_inst.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/reduce.cpp b/inference-engine/thirdparty/clDNN/src/reduce.cpp
index 0570616cad8..a9a57bc5a0d 100644
--- a/inference-engine/thirdparty/clDNN/src/reduce.cpp
+++ b/inference-engine/thirdparty/clDNN/src/reduce.cpp
@@ -5,7 +5,7 @@
 #include "reduce_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "data_inst.h"
 #include <vector>
diff --git a/inference-engine/thirdparty/clDNN/src/reorder.cpp b/inference-engine/thirdparty/clDNN/src/reorder.cpp
index 8ca4ac0f075..688886f4d3c 100644
--- a/inference-engine/thirdparty/clDNN/src/reorder.cpp
+++ b/inference-engine/thirdparty/clDNN/src/reorder.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "reorder_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 
 #include <algorithm>
diff --git a/inference-engine/thirdparty/clDNN/src/resample.cpp b/inference-engine/thirdparty/clDNN/src/resample.cpp
index bf09e57c998..9e988b7c337 100644
--- a/inference-engine/thirdparty/clDNN/src/resample.cpp
+++ b/inference-engine/thirdparty/clDNN/src/resample.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "resample_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include <string>
 #include <src/include/json_object.h>
 
diff --git a/inference-engine/thirdparty/clDNN/src/reshape.cpp b/inference-engine/thirdparty/clDNN/src/reshape.cpp
index b6de6de3b88..c30dba0b7a8 100644
--- a/inference-engine/thirdparty/clDNN/src/reshape.cpp
+++ b/inference-engine/thirdparty/clDNN/src/reshape.cpp
@@ -5,8 +5,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "reshape_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/reverse_sequence.cpp b/inference-engine/thirdparty/clDNN/src/reverse_sequence.cpp
index fcffc6a940d..13e2d939236 100644
--- a/inference-engine/thirdparty/clDNN/src/reverse_sequence.cpp
+++ b/inference-engine/thirdparty/clDNN/src/reverse_sequence.cpp
@@ -5,7 +5,7 @@
 #include "reverse_sequence_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/roi_pooling.cpp b/inference-engine/thirdparty/clDNN/src/roi_pooling.cpp
index caa6dca083d..71dfc32cec3 100644
--- a/inference-engine/thirdparty/clDNN/src/roi_pooling.cpp
+++ b/inference-engine/thirdparty/clDNN/src/roi_pooling.cpp
@@ -4,7 +4,7 @@
 
 #include "roi_pooling_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/scale.cpp b/inference-engine/thirdparty/clDNN/src/scale.cpp
index e7392f3e75a..b33cd524f6e 100644
--- a/inference-engine/thirdparty/clDNN/src/scale.cpp
+++ b/inference-engine/thirdparty/clDNN/src/scale.cpp
@@ -4,7 +4,7 @@
 
 #include "scale_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/scatter_elements_update.cpp b/inference-engine/thirdparty/clDNN/src/scatter_elements_update.cpp
index 8014d1be06d..9a54d6c0935 100644
--- a/inference-engine/thirdparty/clDNN/src/scatter_elements_update.cpp
+++ b/inference-engine/thirdparty/clDNN/src/scatter_elements_update.cpp
@@ -5,7 +5,7 @@
 #include "scatter_elements_update_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/scatter_nd_update.cpp b/inference-engine/thirdparty/clDNN/src/scatter_nd_update.cpp
index f13eeaeded9..a2a77539901 100644
--- a/inference-engine/thirdparty/clDNN/src/scatter_nd_update.cpp
+++ b/inference-engine/thirdparty/clDNN/src/scatter_nd_update.cpp
@@ -5,7 +5,7 @@
 #include "scatter_nd_update_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/scatter_update.cpp b/inference-engine/thirdparty/clDNN/src/scatter_update.cpp
index f0b7a3f18c8..d09df4ed899 100644
--- a/inference-engine/thirdparty/clDNN/src/scatter_update.cpp
+++ b/inference-engine/thirdparty/clDNN/src/scatter_update.cpp
@@ -5,7 +5,7 @@
 #include "scatter_update_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/select.cpp b/inference-engine/thirdparty/clDNN/src/select.cpp
index b4725a5422f..2427e5bc8bc 100644
--- a/inference-engine/thirdparty/clDNN/src/select.cpp
+++ b/inference-engine/thirdparty/clDNN/src/select.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "select_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/shuffle_channels.cpp b/inference-engine/thirdparty/clDNN/src/shuffle_channels.cpp
index 2b1fd5aed8d..03c11205b1a 100644
--- a/inference-engine/thirdparty/clDNN/src/shuffle_channels.cpp
+++ b/inference-engine/thirdparty/clDNN/src/shuffle_channels.cpp
@@ -5,7 +5,7 @@
 #include "shuffle_channels_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/space_to_batch.cpp b/inference-engine/thirdparty/clDNN/src/space_to_batch.cpp
index c8389601648..40d6cc5ada9 100644
--- a/inference-engine/thirdparty/clDNN/src/space_to_batch.cpp
+++ b/inference-engine/thirdparty/clDNN/src/space_to_batch.cpp
@@ -5,7 +5,7 @@
 #include "space_to_batch_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "data_inst.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/space_to_depth.cpp b/inference-engine/thirdparty/clDNN/src/space_to_depth.cpp
index 11a5b14c66e..780b874a26e 100644
--- a/inference-engine/thirdparty/clDNN/src/space_to_depth.cpp
+++ b/inference-engine/thirdparty/clDNN/src/space_to_depth.cpp
@@ -5,7 +5,7 @@
 #include "space_to_depth_inst.h"
 
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/split.cpp b/inference-engine/thirdparty/clDNN/src/split.cpp
index 385323c2a77..b84e9f0273a 100644
--- a/inference-engine/thirdparty/clDNN/src/split.cpp
+++ b/inference-engine/thirdparty/clDNN/src/split.cpp
@@ -4,8 +4,8 @@
 
 #include "split_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/strided_slice.cpp b/inference-engine/thirdparty/clDNN/src/strided_slice.cpp
index 817e5f3c009..7615e48fbb2 100644
--- a/inference-engine/thirdparty/clDNN/src/strided_slice.cpp
+++ b/inference-engine/thirdparty/clDNN/src/strided_slice.cpp
@@ -4,7 +4,7 @@
 
 #include "strided_slice_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include "data_inst.h"
 #include <string>
diff --git a/inference-engine/thirdparty/clDNN/src/tile.cpp b/inference-engine/thirdparty/clDNN/src/tile.cpp
index 0fa1348b198..04074d3d1ab 100644
--- a/inference-engine/thirdparty/clDNN/src/tile.cpp
+++ b/inference-engine/thirdparty/clDNN/src/tile.cpp
@@ -4,8 +4,8 @@
 
 #include "tile_inst.h"
 #include "primitive_type_base.h"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/error_handler.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/error_handler.hpp"
 #include "json_object.h"
 #include <string>
 
diff --git a/inference-engine/thirdparty/clDNN/src/topology.cpp b/inference-engine/thirdparty/clDNN/src/topology.cpp
index 2ba9344b0c7..2e9b63cf7b5 100644
--- a/inference-engine/thirdparty/clDNN/src/topology.cpp
+++ b/inference-engine/thirdparty/clDNN/src/topology.cpp
@@ -4,7 +4,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "cldnn/graph/topology.hpp"
+#include "intel_gpu/graph/topology.hpp"
 #include <vector>
 #include <memory>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/CMakeLists.txt b/inference-engine/thirdparty/clDNN/tests/CMakeLists.txt
index ca83c08ffa9..0bb34fe9e4e 100644
--- a/inference-engine/thirdparty/clDNN/tests/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/tests/CMakeLists.txt
@@ -7,122 +7,57 @@ if(SUGGEST_OVERRIDE_SUPPORTED)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")
 endif()
 
-# ========================================= Name / Output settings =====================================
+set(TARGET_NAME "clDNN_unit_tests64")
 
-set(CLDNN_BUILD__PROJ             "clDNN_unit_tests64")
-set(CLDNN_BUILD__PROJ_LABEL       "${CLDNN_BUILD__PROJ}")
-
-# ========================================= Source/Header files ========================================
-
-set(__CLDNN_Label__main                "")
-file(GLOB __CLDNN_Sources__main
+file(GLOB_RECURSE SOURCES_MAIN
     "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
   )
 
-set(__CLDNN_Directory__test_cases      "${CMAKE_CURRENT_SOURCE_DIR}/test_cases")
-set(__CLDNN_Label__test_cases          "test cases")
-file(GLOB __CLDNN_Sources__test_cases
-    "${__CLDNN_Directory__test_cases}/*.h"
-    "${__CLDNN_Directory__test_cases}/*.hpp"
-    "${__CLDNN_Directory__test_cases}/*.cpp"
-  )
-
-set(__CLDNN_Directory__test_utils      "${CMAKE_CURRENT_SOURCE_DIR}/test_utils")
-set(__CLDNN_Label__test_utils          "test utils")
-file(GLOB __CLDNN_Sources__test_utils
-    "${__CLDNN_Directory__test_utils}/*.h"
-    "${__CLDNN_Directory__test_utils}/*.hpp"
-    "${__CLDNN_Directory__test_utils}/*.cpp"
-  )
-
-set(__CLDNN_Directory__module_tests      "${CMAKE_CURRENT_SOURCE_DIR}/module_tests")
-set(__CLDNN_Label__module_tests          "module tests")
-file(GLOB __CLDNN_Sources__module_tests
-    "${__CLDNN_Directory__module_tests}/*.h"
-    "${__CLDNN_Directory__module_tests}/*.hpp"
-    "${__CLDNN_Directory__module_tests}/*.cpp"
-  )
-
 if (MSVC)
-  file(GLOB __CLDNN_Sources__natvis
+  file(GLOB SOURCES_NATVIS
     "${CMAKE_CURRENT_SOURCE_DIR}/float16.natvis"
   )
 endif()
 
-set(__CLDNN_Directory__ks_main           "${CLDNN__KERNEL_SELECTOR_DIR}")
-set(__CLDNN_Directory__ks_core           "${CLDNN__KERNEL_SELECTOR_DIR}/core")
-set(__CLDNN_Directory__ks_common         "${CLDNN__KERNEL_SELECTOR_DIR}/common")
-set(__CLDNN_Directory__ks_core_common    "${__CLDNN_Directory__ks_core}/common")
-set(__CLDNN_Directory__ks_actual_kernels "${__CLDNN_Directory__ks_core}/actual_kernels")
-set(__CLDNN_Directory__ks_cache          "${__CLDNN_Directory__ks_core}/cache")
-
-set(__CLDNN_AllSources
-    ${__CLDNN_Sources__main}
-    ${__CLDNN_Sources__test_cases}
-    ${__CLDNN_Sources__test_utils}
-    ${__CLDNN_Sources__module_tests}
-    ${__CLDNN_Sources__natvis}
+set(SOURCES_ALL
+    ${SOURCES_MAIN}
+    ${SOURCES_NATVIS}
   )
 
-# =============================================== Filters ==============================================
-
-source_group("${__CLDNN_Label__main}"         FILES ${__CLDNN_Sources__main})
-source_group("${__CLDNN_Label__test_cases}"   FILES ${__CLDNN_Sources__test_cases})
-source_group("${__CLDNN_Label__test_utils}"   FILES ${__CLDNN_Sources__test_utils})
-source_group("${__CLDNN_Label__module_tests}" FILES ${__CLDNN_Sources__module_tests})
-
-# ===================================== Include/Link directories =======================================
-
-include_directories(
-    "${CLDNN__MAIN_DIR}"
-    "${CLDNN__MAIN_DIR}/src"
-    "${CLDNN__MAIN_DIR}/src/include/"
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${CLDNN__RUNTIME_DIR}"
-    "${__CLDNN_Directory__test_utils}"
-    "${__CLDNN_Directory__ks_core}"
-    "${__CLDNN_Directory__ks_core}/common"
-    "${__CLDNN_Directory__ks_actual_kernels}"
-    "${__CLDNN_Directory__ks_common}"
-  )
-
-# =================================== Link targets and dependencies ====================================
-
-# Tests executable.
-add_executable("${CLDNN_BUILD__PROJ}"
-    ${__CLDNN_AllSources}
-  )
+add_executable(${TARGET_NAME} ${SOURCES_ALL})
 
 if(COMMAND set_ie_threading_interface_for)
-  set_ie_threading_interface_for("${CLDNN_BUILD__PROJ}")
+  set_ie_threading_interface_for(${TARGET_NAME})
 endif()
 
 # Workaround to avoid warnings during LTO build
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set_target_properties("${CLDNN_BUILD__PROJ}" PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized")
+    set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized")
 endif()
 
-set_property(TARGET "${CLDNN_BUILD__PROJ}" PROPERTY PROJECT_LABEL "${CLDNN_BUILD__PROJ_LABEL}")
-
-# Set library dependencies
-target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE
-  "${CLDNN_BUILD__PROJ__clDNN}" OpenCL gtest gtest_main gmock)
+target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_graph
+                                             inference_engine
+                                             OpenCL
+                                             gtest
+                                             gtest_main
+                                             gmock)
 
+target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+                                                  ${CMAKE_CURRENT_SOURCE_DIR}/test_utils/
+                                                  $<TARGET_PROPERTY:ov_intel_gpu_kernels,INTERFACE_INCLUDE_DIRECTORIES>
+                                                  $<TARGET_PROPERTY:ov_intel_gpu_runtime,INTERFACE_INCLUDE_DIRECTORIES>)
 if(WIN32)
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE setupapi)
+  target_link_libraries(${TARGET_NAME} PRIVATE setupapi)
 elseif((NOT ANDROID) AND (UNIX))
-  target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE pthread)
+  target_link_libraries(${TARGET_NAME} PRIVATE pthread)
 endif()
 
-# ======================================================================================================
-
 ie_sse42_optimization_flags(sse4_2_flags)
-set_source_files_properties(${__CLDNN_AllSources}
-  PROPERTIES COMPILE_FLAGS "${sse4_2_flags}")
+set_source_files_properties(${SOURCES_ALL} PROPERTIES COMPILE_FLAGS "${sse4_2_flags}")
 
-install(TARGETS "${CLDNN_BUILD__PROJ}"
-  RUNTIME DESTINATION tests
-  COMPONENT tests
-  EXCLUDE_FROM_ALL)
+install(TARGETS ${TARGET_NAME}
+        RUNTIME DESTINATION tests
+        COMPONENT tests
+        EXCLUDE_FROM_ALL)
diff --git a/inference-engine/thirdparty/clDNN/tests/module_tests/graph_manipulation_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/module_tests/graph_manipulation_gpu_test.cpp
index 71c81d17196..7251ae869f6 100644
--- a/inference-engine/thirdparty/clDNN/tests/module_tests/graph_manipulation_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/module_tests/graph_manipulation_gpu_test.cpp
@@ -4,16 +4,16 @@
 
 #include "test_utils.h"
 
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/memory.hpp"
 
-#include "cldnn/graph/topology.hpp"
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/topology.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "data_inst.h"
 #include "activation_inst.h"
 #include "convolution_inst.h"
 #include "crop_inst.h"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "reshape_inst.h"
 #include "pass_manager.h"
 
diff --git a/inference-engine/thirdparty/clDNN/tests/module_tests/reorder_inputs_test.cpp b/inference-engine/thirdparty/clDNN/tests/module_tests/reorder_inputs_test.cpp
index 434f7159ed9..61fb1c155aa 100644
--- a/inference-engine/thirdparty/clDNN/tests/module_tests/reorder_inputs_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/module_tests/reorder_inputs_test.cpp
@@ -4,12 +4,12 @@
 
 #include "test_utils.h"
 
-#include "cldnn/runtime/engine.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "data_inst.h"
 #include "eltwise_inst.h"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "pass_manager.h"
 #include "to_string_utils.h"
 
diff --git a/inference-engine/thirdparty/clDNN/tests/module_tests/usm_memory_test.cpp b/inference-engine/thirdparty/clDNN/tests/module_tests/usm_memory_test.cpp
index 6e9fd52da2e..88ecf506206 100644
--- a/inference-engine/thirdparty/clDNN/tests/module_tests/usm_memory_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/module_tests/usm_memory_test.cpp
@@ -4,21 +4,21 @@
 
 #include "test_utils.h"
 
-#include "cldnn/runtime/engine.hpp"
-#include "cldnn/runtime/memory.hpp"
-#include "cldnn/runtime/device_query.hpp"
-#include "cldnn/graph/topology.hpp"
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/device_query.hpp"
+#include "intel_gpu/graph/topology.hpp"
 #include "runtime/ocl/ocl_stream.hpp"
 #include "runtime/ocl/ocl_memory.hpp"
 #include "runtime/ocl/ocl_common.hpp"
 #include "runtime/ocl/ocl_base_event.hpp"
 
-#include "cldnn/graph/program.hpp"
+#include "intel_gpu/graph/program.hpp"
 #include "data_inst.h"
 #include "activation_inst.h"
 #include "convolution_inst.h"
 #include "crop_inst.h"
-#include "cldnn/graph/network.hpp"
+#include "intel_gpu/graph/network.hpp"
 #include "reshape_inst.h"
 #include "pass_manager.h"
 #include "program_wrapper.h"
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/activation_simple_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/activation_simple_gpu_test.cpp
index 509108f437f..e2e400ed1d1 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/activation_simple_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/activation_simple_gpu_test.cpp
@@ -4,10 +4,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/activation.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/activation.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 #include <cmath>
 #include <algorithm>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/add_reorders_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/add_reorders_gpu_test.cpp
index e8c18919b84..4c964260db9 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/add_reorders_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/add_reorders_gpu_test.cpp
@@ -4,14 +4,14 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/activation.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/tile.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/activation.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/tile.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/arg_max_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/arg_max_gpu_test.cpp
index 9f5144d1dc1..d3a32cd89f6 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/arg_max_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/arg_max_gpu_test.cpp
@@ -4,10 +4,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/arg_max_min.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/arg_max_min.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/average_unpooling_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/average_unpooling_gpu_test.cpp
index 4530093e3c4..b7cca897816 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/average_unpooling_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/average_unpooling_gpu_test.cpp
@@ -4,12 +4,12 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/average_unpooling.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/pooling.hpp>
-#include <cldnn/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/average_unpooling.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/barriers_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/barriers_test.cpp
index 2b72881c618..504b58e1151 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/barriers_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/barriers_test.cpp
@@ -4,9 +4,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/batch_to_space_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/batch_to_space_gpu_test.cpp
index e3d33ad2507..5d4a28aa1b5 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/batch_to_space_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/batch_to_space_gpu_test.cpp
@@ -4,9 +4,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/batch_to_space.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/batch_to_space.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/binary_convolution_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/binary_convolution_gpu_test.cpp
index 4b1c5223ba2..9e4a0a7d1c1 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/binary_convolution_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/binary_convolution_gpu_test.cpp
@@ -4,10 +4,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/binary_convolution.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/binary_convolution.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <iostream>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/border_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/border_gpu_test.cpp
index d2b3daf1868..2669579c9da 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/border_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/border_gpu_test.cpp
@@ -4,8 +4,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/border.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/border.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/broadcast_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/broadcast_gpu_test.cpp
index 8ae447221ed..dc45cfee5bd 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/broadcast_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/broadcast_gpu_test.cpp
@@ -4,8 +4,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/broadcast.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/broadcast.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/cache_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/cache_test.cpp
index 0c49194320c..5abf2ee0595 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/cache_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/cache_test.cpp
@@ -4,9 +4,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/convolution.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/convolution.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <iostream>
 #include <fstream>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/cl_mem_input_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/cl_mem_input_test.cpp
index 173a950ee62..f64945e74bd 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/cl_mem_input_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/cl_mem_input_test.cpp
@@ -5,10 +5,10 @@
 #include "test_utils.h"
 #include "opencl_helper_instance.hpp"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/activation.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/runtime/device_query.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/activation.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/runtime/device_query.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/command_queue_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/command_queue_test.cpp
index 0fed8ea95e4..e51716de29a 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/command_queue_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/command_queue_test.cpp
@@ -5,8 +5,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "test_utils/test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/arg_max_min.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/arg_max_min.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/concatenation_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/concatenation_gpu_test.cpp
index c83d9473a44..7c894349473 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/concatenation_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/concatenation_gpu_test.cpp
@@ -6,10 +6,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/convolution.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/convolution.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 #include <algorithm>
 #include <cmath>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/condition_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/condition_gpu_test.cpp
index c8c066e4948..942687b1c23 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/condition_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/condition_gpu_test.cpp
@@ -6,13 +6,13 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/primitives/pooling.hpp>
-#include <cldnn/primitives/condition.hpp>
-#include <cldnn/primitives/softmax.hpp>
-#include <cldnn/primitives/scale.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
+#include <intel_gpu/primitives/condition.hpp>
+#include <intel_gpu/primitives/softmax.hpp>
+#include <intel_gpu/primitives/scale.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/convolution_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/convolution_gpu_test.cpp
index 02a626bb21a..607164c7799 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/convolution_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/convolution_gpu_test.cpp
@@ -6,12 +6,12 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/convolution.hpp>
-#include <cldnn/primitives/eltwise.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/crop.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/convolution.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/crop.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 #include <algorithm>
 #include <array>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/crop_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/crop_gpu_test.cpp
index 3d7a7440250..bf83a402e63 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/crop_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/crop_gpu_test.cpp
@@ -5,10 +5,10 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/crop.hpp>
-#include <cldnn/primitives/eltwise.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/crop.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/cum_sum_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/cum_sum_gpu_test.cpp
index 24cf8229ed6..2c0e37f1bd7 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/cum_sum_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/cum_sum_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/cum_sum.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/cum_sum.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <algorithm>
 #include <fstream>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/custom_gpu_primitive_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/custom_gpu_primitive_test.cpp
index f93009ee639..40bdada5f22 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/custom_gpu_primitive_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/custom_gpu_primitive_test.cpp
@@ -4,10 +4,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/eltwise.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/custom_gpu_primitive.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/custom_gpu_primitive.hpp>
 
 namespace cldnn
 {
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/debug_config_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/debug_config_gpu_test.cpp
index 4f9fe3d603d..2d75adc5532 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/debug_config_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/debug_config_gpu_test.cpp
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "test_utils/test_utils.h"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/deconvolution_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/deconvolution_gpu_test.cpp
index 1bd73806418..9ee306074d5 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/deconvolution_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/deconvolution_gpu_test.cpp
@@ -6,11 +6,11 @@
 
 #include "test_utils/test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/deconvolution.hpp>
-#include <cldnn/primitives/crop.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/deconvolution.hpp>
+#include <intel_gpu/primitives/crop.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 namespace cldnn {
 template<> struct type_to_data_type<FLOAT16> { static const data_types value = data_types::f16; };
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/depth_concatenate_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/depth_concatenate_gpu_test.cpp
index 00d9894d639..755d4dfcab0 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/depth_concatenate_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/depth_concatenate_gpu_test.cpp
@@ -6,16 +6,16 @@
 
 #include "test_utils/test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/primitives/convolution.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/eltwise.hpp>
-#include <cldnn/primitives/fully_connected.hpp>
-#include <cldnn/primitives/pooling.hpp>
-#include <cldnn/primitives/crop.hpp>
-#include <cldnn/primitives/resample.hpp>
-#include <cldnn/primitives/reshape.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/convolution.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/fully_connected.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
+#include <intel_gpu/primitives/crop.hpp>
+#include <intel_gpu/primitives/resample.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
 
 using namespace cldnn;
 using namespace tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/depth_to_space_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/depth_to_space_gpu_test.cpp
index 8e67dfbb4eb..3c650e75928 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/depth_to_space_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/depth_to_space_gpu_test.cpp
@@ -6,11 +6,11 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/depth_to_space.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/permute.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/depth_to_space.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/permute.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/detection_output_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/detection_output_test.cpp
index 0155673ca0a..7f532954d1e 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/detection_output_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/detection_output_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/detection_output.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/detection_output.hpp>
 
 namespace cldnn {
     template<> struct type_to_data_type<FLOAT16> { static const data_types value = data_types::f16; };
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/eltwise_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/eltwise_gpu_test.cpp
index 4a2281afa13..a151b9de94a 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/eltwise_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/eltwise_gpu_test.cpp
@@ -6,10 +6,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/eltwise.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 namespace cldnn
 {
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/embedding_bag_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/embedding_bag_gpu_test.cpp
index b5be9527e60..a4e0356e082 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/embedding_bag_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/embedding_bag_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/embedding_bag.hpp>
-#include <cldnn/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/embedding_bag.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/experimental_detectron_roi_feature_extractor_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/experimental_detectron_roi_feature_extractor_gpu_test.cpp
index 5a8a17515ad..05c335ac693 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/experimental_detectron_roi_feature_extractor_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/experimental_detectron_roi_feature_extractor_gpu_test.cpp
@@ -4,9 +4,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/experimental_detectron_roi_feature_extractor.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp>
 
 #include <cstddef>
 #include <iostream>
@@ -54,7 +54,7 @@ TEST(experimental_detectron_roi_feature_extractor_gpu_fp32, one_level) {
                                      7.416667f, 7.75f, 8.083333f, 8.416667f, 8.75f, 9.083334f, 9.166666f, 9.5f,  9.833334f,
                                      4.166667f, 4.5f,  4.833333f, 4.166667f, 4.5f,  4.833333f, 2.083333f, 2.25f, 2.416667f,
                                      10.16667f, 10.5f, 10.83333f, 10.16667f, 10.5f, 10.83333f, 5.083333f, 5.25f, 5.416667f};
-            
+
     std::vector<float>& expected_second_out = rois;
 
     auto output = outputs.at("edrfe").get_memory();
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/extract_image_patches_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/extract_image_patches_gpu_test.cpp
index c627b088d10..1635d87dd60 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/extract_image_patches_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/extract_image_patches_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/extract_image_patches.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/extract_image_patches.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 
 using namespace cldnn;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/fully_connected_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/fully_connected_gpu_test.cpp
index 35d5595f00b..22844430c86 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/fully_connected_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/fully_connected_gpu_test.cpp
@@ -7,10 +7,10 @@
 #include "test_utils.h"
 #include "network_test.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include "cldnn/primitives/fully_connected.hpp"
-#include <cldnn/primitives/quantize.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include "intel_gpu/primitives/fully_connected.hpp"
+#include <intel_gpu/primitives/quantize.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cmath>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/fusings_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/fusings_gpu_test.cpp
index f2defd6e2cb..19ca152ff88 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/fusings_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/fusings_gpu_test.cpp
@@ -4,30 +4,30 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/convolution.hpp>
-#include <cldnn/primitives/quantize.hpp>
-#include <cldnn/primitives/eltwise.hpp>
-#include <cldnn/primitives/fully_connected.hpp>
-#include <cldnn/primitives/gemm.hpp>
-#include <cldnn/primitives/binary_convolution.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/resample.hpp>
-#include <cldnn/primitives/mvn.hpp>
-#include <cldnn/primitives/deconvolution.hpp>
-#include <cldnn/primitives/permute.hpp>
-#include <cldnn/primitives/gather.hpp>
-#include <cldnn/primitives/gather_nd.hpp>
-#include <cldnn/primitives/gather_elements.hpp>
-#include <cldnn/primitives/scatter_update.hpp>
-#include <cldnn/primitives/scatter_nd_update.hpp>
-#include <cldnn/primitives/scatter_elements_update.hpp>
-#include <cldnn/primitives/depth_to_space.hpp>
-#include <cldnn/primitives/space_to_depth.hpp>
-#include <cldnn/primitives/batch_to_space.hpp>
-#include <cldnn/primitives/space_to_batch.hpp>
-#include <cldnn/primitives/reduce.hpp>
-#include <cldnn/primitives/crop.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/convolution.hpp>
+#include <intel_gpu/primitives/quantize.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/fully_connected.hpp>
+#include <intel_gpu/primitives/gemm.hpp>
+#include <intel_gpu/primitives/binary_convolution.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/resample.hpp>
+#include <intel_gpu/primitives/mvn.hpp>
+#include <intel_gpu/primitives/deconvolution.hpp>
+#include <intel_gpu/primitives/permute.hpp>
+#include <intel_gpu/primitives/gather.hpp>
+#include <intel_gpu/primitives/gather_nd.hpp>
+#include <intel_gpu/primitives/gather_elements.hpp>
+#include <intel_gpu/primitives/scatter_update.hpp>
+#include <intel_gpu/primitives/scatter_nd_update.hpp>
+#include <intel_gpu/primitives/scatter_elements_update.hpp>
+#include <intel_gpu/primitives/depth_to_space.hpp>
+#include <intel_gpu/primitives/space_to_depth.hpp>
+#include <intel_gpu/primitives/batch_to_space.hpp>
+#include <intel_gpu/primitives/space_to_batch.hpp>
+#include <intel_gpu/primitives/reduce.hpp>
+#include <intel_gpu/primitives/crop.hpp>
 
 #include <cmath>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/gather_elements_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/gather_elements_gpu_test.cpp
index 034f9f6699a..389d9caf8da 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/gather_elements_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/gather_elements_gpu_test.cpp
@@ -4,11 +4,11 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/gather_elements.hpp>
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/graph/topology.hpp>
-#include <cldnn/graph/network.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/gather_elements.hpp>
+#include <intel_gpu/runtime/memory.hpp>
+#include <intel_gpu/graph/topology.hpp>
+#include <intel_gpu/graph/network.hpp>
 
 #include <cstddef>
 #include <gtest/gtest.h>
@@ -50,54 +50,54 @@ TEST(gather_elements_gpu_fp16, d3283_i2283_a0) {
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfyx, { 2, 2, 8, 3 } }); // indices
 
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9), FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5),
+        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8),
+        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4),
+        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1),
+        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3),
+        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8),
+        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7),
+        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9),
+        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1),
+        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8),
+        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9), FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1),
+        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2),
+        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4),
+        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1),
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(1), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(5), FLOAT16(6), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(8), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(8), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(0), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(0), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(2), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(10), FLOAT16(7), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(9), FLOAT16(3), FLOAT16(0), FLOAT16(7), FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(3), FLOAT16(3), FLOAT16(10), FLOAT16(6), FLOAT16(1), 
+        FLOAT16(0), FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7),
+        FLOAT16(1), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(5), FLOAT16(3),
+        FLOAT16(6), FLOAT16(5), FLOAT16(6), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(6), FLOAT16(1),
+        FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(8), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(8), FLOAT16(4), FLOAT16(4),
+        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(0), FLOAT16(6), FLOAT16(1),
+        FLOAT16(2), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(0), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(3),
+        FLOAT16(6), FLOAT16(9), FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(2), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(10), FLOAT16(7), FLOAT16(10), FLOAT16(2),
+        FLOAT16(9), FLOAT16(3), FLOAT16(0), FLOAT16(7), FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(4),
+        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(3), FLOAT16(3), FLOAT16(10), FLOAT16(6), FLOAT16(1),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(2, 2, 8, 3), axis);
@@ -110,71 +110,71 @@ TEST(gather_elements_gpu_fp16, d2235_i2235_a3) {
     auto input0 = engine.allocate_memory({ data_types::f16, format::bfyx, { 2, 2, 3, 5 } }); // data
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfyx, { 2, 2, 3, 5 } }); // indices
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(7), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(8), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(10), FLOAT16(0), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8),
+        FLOAT16(5), FLOAT16(5), FLOAT16(2),
+        FLOAT16(0), FLOAT16(7), FLOAT16(7),
+        FLOAT16(10), FLOAT16(4), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0), FLOAT16(0),
+        FLOAT16(5), FLOAT16(7), FLOAT16(0),
+        FLOAT16(4), FLOAT16(0), FLOAT16(4),
+        FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1),
+        FLOAT16(7), FLOAT16(4), FLOAT16(7),
+        FLOAT16(10), FLOAT16(8), FLOAT16(2),
+        FLOAT16(0), FLOAT16(8), FLOAT16(3),
+        FLOAT16(6), FLOAT16(8), FLOAT16(10),
+        FLOAT16(4), FLOAT16(2), FLOAT16(10),
+        FLOAT16(7), FLOAT16(8), FLOAT16(7),
+        FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8),
+        FLOAT16(5), FLOAT16(2), FLOAT16(3),
+        FLOAT16(3), FLOAT16(1), FLOAT16(5),
+        FLOAT16(9), FLOAT16(10), FLOAT16(0),
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0),
         FLOAT16(0), FLOAT16(0), FLOAT16(2),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(5), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(0), FLOAT16(9), FLOAT16(0), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(6), FLOAT16(7), FLOAT16(10), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(8), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(8), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(9), 
-        FLOAT16(4), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(3), FLOAT16(3), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(3), FLOAT16(3), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8),
+        FLOAT16(2), FLOAT16(2), FLOAT16(5),
+        FLOAT16(0), FLOAT16(0), FLOAT16(7),
+        FLOAT16(10), FLOAT16(10), FLOAT16(10),
+        FLOAT16(0), FLOAT16(9), FLOAT16(0),
+        FLOAT16(7), FLOAT16(0), FLOAT16(7),
+        FLOAT16(4), FLOAT16(0), FLOAT16(4),
+        FLOAT16(6), FLOAT16(7), FLOAT16(10),
+        FLOAT16(5), FLOAT16(9), FLOAT16(5),
+        FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(8), FLOAT16(2), FLOAT16(2),
+        FLOAT16(8), FLOAT16(8), FLOAT16(8),
+        FLOAT16(8), FLOAT16(6), FLOAT16(10),
+        FLOAT16(4), FLOAT16(10), FLOAT16(10),
+        FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(0), FLOAT16(0), FLOAT16(9),
+        FLOAT16(4), FLOAT16(8), FLOAT16(8),
+        FLOAT16(3), FLOAT16(3), FLOAT16(5),
+        FLOAT16(5), FLOAT16(3), FLOAT16(3),
         FLOAT16(9), FLOAT16(9), FLOAT16(0),
     };
 
@@ -188,93 +188,93 @@ TEST(gather_elements_gpu_fp16, d1329_i1359_an1) {
     auto input0 = engine.allocate_memory({ data_types::f16, format::bfyx, { 1, 3, 2, 9 } }); // data
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfyx, { 1, 3, 5, 9 } }); // indices
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), 
-        FLOAT16(8), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(7), 
-        FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), 
-        FLOAT16(1), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(0), 
-        FLOAT16(8), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(8), 
-        FLOAT16(10), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(0), 
-        FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), 
-        FLOAT16(8), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(3), 
+        FLOAT16(0), FLOAT16(1),
+        FLOAT16(8), FLOAT16(5),
+        FLOAT16(5), FLOAT16(2),
+        FLOAT16(0), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10),
+        FLOAT16(4), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0),
+        FLOAT16(0), FLOAT16(5),
+        FLOAT16(7), FLOAT16(0),
+        FLOAT16(4), FLOAT16(0),
+        FLOAT16(4), FLOAT16(7),
+        FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5),
+        FLOAT16(1), FLOAT16(7),
+        FLOAT16(4), FLOAT16(7),
+        FLOAT16(10), FLOAT16(8),
+        FLOAT16(2), FLOAT16(0),
+        FLOAT16(8), FLOAT16(3),
+        FLOAT16(6), FLOAT16(8),
+        FLOAT16(10), FLOAT16(4),
+        FLOAT16(2), FLOAT16(10),
+        FLOAT16(7), FLOAT16(8),
+        FLOAT16(7), FLOAT16(0),
+        FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4),
+        FLOAT16(8), FLOAT16(5),
+        FLOAT16(2), FLOAT16(3),
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(0), FLOAT16(7), FLOAT16(0), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(7), FLOAT16(7), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(9), FLOAT16(9), 
-        FLOAT16(5), FLOAT16(0), FLOAT16(0), FLOAT16(5), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(4), FLOAT16(7), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(5), FLOAT16(9), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(1), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(8), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(3), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(8), FLOAT16(6), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(10), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(7), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(9), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(2), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(8), 
-        FLOAT16(3), FLOAT16(3), FLOAT16(2), FLOAT16(3), FLOAT16(3), 
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(8),
+        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5),
+        FLOAT16(0), FLOAT16(7), FLOAT16(0), FLOAT16(7), FLOAT16(7),
+        FLOAT16(10), FLOAT16(7), FLOAT16(7), FLOAT16(10), FLOAT16(10),
+        FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(4), FLOAT16(4),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(9), FLOAT16(9),
+        FLOAT16(5), FLOAT16(0), FLOAT16(0), FLOAT16(5), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(4), FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(4), FLOAT16(7),
+        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(10),
+        FLOAT16(5), FLOAT16(9), FLOAT16(5), FLOAT16(9), FLOAT16(5),
+        FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(1), FLOAT16(7),
+        FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(7),
+        FLOAT16(8), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(8),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(8), FLOAT16(8), FLOAT16(3), FLOAT16(8), FLOAT16(8),
+        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(8), FLOAT16(6),
+        FLOAT16(10), FLOAT16(4), FLOAT16(10), FLOAT16(10), FLOAT16(10),
+        FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(10), FLOAT16(10),
+        FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(0), FLOAT16(7), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(6), FLOAT16(9), FLOAT16(9), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(2), FLOAT16(4),
+        FLOAT16(5), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(8),
+        FLOAT16(3), FLOAT16(3), FLOAT16(2), FLOAT16(3), FLOAT16(3),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(1, 3, 5, 9), axis);
@@ -288,66 +288,66 @@ TEST(gather_elements_gpu_fp16, d12853_i12923_a3) {
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfzyx, { 1, 2, 8, 2, 3 } }); // indices
 
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9), FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(6), FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(10), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(3), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(5), FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(9), FLOAT16(4), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(2), FLOAT16(7), FLOAT16(9), FLOAT16(2), FLOAT16(9), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(10), FLOAT16(6), FLOAT16(4), FLOAT16(9), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(9), FLOAT16(3), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(1), FLOAT16(4), FLOAT16(6), FLOAT16(9), FLOAT16(4), FLOAT16(8), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(0), 
-        FLOAT16(7), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(10), FLOAT16(9), FLOAT16(9), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(4), FLOAT16(3), FLOAT16(5), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5),
+        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8),
+        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4),
+        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1),
+        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3),
+        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8),
+        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7),
+        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9),
+        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1),
+        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8),
+        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9), FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1),
+        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2),
+        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4),
+        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1),
+        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(6), FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(10),
+        FLOAT16(1), FLOAT16(2), FLOAT16(3), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(8),
+        FLOAT16(2), FLOAT16(5), FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(9), FLOAT16(4), FLOAT16(1),
+        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(4),
+        FLOAT16(2), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(8), FLOAT16(10),
+        FLOAT16(7), FLOAT16(2), FLOAT16(7), FLOAT16(9), FLOAT16(2), FLOAT16(9), FLOAT16(5), FLOAT16(5),
+        FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(10), FLOAT16(6), FLOAT16(4), FLOAT16(9),
+        FLOAT16(7), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(9), FLOAT16(3), FLOAT16(5), FLOAT16(5),
+        FLOAT16(1), FLOAT16(4), FLOAT16(6), FLOAT16(9), FLOAT16(4), FLOAT16(8), FLOAT16(9), FLOAT16(7),
+        FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(0),
+        FLOAT16(7), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(10), FLOAT16(9), FLOAT16(9),
+        FLOAT16(5), FLOAT16(1), FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(4), FLOAT16(3), FLOAT16(5),
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(2), FLOAT16(4), FLOAT16(3), FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(3), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(4), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(4), FLOAT16(4), FLOAT16(1), FLOAT16(0), FLOAT16(3), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(4), FLOAT16(3), FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(3), FLOAT16(4), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(3), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(3), FLOAT16(3), FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(3), 
-        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(0), FLOAT16(4), 
+        FLOAT16(0), FLOAT16(2), FLOAT16(4), FLOAT16(3), FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(4), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(3), FLOAT16(1), FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(3),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(4), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(3),
+        FLOAT16(4), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(0),
+        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(4), FLOAT16(4), FLOAT16(1), FLOAT16(0), FLOAT16(3),
+        FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(4), FLOAT16(3), FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(3), FLOAT16(4), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(3), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(3), FLOAT16(3), FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(3),
+        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(3),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(0), FLOAT16(4),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(7), FLOAT16(6), FLOAT16(2), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(2), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(0), FLOAT16(10), FLOAT16(5), FLOAT16(3), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(6), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(1), FLOAT16(9), FLOAT16(8), FLOAT16(9), FLOAT16(1), FLOAT16(5), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(6), FLOAT16(2), FLOAT16(7), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(7), FLOAT16(5), FLOAT16(3), FLOAT16(9), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(7), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(9), 
-        FLOAT16(1), FLOAT16(7), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(4), FLOAT16(5), FLOAT16(5), 
+        FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(7), FLOAT16(6), FLOAT16(2), FLOAT16(0), FLOAT16(5),
+        FLOAT16(2), FLOAT16(1), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(2), FLOAT16(0), FLOAT16(5),
+        FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(0), FLOAT16(10), FLOAT16(5), FLOAT16(3), FLOAT16(4),
+        FLOAT16(5), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(5), FLOAT16(4),
+        FLOAT16(6), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(6), FLOAT16(7), FLOAT16(7),
+        FLOAT16(1), FLOAT16(9), FLOAT16(8), FLOAT16(9), FLOAT16(1), FLOAT16(5), FLOAT16(8), FLOAT16(8),
+        FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(2),
+        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(6), FLOAT16(2), FLOAT16(7), FLOAT16(6), FLOAT16(1),
+        FLOAT16(7), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(4),
+        FLOAT16(2), FLOAT16(2), FLOAT16(7), FLOAT16(5), FLOAT16(3), FLOAT16(9), FLOAT16(4), FLOAT16(5),
+        FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(7), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(9),
+        FLOAT16(1), FLOAT16(7), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(4), FLOAT16(5), FLOAT16(5),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(1, 2, 8, 2, 3), axis);
@@ -361,85 +361,85 @@ TEST(gather_elements_gpu_fp16, d25441_i22441_an4) {
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfzyx, { 2, 2, 4, 4, 1 } }); // indices
 
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(6), 
-        FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(10), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(3), FLOAT16(6), 
-        FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(8), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5),
+        FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5),
+        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0),
+        FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7),
+        FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8),
+        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3),
+        FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4),
+        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8),
+        FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5),
+        FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1),
+        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0),
+        FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3),
+        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0),
+        FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5),
+        FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8),
+        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7),
+        FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7),
+        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3),
+        FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9),
+        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4),
+        FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1),
+        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0),
+        FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8),
+        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9),
+        FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1),
+        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4),
+        FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2),
+        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7),
+        FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4),
+        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9),
+        FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1),
+        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(6),
+        FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(10),
+        FLOAT16(1), FLOAT16(2), FLOAT16(3), FLOAT16(6),
+        FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(8),
 
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(2), FLOAT16(4), FLOAT16(3), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(3), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(4), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(1), FLOAT16(0), FLOAT16(3), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(0), FLOAT16(2), FLOAT16(4), 
+        FLOAT16(0), FLOAT16(2), FLOAT16(4), FLOAT16(3),
+        FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(4), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(3), FLOAT16(1), FLOAT16(4), FLOAT16(2),
+        FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(3),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(4),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(3),
+        FLOAT16(4), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(0),
+        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(4),
+        FLOAT16(4), FLOAT16(1), FLOAT16(0), FLOAT16(3),
+        FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(4),
+        FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(4),
+        FLOAT16(3), FLOAT16(0), FLOAT16(2), FLOAT16(4),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(5), 
-        FLOAT16(10), FLOAT16(2), FLOAT16(0), FLOAT16(10), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(1), FLOAT16(5), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(8), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(5), FLOAT16(7), FLOAT16(5), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(6), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(9), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(1), FLOAT16(6), FLOAT16(5), FLOAT16(7), 
-        FLOAT16(5), FLOAT16(2), FLOAT16(6), FLOAT16(6), 
-        FLOAT16(1), FLOAT16(5), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(6), FLOAT16(4), FLOAT16(1), FLOAT16(6), 
-        FLOAT16(2), FLOAT16(6), FLOAT16(5), FLOAT16(7), 
-        FLOAT16(1), FLOAT16(9), FLOAT16(2), FLOAT16(6), 
-        FLOAT16(6), FLOAT16(5), FLOAT16(10), FLOAT16(8), 
+        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(5),
+        FLOAT16(10), FLOAT16(2), FLOAT16(0), FLOAT16(10),
+        FLOAT16(3), FLOAT16(10), FLOAT16(1), FLOAT16(5),
+        FLOAT16(4), FLOAT16(0), FLOAT16(10), FLOAT16(8),
+        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(3),
+        FLOAT16(10), FLOAT16(8), FLOAT16(6), FLOAT16(1),
+        FLOAT16(2), FLOAT16(5), FLOAT16(7), FLOAT16(5),
+        FLOAT16(4), FLOAT16(0), FLOAT16(6), FLOAT16(3),
+        FLOAT16(10), FLOAT16(9), FLOAT16(6), FLOAT16(9),
+        FLOAT16(1), FLOAT16(6), FLOAT16(5), FLOAT16(7),
+        FLOAT16(5), FLOAT16(2), FLOAT16(6), FLOAT16(6),
+        FLOAT16(1), FLOAT16(5), FLOAT16(6), FLOAT16(1),
+        FLOAT16(6), FLOAT16(4), FLOAT16(1), FLOAT16(6),
+        FLOAT16(2), FLOAT16(6), FLOAT16(5), FLOAT16(7),
+        FLOAT16(1), FLOAT16(9), FLOAT16(2), FLOAT16(6),
+        FLOAT16(6), FLOAT16(5), FLOAT16(10), FLOAT16(8),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(2, 2, 4, 4, 1), axis);
@@ -453,133 +453,133 @@ TEST(gather_elements_gpu_fp16, d32843_i12843_a0) {
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfzyx, { 1, 2, 8, 4, 3 } }); // indices
 
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9), FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(6), FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(10), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(3), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(5), FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(9), FLOAT16(4), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(2), FLOAT16(7), FLOAT16(9), FLOAT16(2), FLOAT16(9), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(10), FLOAT16(6), FLOAT16(4), FLOAT16(9), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(9), FLOAT16(3), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(1), FLOAT16(4), FLOAT16(6), FLOAT16(9), FLOAT16(4), FLOAT16(8), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(0), 
-        FLOAT16(7), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(10), FLOAT16(9), FLOAT16(9), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(4), FLOAT16(3), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(4), FLOAT16(5), FLOAT16(8), FLOAT16(4), FLOAT16(2), FLOAT16(10), FLOAT16(1), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(8), FLOAT16(3), FLOAT16(4), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(9), FLOAT16(7), FLOAT16(9), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(8), FLOAT16(6), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(7), FLOAT16(3), FLOAT16(8), FLOAT16(8), FLOAT16(4), FLOAT16(3), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(10), FLOAT16(2), FLOAT16(9), FLOAT16(1), FLOAT16(4), 
-        FLOAT16(6), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(6), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(6), 
-        FLOAT16(0), FLOAT16(6), FLOAT16(2), FLOAT16(3), FLOAT16(7), FLOAT16(1), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(3), FLOAT16(7), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(9), 
-        FLOAT16(8), FLOAT16(6), FLOAT16(8), FLOAT16(3), FLOAT16(1), FLOAT16(5), FLOAT16(3), FLOAT16(6), 
-        FLOAT16(5), FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(2), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(6), FLOAT16(10), FLOAT16(1), FLOAT16(7), FLOAT16(3), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(3), FLOAT16(7), FLOAT16(6), FLOAT16(10), FLOAT16(2), FLOAT16(10), 
-        FLOAT16(2), FLOAT16(9), FLOAT16(7), FLOAT16(5), FLOAT16(8), FLOAT16(0), FLOAT16(1), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(7), FLOAT16(3), FLOAT16(8), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(5), FLOAT16(0), FLOAT16(1), FLOAT16(9), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(6), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(4), FLOAT16(6), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(3), FLOAT16(8), FLOAT16(4), 
-        FLOAT16(7), FLOAT16(3), FLOAT16(0), FLOAT16(1), FLOAT16(5), FLOAT16(8), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(7), FLOAT16(3), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(4), FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(6), FLOAT16(7), FLOAT16(3), 
-        FLOAT16(0), FLOAT16(10), FLOAT16(5), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(7), FLOAT16(5), FLOAT16(0), FLOAT16(1), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(3), FLOAT16(6), FLOAT16(6), FLOAT16(1), FLOAT16(6), FLOAT16(10), FLOAT16(3), FLOAT16(9), 
-        FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(9), FLOAT16(2), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(2), FLOAT16(7), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(6), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(6), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(4), FLOAT16(9), 
-        FLOAT16(1), FLOAT16(10), FLOAT16(0), FLOAT16(0), FLOAT16(5), FLOAT16(8), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(3), FLOAT16(8), FLOAT16(5), FLOAT16(8), FLOAT16(7), FLOAT16(7), FLOAT16(8), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(6), FLOAT16(7), FLOAT16(6), FLOAT16(4), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(7), FLOAT16(1), FLOAT16(8), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(1), FLOAT16(10), 
-        FLOAT16(5), FLOAT16(6), FLOAT16(10), FLOAT16(0), FLOAT16(6), FLOAT16(7), FLOAT16(5), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(5), FLOAT16(8), FLOAT16(0), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(4), FLOAT16(8), FLOAT16(2), FLOAT16(1), FLOAT16(4), FLOAT16(10), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(5), FLOAT16(1), FLOAT16(5), FLOAT16(1), FLOAT16(9), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(3), FLOAT16(7), FLOAT16(6), FLOAT16(9), FLOAT16(8), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(10), FLOAT16(6), FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(4), FLOAT16(5), FLOAT16(3), FLOAT16(1), FLOAT16(2), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(9), FLOAT16(2), FLOAT16(7), FLOAT16(2), FLOAT16(4), FLOAT16(0), FLOAT16(5), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5),
+        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8),
+        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4),
+        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1),
+        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3),
+        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8),
+        FLOAT16(9), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(7),
+        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(6), FLOAT16(9),
+        FLOAT16(4), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(1),
+        FLOAT16(1), FLOAT16(6), FLOAT16(8), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(8),
+        FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(9), FLOAT16(1), FLOAT16(2), FLOAT16(7), FLOAT16(1),
+        FLOAT16(1), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(10), FLOAT16(2),
+        FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(4), FLOAT16(4),
+        FLOAT16(5), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(1),
+        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(6), FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(10),
+        FLOAT16(1), FLOAT16(2), FLOAT16(3), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(6), FLOAT16(8),
+        FLOAT16(2), FLOAT16(5), FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(9), FLOAT16(4), FLOAT16(1),
+        FLOAT16(10), FLOAT16(4), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(4),
+        FLOAT16(2), FLOAT16(1), FLOAT16(8), FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(8), FLOAT16(10),
+        FLOAT16(7), FLOAT16(2), FLOAT16(7), FLOAT16(9), FLOAT16(2), FLOAT16(9), FLOAT16(5), FLOAT16(5),
+        FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(10), FLOAT16(6), FLOAT16(4), FLOAT16(9),
+        FLOAT16(7), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(9), FLOAT16(3), FLOAT16(5), FLOAT16(5),
+        FLOAT16(1), FLOAT16(4), FLOAT16(6), FLOAT16(9), FLOAT16(4), FLOAT16(8), FLOAT16(9), FLOAT16(7),
+        FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(0), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(0),
+        FLOAT16(7), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(10), FLOAT16(9), FLOAT16(9),
+        FLOAT16(5), FLOAT16(1), FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(4), FLOAT16(3), FLOAT16(5),
+        FLOAT16(9), FLOAT16(4), FLOAT16(5), FLOAT16(8), FLOAT16(4), FLOAT16(2), FLOAT16(10), FLOAT16(1),
+        FLOAT16(6), FLOAT16(6), FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(8), FLOAT16(3), FLOAT16(4),
+        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(9), FLOAT16(7), FLOAT16(9), FLOAT16(1), FLOAT16(0),
+        FLOAT16(8), FLOAT16(6), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(4), FLOAT16(10), FLOAT16(10),
+        FLOAT16(4), FLOAT16(2), FLOAT16(7), FLOAT16(3), FLOAT16(8), FLOAT16(8), FLOAT16(4), FLOAT16(3),
+        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(10), FLOAT16(2), FLOAT16(9), FLOAT16(1), FLOAT16(4),
+        FLOAT16(6), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(6), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(6),
+        FLOAT16(0), FLOAT16(6), FLOAT16(2), FLOAT16(3), FLOAT16(7), FLOAT16(1), FLOAT16(8), FLOAT16(5),
+        FLOAT16(6), FLOAT16(6), FLOAT16(3), FLOAT16(7), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(9),
+        FLOAT16(8), FLOAT16(6), FLOAT16(8), FLOAT16(3), FLOAT16(1), FLOAT16(5), FLOAT16(3), FLOAT16(6),
+        FLOAT16(5), FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(2), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(8),
+        FLOAT16(7), FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(7),
+        FLOAT16(4), FLOAT16(6), FLOAT16(10), FLOAT16(1), FLOAT16(7), FLOAT16(3), FLOAT16(5), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0), FLOAT16(3), FLOAT16(7), FLOAT16(6), FLOAT16(10), FLOAT16(2), FLOAT16(10),
+        FLOAT16(2), FLOAT16(9), FLOAT16(7), FLOAT16(5), FLOAT16(8), FLOAT16(0), FLOAT16(1), FLOAT16(7),
+        FLOAT16(7), FLOAT16(4), FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(7), FLOAT16(3), FLOAT16(8),
+        FLOAT16(1), FLOAT16(0), FLOAT16(5), FLOAT16(0), FLOAT16(1), FLOAT16(9), FLOAT16(8), FLOAT16(8),
+        FLOAT16(4), FLOAT16(0), FLOAT16(6), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(4), FLOAT16(2),
+        FLOAT16(4), FLOAT16(6), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(3), FLOAT16(8), FLOAT16(4),
+        FLOAT16(7), FLOAT16(3), FLOAT16(0), FLOAT16(1), FLOAT16(5), FLOAT16(8), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(7), FLOAT16(3), FLOAT16(0), FLOAT16(5), FLOAT16(5), FLOAT16(5),
+        FLOAT16(4), FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(6), FLOAT16(7), FLOAT16(3),
+        FLOAT16(0), FLOAT16(10), FLOAT16(5), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(4), FLOAT16(5),
+        FLOAT16(6), FLOAT16(8), FLOAT16(7), FLOAT16(5), FLOAT16(0), FLOAT16(1), FLOAT16(10), FLOAT16(2),
+        FLOAT16(3), FLOAT16(6), FLOAT16(6), FLOAT16(1), FLOAT16(6), FLOAT16(10), FLOAT16(3), FLOAT16(9),
+        FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(9), FLOAT16(2), FLOAT16(8),
+        FLOAT16(7), FLOAT16(4), FLOAT16(2), FLOAT16(7), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(6),
+        FLOAT16(0), FLOAT16(1), FLOAT16(6), FLOAT16(4), FLOAT16(0), FLOAT16(7), FLOAT16(4), FLOAT16(9),
+        FLOAT16(1), FLOAT16(10), FLOAT16(0), FLOAT16(0), FLOAT16(5), FLOAT16(8), FLOAT16(10), FLOAT16(2),
+        FLOAT16(3), FLOAT16(8), FLOAT16(5), FLOAT16(8), FLOAT16(7), FLOAT16(7), FLOAT16(8), FLOAT16(0),
+        FLOAT16(2), FLOAT16(2), FLOAT16(6), FLOAT16(7), FLOAT16(6), FLOAT16(4), FLOAT16(2), FLOAT16(2),
+        FLOAT16(7), FLOAT16(1), FLOAT16(8), FLOAT16(1), FLOAT16(0), FLOAT16(7), FLOAT16(1), FLOAT16(10),
+        FLOAT16(5), FLOAT16(6), FLOAT16(10), FLOAT16(0), FLOAT16(6), FLOAT16(7), FLOAT16(5), FLOAT16(0),
+        FLOAT16(4), FLOAT16(5), FLOAT16(8), FLOAT16(0), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(3),
+        FLOAT16(4), FLOAT16(8), FLOAT16(2), FLOAT16(1), FLOAT16(4), FLOAT16(10), FLOAT16(10), FLOAT16(2),
+        FLOAT16(0), FLOAT16(1), FLOAT16(5), FLOAT16(1), FLOAT16(5), FLOAT16(1), FLOAT16(9), FLOAT16(4),
+        FLOAT16(4), FLOAT16(3), FLOAT16(7), FLOAT16(6), FLOAT16(9), FLOAT16(8), FLOAT16(9), FLOAT16(7),
+        FLOAT16(4), FLOAT16(10), FLOAT16(6), FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(4), FLOAT16(2),
+        FLOAT16(0), FLOAT16(4), FLOAT16(5), FLOAT16(3), FLOAT16(1), FLOAT16(2), FLOAT16(8), FLOAT16(5),
+        FLOAT16(7), FLOAT16(9), FLOAT16(2), FLOAT16(7), FLOAT16(2), FLOAT16(4), FLOAT16(0), FLOAT16(5),
 
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(8), FLOAT16(5), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(9), FLOAT16(5), FLOAT16(8), FLOAT16(6), FLOAT16(4), 
-        FLOAT16(8), FLOAT16(5), FLOAT16(8), FLOAT16(1), FLOAT16(4), FLOAT16(7), FLOAT16(5), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(8), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(3), 
-        FLOAT16(9), FLOAT16(10), FLOAT16(5), FLOAT16(0), FLOAT16(9), FLOAT16(3), FLOAT16(4), FLOAT16(1), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(3), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(6), FLOAT16(2), FLOAT16(9), FLOAT16(10), FLOAT16(10), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(4), FLOAT16(6), 
-        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(10), FLOAT16(2), FLOAT16(7), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(1), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(3), FLOAT16(2), 
-        FLOAT16(3), FLOAT16(6), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(8), FLOAT16(7), FLOAT16(8), 
-        FLOAT16(0), FLOAT16(6), FLOAT16(2), FLOAT16(9), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(3), FLOAT16(7), FLOAT16(0), FLOAT16(7), FLOAT16(5), FLOAT16(9), 
-        FLOAT16(8), FLOAT16(3), FLOAT16(10), FLOAT16(3), FLOAT16(1), FLOAT16(5), FLOAT16(4), FLOAT16(6), 
-        FLOAT16(4), FLOAT16(5), FLOAT16(6), FLOAT16(4), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(3), FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(1), FLOAT16(5), FLOAT16(10), FLOAT16(3), FLOAT16(1), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(3), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(8), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(10), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(9), FLOAT16(7), FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(6), FLOAT16(8), FLOAT16(2), FLOAT16(7), FLOAT16(3), FLOAT16(5), 
+        FLOAT16(0), FLOAT16(8), FLOAT16(5), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(7),
+        FLOAT16(4), FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(9), FLOAT16(0), FLOAT16(5), FLOAT16(5),
+        FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(9), FLOAT16(5), FLOAT16(8), FLOAT16(6), FLOAT16(4),
+        FLOAT16(8), FLOAT16(5), FLOAT16(8), FLOAT16(1), FLOAT16(4), FLOAT16(7), FLOAT16(5), FLOAT16(0),
+        FLOAT16(0), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(8), FLOAT16(5), FLOAT16(4),
+        FLOAT16(4), FLOAT16(1), FLOAT16(3), FLOAT16(9), FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(3),
+        FLOAT16(9), FLOAT16(10), FLOAT16(5), FLOAT16(0), FLOAT16(9), FLOAT16(3), FLOAT16(4), FLOAT16(1),
+        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(3), FLOAT16(4),
+        FLOAT16(3), FLOAT16(6), FLOAT16(2), FLOAT16(9), FLOAT16(10), FLOAT16(10), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(8),
+        FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(7), FLOAT16(9), FLOAT16(6), FLOAT16(4), FLOAT16(6),
+        FLOAT16(10), FLOAT16(9), FLOAT16(2), FLOAT16(10), FLOAT16(2), FLOAT16(7), FLOAT16(6), FLOAT16(9),
+        FLOAT16(1), FLOAT16(9), FLOAT16(2), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(3), FLOAT16(2),
+        FLOAT16(3), FLOAT16(6), FLOAT16(5), FLOAT16(0), FLOAT16(5), FLOAT16(8), FLOAT16(7), FLOAT16(8),
+        FLOAT16(0), FLOAT16(6), FLOAT16(2), FLOAT16(9), FLOAT16(6), FLOAT16(1), FLOAT16(7), FLOAT16(2),
+        FLOAT16(1), FLOAT16(3), FLOAT16(3), FLOAT16(7), FLOAT16(0), FLOAT16(7), FLOAT16(5), FLOAT16(9),
+        FLOAT16(8), FLOAT16(3), FLOAT16(10), FLOAT16(3), FLOAT16(1), FLOAT16(5), FLOAT16(4), FLOAT16(6),
+        FLOAT16(4), FLOAT16(5), FLOAT16(6), FLOAT16(4), FLOAT16(4), FLOAT16(10), FLOAT16(5), FLOAT16(1),
+        FLOAT16(3), FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(10),
+        FLOAT16(7), FLOAT16(1), FLOAT16(5), FLOAT16(10), FLOAT16(3), FLOAT16(1), FLOAT16(5), FLOAT16(4),
+        FLOAT16(2), FLOAT16(3), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(8), FLOAT16(5), FLOAT16(5),
+        FLOAT16(4), FLOAT16(4), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(10), FLOAT16(4), FLOAT16(2),
+        FLOAT16(2), FLOAT16(9), FLOAT16(7), FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(8), FLOAT16(5),
+        FLOAT16(7), FLOAT16(4), FLOAT16(6), FLOAT16(8), FLOAT16(2), FLOAT16(7), FLOAT16(3), FLOAT16(5),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(1, 2, 8, 4, 3), axis);
@@ -593,396 +593,396 @@ TEST(gather_elements_gpu_fp16, d223442_i226442_a5) {
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfwzyx, { 2, 2, 6, 4, 4, 2 } }); // indices
 
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(7), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(8), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(10), FLOAT16(0), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(10), 
-        FLOAT16(0), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(10), FLOAT16(0), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(9), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(9), FLOAT16(6), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(3), FLOAT16(3), 
-        FLOAT16(5), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(4), FLOAT16(9), FLOAT16(2), 
-        FLOAT16(4), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(10), 
-        FLOAT16(8), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(7), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(3), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(3), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(1), FLOAT16(7), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(6), 
-        FLOAT16(10), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(1), 
-        FLOAT16(6), FLOAT16(2), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(10), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(3), FLOAT16(6), 
-        FLOAT16(1), FLOAT16(7), FLOAT16(6), 
-        FLOAT16(8), FLOAT16(2), FLOAT16(5), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(9), FLOAT16(4), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(1), 
-        FLOAT16(9), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(3), FLOAT16(4), FLOAT16(8), 
-        FLOAT16(10), FLOAT16(7), FLOAT16(2), 
-        FLOAT16(7), FLOAT16(9), FLOAT16(2), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(10), FLOAT16(6), 
-        FLOAT16(4), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(3), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(4), 
-        FLOAT16(6), FLOAT16(9), FLOAT16(4), 
-        FLOAT16(8), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(8), FLOAT16(7), FLOAT16(8), 
-        FLOAT16(0), FLOAT16(9), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(5), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(9), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(4), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(4), FLOAT16(3), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(8), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(10), FLOAT16(1), FLOAT16(6), 
-        FLOAT16(6), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(4), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(2), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(9), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(8), FLOAT16(6), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(7), FLOAT16(3), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(9), FLOAT16(1), FLOAT16(4), 
-        FLOAT16(6), FLOAT16(1), FLOAT16(9), 
-        FLOAT16(1), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(6), FLOAT16(7), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(6), FLOAT16(0), FLOAT16(6), 
-        FLOAT16(2), FLOAT16(3), FLOAT16(7), 
-        FLOAT16(1), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(3), 
-        FLOAT16(7), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(8), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(1), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(5), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(10), 
-        FLOAT16(3), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(6), 
-        FLOAT16(10), FLOAT16(1), FLOAT16(7), 
-        FLOAT16(3), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(3), 
-        FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(9), FLOAT16(7), FLOAT16(5), 
-        FLOAT16(8), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(4), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(3), FLOAT16(8), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8),
+        FLOAT16(5), FLOAT16(5), FLOAT16(2),
+        FLOAT16(0), FLOAT16(7), FLOAT16(7),
+        FLOAT16(10), FLOAT16(4), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0), FLOAT16(0),
+        FLOAT16(5), FLOAT16(7), FLOAT16(0),
+        FLOAT16(4), FLOAT16(0), FLOAT16(4),
+        FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1),
+        FLOAT16(7), FLOAT16(4), FLOAT16(7),
+        FLOAT16(10), FLOAT16(8), FLOAT16(2),
+        FLOAT16(0), FLOAT16(8), FLOAT16(3),
+        FLOAT16(6), FLOAT16(8), FLOAT16(10),
+        FLOAT16(4), FLOAT16(2), FLOAT16(10),
+        FLOAT16(7), FLOAT16(8), FLOAT16(7),
+        FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8),
+        FLOAT16(5), FLOAT16(2), FLOAT16(3),
+        FLOAT16(3), FLOAT16(1), FLOAT16(5),
+        FLOAT16(9), FLOAT16(10), FLOAT16(0),
+        FLOAT16(9), FLOAT16(5), FLOAT16(5),
+        FLOAT16(3), FLOAT16(10), FLOAT16(5),
+        FLOAT16(2), FLOAT16(0), FLOAT16(10),
+        FLOAT16(0), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(10), FLOAT16(5),
+        FLOAT16(5), FLOAT16(10), FLOAT16(0),
+        FLOAT16(8), FLOAT16(8), FLOAT16(9),
+        FLOAT16(1), FLOAT16(0), FLOAT16(7),
+        FLOAT16(9), FLOAT16(6), FLOAT16(8),
+        FLOAT16(7), FLOAT16(10), FLOAT16(9),
+        FLOAT16(2), FLOAT16(3), FLOAT16(3),
+        FLOAT16(5), FLOAT16(6), FLOAT16(9),
+        FLOAT16(4), FLOAT16(9), FLOAT16(2),
+        FLOAT16(4), FLOAT16(5), FLOAT16(5),
+        FLOAT16(3), FLOAT16(1), FLOAT16(1),
+        FLOAT16(6), FLOAT16(8), FLOAT16(0),
+        FLOAT16(5), FLOAT16(5), FLOAT16(10),
+        FLOAT16(8), FLOAT16(6), FLOAT16(9),
+        FLOAT16(6), FLOAT16(9), FLOAT16(1),
+        FLOAT16(2), FLOAT16(7), FLOAT16(1),
+        FLOAT16(1), FLOAT16(3), FLOAT16(0),
+        FLOAT16(4), FLOAT16(0), FLOAT16(7),
+        FLOAT16(10), FLOAT16(2), FLOAT16(1),
+        FLOAT16(3), FLOAT16(9), FLOAT16(7),
+        FLOAT16(1), FLOAT16(7), FLOAT16(4),
+        FLOAT16(4), FLOAT16(5), FLOAT16(1),
+        FLOAT16(6), FLOAT16(9), FLOAT16(6),
+        FLOAT16(10), FLOAT16(6), FLOAT16(1),
+        FLOAT16(10), FLOAT16(4), FLOAT16(1),
+        FLOAT16(6), FLOAT16(2), FLOAT16(5),
+        FLOAT16(5), FLOAT16(10), FLOAT16(1),
+        FLOAT16(2), FLOAT16(3), FLOAT16(6),
+        FLOAT16(1), FLOAT16(7), FLOAT16(6),
+        FLOAT16(8), FLOAT16(2), FLOAT16(5),
+        FLOAT16(4), FLOAT16(2), FLOAT16(0),
+        FLOAT16(9), FLOAT16(4), FLOAT16(1),
+        FLOAT16(10), FLOAT16(4), FLOAT16(1),
+        FLOAT16(9), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(4), FLOAT16(2),
+        FLOAT16(1), FLOAT16(8), FLOAT16(5),
+        FLOAT16(3), FLOAT16(4), FLOAT16(8),
+        FLOAT16(10), FLOAT16(7), FLOAT16(2),
+        FLOAT16(7), FLOAT16(9), FLOAT16(2),
+        FLOAT16(9), FLOAT16(5), FLOAT16(5),
+        FLOAT16(6), FLOAT16(8), FLOAT16(8),
+        FLOAT16(5), FLOAT16(10), FLOAT16(6),
+        FLOAT16(4), FLOAT16(9), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10), FLOAT16(10),
+        FLOAT16(9), FLOAT16(3), FLOAT16(5),
+        FLOAT16(5), FLOAT16(1), FLOAT16(4),
+        FLOAT16(6), FLOAT16(9), FLOAT16(4),
+        FLOAT16(8), FLOAT16(9), FLOAT16(7),
+        FLOAT16(8), FLOAT16(7), FLOAT16(8),
+        FLOAT16(0), FLOAT16(9), FLOAT16(5),
+        FLOAT16(5), FLOAT16(0), FLOAT16(7),
+        FLOAT16(5), FLOAT16(7), FLOAT16(7),
+        FLOAT16(2), FLOAT16(10), FLOAT16(9),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1),
+        FLOAT16(4), FLOAT16(10), FLOAT16(2),
+        FLOAT16(4), FLOAT16(3), FLOAT16(5),
+        FLOAT16(9), FLOAT16(4), FLOAT16(5),
+        FLOAT16(8), FLOAT16(4), FLOAT16(2),
+        FLOAT16(10), FLOAT16(1), FLOAT16(6),
+        FLOAT16(6), FLOAT16(0), FLOAT16(0),
+        FLOAT16(8), FLOAT16(8), FLOAT16(3),
+        FLOAT16(4), FLOAT16(7), FLOAT16(7),
+        FLOAT16(2), FLOAT16(9), FLOAT16(7),
+        FLOAT16(9), FLOAT16(1), FLOAT16(0),
+        FLOAT16(8), FLOAT16(6), FLOAT16(2),
+        FLOAT16(2), FLOAT16(0), FLOAT16(4),
+        FLOAT16(10), FLOAT16(10), FLOAT16(4),
+        FLOAT16(2), FLOAT16(7), FLOAT16(3),
+        FLOAT16(8), FLOAT16(8), FLOAT16(4),
+        FLOAT16(3), FLOAT16(2), FLOAT16(0),
+        FLOAT16(2), FLOAT16(10), FLOAT16(2),
+        FLOAT16(9), FLOAT16(1), FLOAT16(4),
+        FLOAT16(6), FLOAT16(1), FLOAT16(9),
+        FLOAT16(1), FLOAT16(10), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(6), FLOAT16(7), FLOAT16(8),
+        FLOAT16(7), FLOAT16(8), FLOAT16(7),
+        FLOAT16(6), FLOAT16(0), FLOAT16(6),
+        FLOAT16(2), FLOAT16(3), FLOAT16(7),
+        FLOAT16(1), FLOAT16(8), FLOAT16(5),
+        FLOAT16(6), FLOAT16(6), FLOAT16(3),
+        FLOAT16(7), FLOAT16(1), FLOAT16(1),
+        FLOAT16(5), FLOAT16(9), FLOAT16(8),
+        FLOAT16(6), FLOAT16(8), FLOAT16(3),
+        FLOAT16(1), FLOAT16(5), FLOAT16(3),
+        FLOAT16(6), FLOAT16(5), FLOAT16(4),
+        FLOAT16(2), FLOAT16(4), FLOAT16(4),
+        FLOAT16(4), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(0), FLOAT16(4),
+        FLOAT16(2), FLOAT16(7), FLOAT16(7),
+        FLOAT16(5), FLOAT16(8), FLOAT16(7),
+        FLOAT16(10), FLOAT16(5), FLOAT16(10),
+        FLOAT16(3), FLOAT16(5), FLOAT16(5),
+        FLOAT16(7), FLOAT16(4), FLOAT16(6),
+        FLOAT16(10), FLOAT16(1), FLOAT16(7),
+        FLOAT16(3), FLOAT16(5), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0), FLOAT16(3),
+        FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(2), FLOAT16(10), FLOAT16(2),
+        FLOAT16(9), FLOAT16(7), FLOAT16(5),
+        FLOAT16(8), FLOAT16(0), FLOAT16(1),
+        FLOAT16(7), FLOAT16(7), FLOAT16(4),
+        FLOAT16(6), FLOAT16(8), FLOAT16(10),
+        FLOAT16(7), FLOAT16(3), FLOAT16(8),
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0),
+        FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1),
+        FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(1),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(1), FLOAT16(2),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(5), FLOAT16(4), FLOAT16(5), FLOAT16(4), FLOAT16(10), FLOAT16(5), 
-        FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(9), FLOAT16(9), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(0), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(7), FLOAT16(7), FLOAT16(10), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(9), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(8), FLOAT16(8), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(0), FLOAT16(3), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(6), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(8), FLOAT16(6), 
-        FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(10), FLOAT16(2), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(6), FLOAT16(6), FLOAT16(9), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(8), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(5), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(3), FLOAT16(5), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(3), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(9), FLOAT16(0), FLOAT16(10), FLOAT16(9), FLOAT16(0), 
-        FLOAT16(9), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(3), FLOAT16(5), FLOAT16(10), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(0), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(0), 
-        FLOAT16(10), FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(8), FLOAT16(9), FLOAT16(8), FLOAT16(9), FLOAT16(8), FLOAT16(9), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(0), FLOAT16(7), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(8), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(6), 
-        FLOAT16(9), FLOAT16(9), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(2), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(6), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(9), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(8), FLOAT16(8), FLOAT16(6), FLOAT16(6), FLOAT16(0), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(9), FLOAT16(9), FLOAT16(8), FLOAT16(9), 
-        FLOAT16(9), FLOAT16(6), FLOAT16(6), FLOAT16(1), FLOAT16(9), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(7), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(0), FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(10), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(3), FLOAT16(3), FLOAT16(3), FLOAT16(9), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(1), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(9), FLOAT16(9), 
-        FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(10), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(1), FLOAT16(10), FLOAT16(1), FLOAT16(10), FLOAT16(1), FLOAT16(10), 
-        FLOAT16(2), FLOAT16(5), FLOAT16(6), FLOAT16(2), FLOAT16(2), FLOAT16(6), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(1), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(6), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(6), FLOAT16(7), FLOAT16(7), FLOAT16(6), 
-        FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(8), FLOAT16(8), FLOAT16(2), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(1), FLOAT16(9), FLOAT16(4), FLOAT16(9), FLOAT16(9), FLOAT16(4), 
-        FLOAT16(1), FLOAT16(4), FLOAT16(1), FLOAT16(4), FLOAT16(4), FLOAT16(10), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(9), FLOAT16(1), 
-        FLOAT16(4), FLOAT16(4), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(8), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(8), 
-        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(3), FLOAT16(3), FLOAT16(8), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(2), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(9), FLOAT16(9), FLOAT16(9), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(9), FLOAT16(9), FLOAT16(9), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(6), FLOAT16(6), FLOAT16(5), FLOAT16(10), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(9), FLOAT16(7), FLOAT16(7), FLOAT16(9), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(7), FLOAT16(10), FLOAT16(7), FLOAT16(10), 
-        FLOAT16(5), FLOAT16(3), FLOAT16(9), FLOAT16(3), FLOAT16(9), FLOAT16(3), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(1), FLOAT16(4), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(9), FLOAT16(9), FLOAT16(9), FLOAT16(4), FLOAT16(6), FLOAT16(6), 
-        FLOAT16(9), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(7), FLOAT16(9), 
-        FLOAT16(8), FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(2), FLOAT16(9), FLOAT16(2), FLOAT16(9), FLOAT16(9), FLOAT16(10), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(1), FLOAT16(5), FLOAT16(9), 
-        FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(10), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(4), FLOAT16(8), FLOAT16(8), FLOAT16(2), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(1), FLOAT16(10), FLOAT16(6), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(6), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(3), FLOAT16(8), FLOAT16(8), FLOAT16(3), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(4), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(9), FLOAT16(2), FLOAT16(7), FLOAT16(9), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(3), FLOAT16(7), FLOAT16(3), 
-        FLOAT16(4), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), 
-        FLOAT16(3), FLOAT16(0), FLOAT16(3), FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(9), FLOAT16(4), FLOAT16(1), FLOAT16(1), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(6), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(1), 
-        FLOAT16(10), FLOAT16(2), FLOAT16(1), FLOAT16(10), FLOAT16(1), FLOAT16(10), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(8), FLOAT16(6), FLOAT16(6), FLOAT16(8), FLOAT16(6), FLOAT16(6), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(6), FLOAT16(6), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(7), FLOAT16(3), FLOAT16(3), FLOAT16(2), FLOAT16(7), FLOAT16(3), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(9), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(6), FLOAT16(6), FLOAT16(6), 
-        FLOAT16(3), FLOAT16(5), FLOAT16(3), FLOAT16(5), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(6), FLOAT16(5), FLOAT16(4), FLOAT16(5), FLOAT16(6), FLOAT16(5), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(4), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(3), FLOAT16(4), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(5), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(1), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(5), 
-        FLOAT16(0), FLOAT16(9), FLOAT16(3), FLOAT16(9), FLOAT16(0), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(10), FLOAT16(10), FLOAT16(6), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(10), FLOAT16(10), FLOAT16(10), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(9), 
-        FLOAT16(0), FLOAT16(8), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(7), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4), 
-        FLOAT16(8), FLOAT16(10), FLOAT16(8), FLOAT16(6), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(3), FLOAT16(3), FLOAT16(7), FLOAT16(8), FLOAT16(3), FLOAT16(8), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(0),
+        FLOAT16(5), FLOAT16(5), FLOAT16(2), FLOAT16(5), FLOAT16(5), FLOAT16(5),
+        FLOAT16(7), FLOAT16(0), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(5), FLOAT16(4), FLOAT16(5), FLOAT16(4), FLOAT16(10), FLOAT16(5),
+        FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(9), FLOAT16(9),
+        FLOAT16(7), FLOAT16(0), FLOAT16(0), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(0), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4),
+        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(7), FLOAT16(7), FLOAT16(10),
+        FLOAT16(5), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(9),
+        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(2), FLOAT16(10), FLOAT16(8), FLOAT16(8), FLOAT16(2), FLOAT16(2),
+        FLOAT16(8), FLOAT16(8), FLOAT16(0), FLOAT16(3), FLOAT16(0), FLOAT16(0),
+        FLOAT16(6), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(8), FLOAT16(6),
+        FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(10), FLOAT16(2), FLOAT16(10),
+        FLOAT16(7), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(0), FLOAT16(6), FLOAT16(6), FLOAT16(9), FLOAT16(0), FLOAT16(0),
+        FLOAT16(8), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(4), FLOAT16(2),
+        FLOAT16(5), FLOAT16(3), FLOAT16(3), FLOAT16(5), FLOAT16(3), FLOAT16(5),
+        FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(3), FLOAT16(1), FLOAT16(1),
+        FLOAT16(10), FLOAT16(9), FLOAT16(0), FLOAT16(10), FLOAT16(9), FLOAT16(0),
+        FLOAT16(9), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5),
+        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(3), FLOAT16(5), FLOAT16(10),
+        FLOAT16(2), FLOAT16(0), FLOAT16(2), FLOAT16(0), FLOAT16(10), FLOAT16(10),
+        FLOAT16(0), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(0),
+        FLOAT16(10), FLOAT16(3), FLOAT16(5), FLOAT16(5), FLOAT16(10), FLOAT16(10),
+        FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(0), FLOAT16(10), FLOAT16(10),
+        FLOAT16(8), FLOAT16(9), FLOAT16(8), FLOAT16(9), FLOAT16(8), FLOAT16(9),
+        FLOAT16(7), FLOAT16(0), FLOAT16(0), FLOAT16(7), FLOAT16(0), FLOAT16(0),
+        FLOAT16(8), FLOAT16(9), FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(6),
+        FLOAT16(9), FLOAT16(9), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(10),
+        FLOAT16(2), FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(2), FLOAT16(3),
+        FLOAT16(6), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(6), FLOAT16(5),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(9), FLOAT16(4), FLOAT16(4),
+        FLOAT16(5), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(5), FLOAT16(5),
+        FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(8), FLOAT16(8), FLOAT16(6), FLOAT16(6), FLOAT16(0),
+        FLOAT16(10), FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(5), FLOAT16(5),
+        FLOAT16(6), FLOAT16(8), FLOAT16(9), FLOAT16(9), FLOAT16(8), FLOAT16(9),
+        FLOAT16(9), FLOAT16(6), FLOAT16(6), FLOAT16(1), FLOAT16(9), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(1), FLOAT16(7), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(3), FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(0), FLOAT16(4), FLOAT16(4), FLOAT16(7), FLOAT16(4), FLOAT16(0),
+        FLOAT16(10), FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(10), FLOAT16(10),
+        FLOAT16(3), FLOAT16(3), FLOAT16(3), FLOAT16(9), FLOAT16(9), FLOAT16(7),
+        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(1), FLOAT16(4), FLOAT16(4),
+        FLOAT16(4), FLOAT16(4), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(5),
+        FLOAT16(9), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(9), FLOAT16(9),
+        FLOAT16(6), FLOAT16(10), FLOAT16(6), FLOAT16(10), FLOAT16(10), FLOAT16(10),
+        FLOAT16(1), FLOAT16(10), FLOAT16(1), FLOAT16(10), FLOAT16(1), FLOAT16(10),
+        FLOAT16(2), FLOAT16(5), FLOAT16(6), FLOAT16(2), FLOAT16(2), FLOAT16(6),
+        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(1), FLOAT16(10), FLOAT16(10),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(6),
+        FLOAT16(1), FLOAT16(1), FLOAT16(6), FLOAT16(7), FLOAT16(7), FLOAT16(6),
+        FLOAT16(8), FLOAT16(5), FLOAT16(5), FLOAT16(8), FLOAT16(8), FLOAT16(2),
+        FLOAT16(4), FLOAT16(2), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(4),
+        FLOAT16(1), FLOAT16(9), FLOAT16(4), FLOAT16(9), FLOAT16(9), FLOAT16(4),
+        FLOAT16(1), FLOAT16(4), FLOAT16(1), FLOAT16(4), FLOAT16(4), FLOAT16(10),
+        FLOAT16(1), FLOAT16(1), FLOAT16(9), FLOAT16(1), FLOAT16(9), FLOAT16(1),
+        FLOAT16(4), FLOAT16(4), FLOAT16(0), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(8), FLOAT16(1), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(8),
+        FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(3), FLOAT16(3), FLOAT16(8),
+        FLOAT16(10), FLOAT16(10), FLOAT16(7), FLOAT16(10), FLOAT16(10), FLOAT16(2),
+        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(9), FLOAT16(9), FLOAT16(9),
+        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(9), FLOAT16(9), FLOAT16(9),
+        FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8),
+        FLOAT16(5), FLOAT16(6), FLOAT16(6), FLOAT16(5), FLOAT16(10), FLOAT16(5),
+        FLOAT16(7), FLOAT16(9), FLOAT16(7), FLOAT16(7), FLOAT16(9), FLOAT16(7),
+        FLOAT16(10), FLOAT16(10), FLOAT16(7), FLOAT16(10), FLOAT16(7), FLOAT16(10),
+        FLOAT16(5), FLOAT16(3), FLOAT16(9), FLOAT16(3), FLOAT16(9), FLOAT16(3),
+        FLOAT16(5), FLOAT16(1), FLOAT16(1), FLOAT16(4), FLOAT16(4), FLOAT16(4),
+        FLOAT16(9), FLOAT16(9), FLOAT16(9), FLOAT16(4), FLOAT16(6), FLOAT16(6),
+        FLOAT16(9), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(7), FLOAT16(9),
+        FLOAT16(8), FLOAT16(8), FLOAT16(7), FLOAT16(8), FLOAT16(8), FLOAT16(8),
+        FLOAT16(9), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(0), FLOAT16(0),
+        FLOAT16(5), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(2), FLOAT16(9), FLOAT16(2), FLOAT16(9), FLOAT16(9), FLOAT16(10),
+        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(1), FLOAT16(5), FLOAT16(9),
+        FLOAT16(4), FLOAT16(10), FLOAT16(2), FLOAT16(10), FLOAT16(4), FLOAT16(4),
+        FLOAT16(5), FLOAT16(3), FLOAT16(4), FLOAT16(3), FLOAT16(4), FLOAT16(5),
+        FLOAT16(5), FLOAT16(9), FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(4),
+        FLOAT16(4), FLOAT16(8), FLOAT16(8), FLOAT16(2), FLOAT16(4), FLOAT16(4),
+        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(1), FLOAT16(10), FLOAT16(6),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(6), FLOAT16(0), FLOAT16(0),
+        FLOAT16(3), FLOAT16(8), FLOAT16(8), FLOAT16(3), FLOAT16(8), FLOAT16(8),
+        FLOAT16(4), FLOAT16(7), FLOAT16(4), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(9), FLOAT16(2), FLOAT16(7), FLOAT16(9), FLOAT16(7), FLOAT16(7),
+        FLOAT16(9), FLOAT16(0), FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(2), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(0), FLOAT16(2), FLOAT16(0),
+        FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(10),
+        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(3), FLOAT16(7), FLOAT16(3),
+        FLOAT16(4), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8), FLOAT16(8),
+        FLOAT16(3), FLOAT16(0), FLOAT16(3), FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(2), FLOAT16(10), FLOAT16(10), FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(9), FLOAT16(4), FLOAT16(1), FLOAT16(1), FLOAT16(4), FLOAT16(4),
+        FLOAT16(6), FLOAT16(1), FLOAT16(6), FLOAT16(9), FLOAT16(6), FLOAT16(1),
+        FLOAT16(10), FLOAT16(2), FLOAT16(1), FLOAT16(10), FLOAT16(1), FLOAT16(10),
+        FLOAT16(2), FLOAT16(1), FLOAT16(1), FLOAT16(2), FLOAT16(2), FLOAT16(1),
+        FLOAT16(8), FLOAT16(6), FLOAT16(6), FLOAT16(8), FLOAT16(6), FLOAT16(6),
+        FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(0), FLOAT16(0), FLOAT16(6), FLOAT16(6), FLOAT16(0), FLOAT16(0),
+        FLOAT16(7), FLOAT16(3), FLOAT16(3), FLOAT16(2), FLOAT16(7), FLOAT16(3),
+        FLOAT16(5), FLOAT16(1), FLOAT16(1), FLOAT16(5), FLOAT16(8), FLOAT16(5),
+        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(6),
+        FLOAT16(1), FLOAT16(1), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(7),
+        FLOAT16(9), FLOAT16(5), FLOAT16(8), FLOAT16(8), FLOAT16(5), FLOAT16(9),
+        FLOAT16(6), FLOAT16(8), FLOAT16(8), FLOAT16(6), FLOAT16(6), FLOAT16(6),
+        FLOAT16(3), FLOAT16(5), FLOAT16(3), FLOAT16(5), FLOAT16(1), FLOAT16(1),
+        FLOAT16(6), FLOAT16(5), FLOAT16(4), FLOAT16(5), FLOAT16(6), FLOAT16(5),
+        FLOAT16(4), FLOAT16(2), FLOAT16(4), FLOAT16(4), FLOAT16(2), FLOAT16(2),
+        FLOAT16(4), FLOAT16(5), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4),
+        FLOAT16(3), FLOAT16(3), FLOAT16(0), FLOAT16(4), FLOAT16(3), FLOAT16(4),
+        FLOAT16(7), FLOAT16(7), FLOAT16(2), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(5), FLOAT16(7), FLOAT16(8), FLOAT16(7), FLOAT16(5), FLOAT16(5),
+        FLOAT16(10), FLOAT16(5), FLOAT16(10), FLOAT16(10), FLOAT16(10), FLOAT16(5),
+        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(5), FLOAT16(5),
+        FLOAT16(6), FLOAT16(6), FLOAT16(7), FLOAT16(7), FLOAT16(7), FLOAT16(7),
+        FLOAT16(10), FLOAT16(1), FLOAT16(7), FLOAT16(1), FLOAT16(7), FLOAT16(7),
+        FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(5), FLOAT16(3), FLOAT16(5),
+        FLOAT16(0), FLOAT16(9), FLOAT16(3), FLOAT16(9), FLOAT16(0), FLOAT16(3),
+        FLOAT16(6), FLOAT16(6), FLOAT16(6), FLOAT16(10), FLOAT16(10), FLOAT16(6),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2), FLOAT16(10), FLOAT16(10), FLOAT16(10),
+        FLOAT16(5), FLOAT16(9), FLOAT16(7), FLOAT16(7), FLOAT16(5), FLOAT16(9),
+        FLOAT16(0), FLOAT16(8), FLOAT16(0), FLOAT16(1), FLOAT16(1), FLOAT16(8),
+        FLOAT16(7), FLOAT16(7), FLOAT16(4), FLOAT16(4), FLOAT16(4), FLOAT16(4),
+        FLOAT16(8), FLOAT16(10), FLOAT16(8), FLOAT16(6), FLOAT16(10), FLOAT16(8),
+        FLOAT16(3), FLOAT16(3), FLOAT16(7), FLOAT16(8), FLOAT16(3), FLOAT16(8),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(2, 2, 6, 4, 4, 2), axis);
@@ -996,48 +996,48 @@ TEST(gather_elements_gpu_fp16, d124251_i124221_an3) {
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfwzyx, { 1, 2, 4, 2, 2, 1 } }); // indices
 
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4), 
-        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1), 
-        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4), 
-        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5), 
-        FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8), FLOAT16(5),
+        FLOAT16(5), FLOAT16(2), FLOAT16(0), FLOAT16(7),
+        FLOAT16(7), FLOAT16(10), FLOAT16(4), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0), FLOAT16(0), FLOAT16(5),
+        FLOAT16(7), FLOAT16(0), FLOAT16(4), FLOAT16(0),
+        FLOAT16(4), FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1), FLOAT16(7),
+        FLOAT16(4), FLOAT16(7), FLOAT16(10), FLOAT16(8),
+        FLOAT16(2), FLOAT16(0), FLOAT16(8), FLOAT16(3),
+        FLOAT16(6), FLOAT16(8), FLOAT16(10), FLOAT16(4),
+        FLOAT16(2), FLOAT16(10), FLOAT16(7), FLOAT16(8),
+        FLOAT16(7), FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8), FLOAT16(5),
+        FLOAT16(2), FLOAT16(3), FLOAT16(3), FLOAT16(1),
+        FLOAT16(5), FLOAT16(9), FLOAT16(10), FLOAT16(0),
+        FLOAT16(9), FLOAT16(5), FLOAT16(5), FLOAT16(3),
+        FLOAT16(10), FLOAT16(5), FLOAT16(2), FLOAT16(0),
+        FLOAT16(10), FLOAT16(0), FLOAT16(5), FLOAT16(4),
+        FLOAT16(3), FLOAT16(10), FLOAT16(5), FLOAT16(5),
+        FLOAT16(10), FLOAT16(0), FLOAT16(8), FLOAT16(8),
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(2), FLOAT16(4), FLOAT16(3), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(3), FLOAT16(1), FLOAT16(4), FLOAT16(2), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(3), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(4), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(4), 
+        FLOAT16(0), FLOAT16(2), FLOAT16(4), FLOAT16(3),
+        FLOAT16(4), FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(4), FLOAT16(0), FLOAT16(1), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1), FLOAT16(1),
+        FLOAT16(3), FLOAT16(1), FLOAT16(4), FLOAT16(2),
+        FLOAT16(4), FLOAT16(2), FLOAT16(1), FLOAT16(3),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2), FLOAT16(4),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2), FLOAT16(4),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(6), FLOAT16(2), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(2), FLOAT16(0), FLOAT16(5), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(0), 
-        FLOAT16(10), FLOAT16(5), FLOAT16(3), FLOAT16(4), 
-        FLOAT16(5), FLOAT16(4), FLOAT16(10), FLOAT16(5), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(5), FLOAT16(8), 
+        FLOAT16(0), FLOAT16(0), FLOAT16(8), FLOAT16(7),
+        FLOAT16(6), FLOAT16(2), FLOAT16(0), FLOAT16(5),
+        FLOAT16(2), FLOAT16(1), FLOAT16(4), FLOAT16(5),
+        FLOAT16(9), FLOAT16(2), FLOAT16(0), FLOAT16(5),
+        FLOAT16(10), FLOAT16(4), FLOAT16(5), FLOAT16(0),
+        FLOAT16(10), FLOAT16(5), FLOAT16(3), FLOAT16(4),
+        FLOAT16(5), FLOAT16(4), FLOAT16(10), FLOAT16(5),
+        FLOAT16(2), FLOAT16(0), FLOAT16(5), FLOAT16(8),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(1, 2, 4, 2, 2, 1), axis);
@@ -1051,90 +1051,90 @@ TEST(gather_elements_gpu_fp16, d233113_i233115_a2) {
     auto input1 = engine.allocate_memory({ data_types::f16, format::bfwzyx, { 2, 3, 3, 1, 1, 5 } }); // indices
 
     set_values(input0, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(5), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(7), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(9), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(7), FLOAT16(0), 
-        FLOAT16(4), FLOAT16(0), FLOAT16(4), 
-        FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(7), 
-        FLOAT16(10), FLOAT16(8), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(6), FLOAT16(9), 
-        FLOAT16(2), FLOAT16(4), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(2), FLOAT16(3), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(8),
+        FLOAT16(5), FLOAT16(5), FLOAT16(2),
+        FLOAT16(0), FLOAT16(7), FLOAT16(7),
+        FLOAT16(10), FLOAT16(4), FLOAT16(5),
+        FLOAT16(9), FLOAT16(0), FLOAT16(0),
+        FLOAT16(5), FLOAT16(7), FLOAT16(0),
+        FLOAT16(4), FLOAT16(0), FLOAT16(4),
+        FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1),
+        FLOAT16(7), FLOAT16(4), FLOAT16(7),
+        FLOAT16(10), FLOAT16(8), FLOAT16(2),
+        FLOAT16(0), FLOAT16(8), FLOAT16(3),
+        FLOAT16(6), FLOAT16(8), FLOAT16(10),
+        FLOAT16(4), FLOAT16(2), FLOAT16(10),
+        FLOAT16(7), FLOAT16(8), FLOAT16(7),
+        FLOAT16(0), FLOAT16(6), FLOAT16(9),
+        FLOAT16(2), FLOAT16(4), FLOAT16(8),
+        FLOAT16(5), FLOAT16(2), FLOAT16(3),
     });
 
     set_values(input1, {
-        FLOAT16(0), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(2), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(1), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(1), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(2), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(0), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(0), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(2), FLOAT16(0), FLOAT16(2), 
+        FLOAT16(0), FLOAT16(1), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(0), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(1),
+        FLOAT16(1), FLOAT16(0), FLOAT16(2),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(2), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(0), FLOAT16(2),
+        FLOAT16(2), FLOAT16(0), FLOAT16(1),
+        FLOAT16(1), FLOAT16(2), FLOAT16(2),
+        FLOAT16(1), FLOAT16(1), FLOAT16(0),
+        FLOAT16(2), FLOAT16(0), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(2),
+        FLOAT16(2), FLOAT16(1), FLOAT16(0),
+        FLOAT16(0), FLOAT16(2), FLOAT16(1),
+        FLOAT16(2), FLOAT16(1), FLOAT16(2),
+        FLOAT16(0), FLOAT16(0), FLOAT16(1),
+        FLOAT16(2), FLOAT16(0), FLOAT16(2),
     });
 
     std::vector<float> expected_results = {
-        FLOAT16(0), FLOAT16(5), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(7), FLOAT16(8), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(1), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(1), FLOAT16(2), 
-        FLOAT16(9), FLOAT16(7), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(0), FLOAT16(0), 
-        FLOAT16(9), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(9), FLOAT16(4), FLOAT16(0), 
-        FLOAT16(5), FLOAT16(4), FLOAT16(5), 
-        FLOAT16(7), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(7), FLOAT16(6), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(0), FLOAT16(1), 
-        FLOAT16(4), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(9), FLOAT16(5), FLOAT16(1), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(3), 
-        FLOAT16(10), FLOAT16(8), FLOAT16(3), 
-        FLOAT16(0), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(0), FLOAT16(4), FLOAT16(7), 
-        FLOAT16(7), FLOAT16(4), FLOAT16(3), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(4), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(4), FLOAT16(2), FLOAT16(10), 
-        FLOAT16(7), FLOAT16(8), FLOAT16(10), 
-        FLOAT16(6), FLOAT16(8), FLOAT16(7), 
-        FLOAT16(5), FLOAT16(4), FLOAT16(9), 
-        FLOAT16(0), FLOAT16(2), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(4), FLOAT16(3), 
-        FLOAT16(0), FLOAT16(6), FLOAT16(8), 
-        FLOAT16(5), FLOAT16(6), FLOAT16(3), 
+        FLOAT16(0), FLOAT16(5), FLOAT16(7),
+        FLOAT16(0), FLOAT16(7), FLOAT16(8),
+        FLOAT16(0), FLOAT16(1), FLOAT16(7),
+        FLOAT16(0), FLOAT16(1), FLOAT16(8),
+        FLOAT16(5), FLOAT16(1), FLOAT16(2),
+        FLOAT16(9), FLOAT16(7), FLOAT16(0),
+        FLOAT16(5), FLOAT16(0), FLOAT16(0),
+        FLOAT16(9), FLOAT16(4), FLOAT16(0),
+        FLOAT16(9), FLOAT16(4), FLOAT16(0),
+        FLOAT16(5), FLOAT16(4), FLOAT16(5),
+        FLOAT16(7), FLOAT16(5), FLOAT16(1),
+        FLOAT16(7), FLOAT16(6), FLOAT16(10),
+        FLOAT16(7), FLOAT16(0), FLOAT16(1),
+        FLOAT16(4), FLOAT16(5), FLOAT16(1),
+        FLOAT16(9), FLOAT16(5), FLOAT16(1),
+        FLOAT16(7), FLOAT16(4), FLOAT16(3),
+        FLOAT16(10), FLOAT16(8), FLOAT16(3),
+        FLOAT16(0), FLOAT16(8), FLOAT16(7),
+        FLOAT16(0), FLOAT16(4), FLOAT16(7),
+        FLOAT16(7), FLOAT16(4), FLOAT16(3),
+        FLOAT16(7), FLOAT16(8), FLOAT16(10),
+        FLOAT16(4), FLOAT16(8), FLOAT16(7),
+        FLOAT16(4), FLOAT16(2), FLOAT16(10),
+        FLOAT16(7), FLOAT16(8), FLOAT16(10),
+        FLOAT16(6), FLOAT16(8), FLOAT16(7),
+        FLOAT16(5), FLOAT16(4), FLOAT16(9),
+        FLOAT16(0), FLOAT16(2), FLOAT16(8),
+        FLOAT16(5), FLOAT16(4), FLOAT16(3),
+        FLOAT16(0), FLOAT16(6), FLOAT16(8),
+        FLOAT16(5), FLOAT16(6), FLOAT16(3),
     };
 
     DoTest(engine, input0, input1, expected_results, tensor(2, 3, 3, 1, 1, 5), axis);
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/gather_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/gather_gpu_test.cpp
index 063498610b3..0091064f544 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/gather_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/gather_gpu_test.cpp
@@ -4,8 +4,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/gather.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/gather.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/gather_nd_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/gather_nd_gpu_test.cpp
index ec9b8332041..3b15b9dcc7f 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/gather_nd_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/gather_nd_gpu_test.cpp
@@ -4,8 +4,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/gather_nd.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/gather_nd.hpp>
 
 
 using namespace cldnn;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/gemm_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/gemm_gpu_test.cpp
index cb02adf490c..42f94cf8fd8 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/gemm_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/gemm_gpu_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/gemm.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/gemm.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/loop_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/loop_gpu_test.cpp
index 9ba4fdc025a..271fe868ac7 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/loop_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/loop_gpu_test.cpp
@@ -6,15 +6,15 @@
 
 #include "test_utils/test_utils.h"
 
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/runtime/engine.hpp>
-#include <cldnn/graph/network.hpp>
-#include <cldnn/primitives/input_layout.hpp>
-#include "cldnn/primitives/eltwise.hpp"
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/loop.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/runtime/memory.hpp>
+#include <intel_gpu/runtime/engine.hpp>
+#include <intel_gpu/graph/network.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include "intel_gpu/primitives/eltwise.hpp"
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/loop.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cassert>
 #include <cmath>
@@ -337,7 +337,7 @@ TEST(loop_gpu, basic_concat_nested)
     EXPECT_EQ(output_layout.size.feature[0], 1);
     EXPECT_EQ(output_layout.size.spatial[0], 4);
     EXPECT_EQ(output_layout.size.spatial[1], 5);
-    
+
     // check output values
     EXPECT_EQ(output_layout.count(), expected.size());
     {
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/lrn_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/lrn_gpu_test.cpp
index 119a6fb1c52..cf531935042 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/lrn_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/lrn_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/lrn.hpp>
-#include <cldnn/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/lrn.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_dynamic_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_dynamic_gpu_test.cpp
index b25f483384f..12681738059 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_dynamic_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_dynamic_gpu_test.cpp
@@ -4,14 +4,14 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/lstm.hpp>
-#include <cldnn/primitives/lstm_dynamic.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/lstm_dynamic_input.hpp>
-#include <cldnn/primitives/lstm_dynamic_timeloop.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/lstm.hpp>
+#include <intel_gpu/primitives/lstm_dynamic.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/lstm_dynamic_input.hpp>
+#include <intel_gpu/primitives/lstm_dynamic_timeloop.hpp>
 
 #include <chrono>
 #include <sstream>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_gpu_test.cpp
index d9b968d205f..cfe9ab3078d 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/lstm_gpu_test.cpp
@@ -6,13 +6,13 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/lstm.hpp>
-#include <cldnn/primitives/split.hpp>
-#include <cldnn/primitives/crop.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/lstm.hpp>
+#include <intel_gpu/primitives/split.hpp>
+#include <intel_gpu/primitives/crop.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <sstream>
 #include <iomanip>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/max_unpooling_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/max_unpooling_gpu_test.cpp
index 5bf6f5784dd..e5e0c3c19f4 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/max_unpooling_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/max_unpooling_gpu_test.cpp
@@ -6,12 +6,12 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/max_unpooling.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/pooling.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/max_unpooling.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/mem_perf_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/mem_perf_test.cpp
index 81cb79d253d..b749143bdba 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/mem_perf_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/mem_perf_test.cpp
@@ -5,10 +5,10 @@
 #include "test_utils.h"
 #include "opencl_helper_instance.hpp"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/activation.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/runtime/device_query.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/activation.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/runtime/device_query.hpp>
 
 static size_t img_size = 800;
 static std::string kernel_code =
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/memory_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/memory_test.cpp
index e5e8bd01f09..d1c76a316c4 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/memory_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/memory_test.cpp
@@ -6,14 +6,14 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/activation.hpp>
-#include <cldnn/primitives/pooling.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/crop.hpp>
-#include <cldnn/primitives/scale.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/activation.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/crop.hpp>
+#include <intel_gpu/primitives/scale.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/mvn_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/mvn_gpu_test.cpp
index 1f15560dd45..a1fd1322cc8 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/mvn_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/mvn_gpu_test.cpp
@@ -6,13 +6,13 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/mvn.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/mvn.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 #include <iostream>
 
-#include <cldnn/runtime/debug_configuration.hpp>
+#include <intel_gpu/runtime/debug_configuration.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/non_max_suppression_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/non_max_suppression_test.cpp
index 2b42a61450c..fc134f0b047 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/non_max_suppression_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/non_max_suppression_test.cpp
@@ -6,10 +6,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/non_max_suppression.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/non_max_suppression.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
@@ -151,7 +151,7 @@ TYPED_TEST(non_max_suppression_basic, num_per_class) {
     topo.add(input_layout("boxes", this->boxes_layout));
     topo.add(input_layout("scores", this->scores_layout));
     topo.add(data("num_per_class", num_per_class_mem));
-    topo.add(non_max_suppression("nms", "boxes", "scores", 
+    topo.add(non_max_suppression("nms", "boxes", "scores",
         this->batch_size * this->classes_num * 1, false, true, "num_per_class"));
 
     build_options bo;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/normalizel2_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/normalizel2_gpu_test.cpp
index a96185c7d8f..8081bf8da57 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/normalizel2_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/normalizel2_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/normalize.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/normalize.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <vector>
 #include <iostream>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/one_hot_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/one_hot_gpu_test.cpp
index 08bb8690be0..9ac150ce6b0 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/one_hot_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/one_hot_gpu_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/one_hot.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/one_hot.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/permute_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/permute_gpu_test.cpp
index 5c5aadfc54b..adf0c25cbac 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/permute_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/permute_gpu_test.cpp
@@ -6,13 +6,13 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/permute.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/fully_connected.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/crop.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/permute.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/fully_connected.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/crop.hpp>
 
 #include <cmath>
 #include <limits>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/pooling_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/pooling_gpu_test.cpp
index df9dbdf0225..afefb556b4b 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/pooling_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/pooling_gpu_test.cpp
@@ -6,11 +6,11 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/pooling.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/propagate_constants_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/propagate_constants_gpu_test.cpp
index 3425bfd427c..3d73e290f37 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/propagate_constants_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/propagate_constants_gpu_test.cpp
@@ -4,11 +4,11 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/reshape.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/proposal_cpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/proposal_cpu_test.cpp
index 5bb4fdecdac..7f7b4259504 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/proposal_cpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/proposal_cpu_test.cpp
@@ -4,8 +4,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/proposal.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/proposal.hpp>
 
 #include <fstream>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/pyramid_roi_align_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/pyramid_roi_align_gpu_test.cpp
index 9bafacd906d..45bddccb444 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/pyramid_roi_align_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/pyramid_roi_align_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/pyramid_roi_align.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/pyramid_roi_align.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/quantize_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/quantize_gpu_test.cpp
index 393c54378c9..cccbb2dad4a 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/quantize_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/quantize_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/quantize.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/quantize.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/reduce_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/reduce_gpu_test.cpp
index f443eefba58..56d43114646 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/reduce_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/reduce_gpu_test.cpp
@@ -4,9 +4,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/reduce.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/reduce.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cmath>
 #include <algorithm>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/region_yolo_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/region_yolo_gpu_test.cpp
index e1d5d9b2a71..4eaad3cf81f 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/region_yolo_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/region_yolo_gpu_test.cpp
@@ -4,12 +4,12 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/region_yolo.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/graph/topology.hpp>
-#include <cldnn/graph/network.hpp>
-#include <cldnn/runtime/memory.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/region_yolo.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/graph/topology.hpp>
+#include <intel_gpu/graph/network.hpp>
+#include <intel_gpu/runtime/memory.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/removing_output_node_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/removing_output_node_test.cpp
index f8151686b50..42412cfd484 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/removing_output_node_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/removing_output_node_test.cpp
@@ -4,11 +4,11 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/shuffle_channels.hpp>
-#include <cldnn/primitives/strided_slice.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/shuffle_channels.hpp>
+#include <intel_gpu/primitives/strided_slice.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/reorder_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/reorder_gpu_test.cpp
index e62487ff2c6..c8e82666acb 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/reorder_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/reorder_gpu_test.cpp
@@ -6,11 +6,11 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/crop.hpp"
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/crop.hpp"
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cmath>
 #include <limits>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/resample_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/resample_gpu_test.cpp
index 3238fef9ea4..3230d165404 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/resample_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/resample_gpu_test.cpp
@@ -6,10 +6,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/resample.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/resample.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/reshape_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/reshape_gpu_test.cpp
index 18916b3e3c3..4817c6fab9a 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/reshape_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/reshape_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/reverse_sequence_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/reverse_sequence_gpu_test.cpp
index cb674704b29..c3bfd37aab4 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/reverse_sequence_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/reverse_sequence_gpu_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/reverse_sequence.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/reverse_sequence.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_elements_update_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_elements_update_gpu_test.cpp
index 02d5089f9c5..a30bd9762dd 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_elements_update_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_elements_update_gpu_test.cpp
@@ -4,11 +4,11 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/scatter_elements_update.hpp>
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/graph/topology.hpp>
-#include <cldnn/graph/network.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/scatter_elements_update.hpp>
+#include <intel_gpu/runtime/memory.hpp>
+#include <intel_gpu/graph/topology.hpp>
+#include <intel_gpu/graph/network.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_nd_update_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_nd_update_gpu_test.cpp
index 9977777fa0e..6b47b5d83e8 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_nd_update_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_nd_update_gpu_test.cpp
@@ -4,12 +4,12 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/scatter_update.hpp>
-#include <cldnn/primitives/scatter_nd_update.hpp>
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/graph/topology.hpp>
-#include <cldnn/graph/network.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/scatter_update.hpp>
+#include <intel_gpu/primitives/scatter_nd_update.hpp>
+#include <intel_gpu/runtime/memory.hpp>
+#include <intel_gpu/graph/topology.hpp>
+#include <intel_gpu/graph/network.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_update_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_update_gpu_test.cpp
index 937695760e3..819589c7302 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_update_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/scatter_update_gpu_test.cpp
@@ -4,8 +4,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/scatter_update.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/scatter_update.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/select_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/select_gpu_test.cpp
index c4e698f8210..5361ff95732 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/select_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/select_gpu_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include "cldnn/primitives/select.hpp"
+#include <intel_gpu/primitives/input_layout.hpp>
+#include "intel_gpu/primitives/select.hpp"
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/set_output_memory_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/set_output_memory_gpu_test.cpp
index c4901b7b660..727761ace85 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/set_output_memory_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/set_output_memory_gpu_test.cpp
@@ -8,10 +8,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/arg_max_min.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
-#include <cldnn/primitives/reshape.hpp>
-#include <cldnn/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/arg_max_min.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/reshape.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
 
 using namespace cldnn;
 using namespace tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/shuffle_channels_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/shuffle_channels_test.cpp
index 55a5e8fa897..48a7149b280 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/shuffle_channels_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/shuffle_channels_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/shuffle_channels.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/shuffle_channels.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/softmax_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/softmax_gpu_test.cpp
index 1cf9f40ad8a..d03f57ccf38 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/softmax_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/softmax_gpu_test.cpp
@@ -4,8 +4,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/softmax.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/softmax.hpp>
 
 using namespace cldnn;
 using namespace std;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_batch_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_batch_gpu_test.cpp
index cb46b013207..7b80185155d 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_batch_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_batch_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/space_to_batch.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/space_to_batch.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_depth_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_depth_gpu_test.cpp
index 6614d4d6b75..34f02f60fcd 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_depth_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/space_to_depth_gpu_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/space_to_depth.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/space_to_depth.hpp>
 
 #include <cstddef>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/spatial_concatenate_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/spatial_concatenate_gpu_test.cpp
index 2795968a94b..030ef044e42 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/spatial_concatenate_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/spatial_concatenate_gpu_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include "cldnn/primitives/concatenation.hpp"
+#include <intel_gpu/primitives/input_layout.hpp>
+#include "intel_gpu/primitives/concatenation.hpp"
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/split_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/split_gpu_test.cpp
index 10cb13acc31..08d02f7ab0e 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/split_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/split_gpu_test.cpp
@@ -4,10 +4,10 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/split.hpp>
-#include <cldnn/primitives/scale.hpp>
-#include <cldnn/primitives/reorder.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/split.hpp>
+#include <intel_gpu/primitives/scale.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
 
 #include <sstream>
 #include <iomanip>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/streams_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/streams_test.cpp
index 795020327ad..d8634910272 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/streams_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/streams_test.cpp
@@ -4,9 +4,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/mutable_data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/mutable_data.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/strided_slice_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/strided_slice_gpu_test.cpp
index 470623e28d8..c30a167d63e 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/strided_slice_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/strided_slice_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/strided_slice.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/strided_slice.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/test_device_mem_usage_estimation.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/test_device_mem_usage_estimation.cpp
index 142a2b7827a..0a2ba17b5f4 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/test_device_mem_usage_estimation.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/test_device_mem_usage_estimation.cpp
@@ -7,8 +7,8 @@
 #include <cstddef>
 
 #include "test_utils.h"
-#include <cldnn/primitives/permute.hpp>
-#include <cldnn/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/permute.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
 
 using namespace cldnn;
 using namespace tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/tile_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/tile_gpu_test.cpp
index b80f4eedd6d..4bfea642268 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/tile_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/tile_gpu_test.cpp
@@ -6,8 +6,8 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/tile.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/tile.hpp>
 
 #include <iostream>
 
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/topology_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/topology_test.cpp
index 97704b4e02a..55e97264363 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/topology_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/topology_test.cpp
@@ -4,18 +4,18 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/lrn.hpp>
-#include <cldnn/primitives/convolution.hpp>
-#include <cldnn/primitives/fully_connected.hpp>
-#include <cldnn/primitives/pooling.hpp>
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/scale.hpp>
-#include <cldnn/primitives/eltwise.hpp>
-#include <cldnn/primitives/softmax.hpp>
-#include <cldnn/primitives/activation.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/graph/topology.hpp>
+#include <intel_gpu/primitives/lrn.hpp>
+#include <intel_gpu/primitives/convolution.hpp>
+#include <intel_gpu/primitives/fully_connected.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/scale.hpp>
+#include <intel_gpu/primitives/eltwise.hpp>
+#include <intel_gpu/primitives/softmax.hpp>
+#include <intel_gpu/primitives/activation.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/graph/topology.hpp>
 
 
 #include <iostream>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_cases/trim_to_outputs_gpu_test.cpp b/inference-engine/thirdparty/clDNN/tests/test_cases/trim_to_outputs_gpu_test.cpp
index 94689c2ce4b..9e606b6d131 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_cases/trim_to_outputs_gpu_test.cpp
+++ b/inference-engine/thirdparty/clDNN/tests/test_cases/trim_to_outputs_gpu_test.cpp
@@ -6,9 +6,9 @@
 
 #include "test_utils.h"
 
-#include <cldnn/primitives/input_layout.hpp>
-#include "cldnn/primitives/concatenation.hpp"
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include "intel_gpu/primitives/concatenation.hpp"
+#include <intel_gpu/primitives/data.hpp>
 
 using namespace cldnn;
 using namespace ::tests;
diff --git a/inference-engine/thirdparty/clDNN/tests/test_utils/network_test.h b/inference-engine/thirdparty/clDNN/tests/test_utils/network_test.h
index 0577fb8c075..455c670d78b 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_utils/network_test.h
+++ b/inference-engine/thirdparty/clDNN/tests/test_utils/network_test.h
@@ -7,15 +7,15 @@
 #include <gtest/gtest.h>
 #include "test_utils/test_utils.h"
 
-#include <cldnn/runtime/engine.hpp>
-#include <cldnn/runtime/layout.hpp>
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/runtime/tensor.hpp>
+#include <intel_gpu/runtime/engine.hpp>
+#include <intel_gpu/runtime/layout.hpp>
+#include <intel_gpu/runtime/memory.hpp>
+#include <intel_gpu/runtime/tensor.hpp>
 
-#include <cldnn/primitives/data.hpp>
-#include <cldnn/primitives/fully_connected.hpp>
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/primitive.hpp>
+#include <intel_gpu/primitives/data.hpp>
+#include <intel_gpu/primitives/fully_connected.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/primitive.hpp>
 
 #include <map>
 #include <set>
diff --git a/inference-engine/thirdparty/clDNN/tests/test_utils/test_utils.h b/inference-engine/thirdparty/clDNN/tests/test_utils/test_utils.h
index 8013f315be7..caecc2de5c7 100644
--- a/inference-engine/thirdparty/clDNN/tests/test_utils/test_utils.h
+++ b/inference-engine/thirdparty/clDNN/tests/test_utils/test_utils.h
@@ -6,33 +6,33 @@
 
 #pragma once
 
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/runtime/tensor.hpp>
-#include <cldnn/runtime/engine.hpp>
-#include <cldnn/runtime/stream.hpp>
-#include <cldnn/graph/program.hpp>
-#include <cldnn/graph/network.hpp>
-#include <cldnn/graph/topology.hpp>
-#include <cldnn/primitives/primitive.hpp>
-#include <cldnn/primitives/concatenation.hpp>
-#include <cldnn/primitives/lrn.hpp>
-#include <cldnn/primitives/roi_pooling.hpp>
-#include <cldnn/primitives/scale.hpp>
-#include <cldnn/primitives/softmax.hpp>
-#include <cldnn/primitives/reorder.hpp>
-#include <cldnn/primitives/normalize.hpp>
-#include <cldnn/primitives/convolution.hpp>
-#include <cldnn/primitives/activation.hpp>
-#include <cldnn/primitives/pooling.hpp>
-#include <cldnn/primitives/input_layout.hpp>
-#include <cldnn/primitives/data.hpp>
+#include <intel_gpu/runtime/memory.hpp>
+#include <intel_gpu/runtime/tensor.hpp>
+#include <intel_gpu/runtime/engine.hpp>
+#include <intel_gpu/runtime/stream.hpp>
+#include <intel_gpu/graph/program.hpp>
+#include <intel_gpu/graph/network.hpp>
+#include <intel_gpu/graph/topology.hpp>
+#include <intel_gpu/primitives/primitive.hpp>
+#include <intel_gpu/primitives/concatenation.hpp>
+#include <intel_gpu/primitives/lrn.hpp>
+#include <intel_gpu/primitives/roi_pooling.hpp>
+#include <intel_gpu/primitives/scale.hpp>
+#include <intel_gpu/primitives/softmax.hpp>
+#include <intel_gpu/primitives/reorder.hpp>
+#include <intel_gpu/primitives/normalize.hpp>
+#include <intel_gpu/primitives/convolution.hpp>
+#include <intel_gpu/primitives/activation.hpp>
+#include <intel_gpu/primitives/pooling.hpp>
+#include <intel_gpu/primitives/input_layout.hpp>
+#include <intel_gpu/primitives/data.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include "float16.h"
 #include "random_gen.h"
 #include "uniform_quantized_real_distribution.hpp"
-#include <src/include/to_string_utils.h>
+#include "to_string_utils.h"
 
 #include <iostream>
 #include <limits>
diff --git a/inference-engine/thirdparty/clDNN/utils/CMakeLists.txt b/inference-engine/thirdparty/clDNN/utils/CMakeLists.txt
new file mode 100644
index 00000000000..fc973d83056
--- /dev/null
+++ b/inference-engine/thirdparty/clDNN/utils/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (C) 2021 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_library(rapidjson INTERFACE)
+
+set_target_properties(rapidjson PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rapidjson>
+)
+
+ov_install_static_lib(rapidjson gpu)
diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
index e3303562a8f..4c05edaef13 100644
--- a/src/plugins/intel_gpu/CMakeLists.txt
+++ b/src/plugins/intel_gpu/CMakeLists.txt
@@ -28,15 +28,15 @@ ie_add_plugin(NAME ${TARGET_NAME}
 target_compile_options(${TARGET_NAME} PRIVATE
     $<$<CONFIG:Release>:$<IF:$<CXX_COMPILER_ID:MSVC>,/Os,-Os>>)
 
-target_link_libraries(${TARGET_NAME} PRIVATE clDNN_lib pugixml::static
+target_link_libraries(${TARGET_NAME} PRIVATE ov_intel_gpu_graph
+                                             pugixml::static
                                              inference_engine_transformations
                                              inference_engine_lp_transformations
                                              ngraph)
 
 target_include_directories(${TARGET_NAME} PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/include/intel_gpu/plugin/
-        $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
-        ${clDNN_SOURCE_DIR}/api)
+        $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>)
 
 set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
 
@@ -47,9 +47,3 @@ endif()
 
 # Failed because of OpenCL
 # ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
-
-# install
-
-install(FILES "${clDNN_SOURCE_DIR}/kernel_selector/core/cache/cache.json"
-        DESTINATION ${IE_CPACK_RUNTIME_PATH}
-        COMPONENT gpu)
diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_common_utils.h b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_common_utils.h
index f41f2d8e134..8c5e5959c2c 100644
--- a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_common_utils.h
+++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_common_utils.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <ie_layouts.h>
-#include <cldnn/runtime/layout.hpp>
+#include "intel_gpu/runtime/layout.hpp"
 
 #include "ngraph/type/element_type.hpp"
 
diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_config.h b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_config.h
index 2ee56147fff..202920bef95 100644
--- a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_config.h
+++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_config.h
@@ -9,7 +9,7 @@
 
 #include "cldnn_custom_layer.h"
 #include <ie_performance_hints.hpp>
-#include <cldnn/graph/network.hpp>
+#include "intel_gpu/graph/network.hpp"
 #include <threading/ie_cpu_streams_executor.hpp>
 
 namespace CLDNNPlugin {
diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_custom_layer.h b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_custom_layer.h
index cbe41f8831b..39bc74282a0 100644
--- a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_custom_layer.h
+++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_custom_layer.h
@@ -10,7 +10,7 @@
 #include <map>
 #include <ie_common.h>
 #include "pugixml.hpp"
-#include "cldnn/runtime/tensor.hpp"
+#include "intel_gpu/runtime/tensor.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_engine.h b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_engine.h
index 6f1ab29786e..ed2270fa17f 100644
--- a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_engine.h
+++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_engine.h
@@ -7,7 +7,7 @@
 #include <map>
 #include <string>
 #include <memory>
-#include <cldnn/runtime/engine.hpp>
+#include "intel_gpu/runtime/engine.hpp"
 #include <cpp_interfaces/interface/ie_iplugin_internal.hpp>
 #include <cpp_interfaces/interface/ie_iexecutable_network_internal.hpp>
 #include "cldnn_remote_context.h"
diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_graph.h b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_graph.h
index d2a4cf95084..6109898b0b1 100644
--- a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_graph.h
+++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_graph.h
@@ -17,8 +17,8 @@
 #include "ie_blob.h"
 #include "cpp/ie_cnn_network.h"
 
-#include <cldnn/graph/network.hpp>
-#include <cldnn/graph/topology.hpp>
+#include "intel_gpu/graph/network.hpp"
+#include "intel_gpu/graph/topology.hpp"
 
 #include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>
 #include "cldnn_custom_layer.h"
diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_program.h b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_program.h
index 2b008586776..e67c0574763 100644
--- a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_program.h
+++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_program.h
@@ -17,8 +17,8 @@
 
 #include "cldnn_config.h"
 
-#include <cldnn/runtime/engine.hpp>
-#include <cldnn/graph/topology.hpp>
+#include "intel_gpu/runtime/engine.hpp"
+#include "intel_gpu/graph/topology.hpp"
 
 // Forward declarations for cldnn part
 namespace cldnn {
diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_remote_context.h b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_remote_context.h
index f5e179db39b..6e7fd786b10 100644
--- a/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_remote_context.h
+++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/cldnn_remote_context.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <cldnn/runtime/memory.hpp>
-#include <cldnn/runtime/engine.hpp>
+#include "intel_gpu/runtime/memory.hpp"
+#include "intel_gpu/runtime/engine.hpp"
 #include <ie_parameter.hpp>
 #include <cpp_interfaces/interface/ie_iplugin_internal.hpp>
 #include <blob_factory.hpp>
diff --git a/src/plugins/intel_gpu/src/plugin/cldnn_engine.cpp b/src/plugins/intel_gpu/src/plugin/cldnn_engine.cpp
index 8855252c6b7..dc7efc47bcd 100644
--- a/src/plugins/intel_gpu/src/plugin/cldnn_engine.cpp
+++ b/src/plugins/intel_gpu/src/plugin/cldnn_engine.cpp
@@ -26,8 +26,8 @@
 
 #include <transformations/rt_info/fused_names_attribute.hpp>
 
-#include "cldnn/runtime/device_query.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/device_query.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 #ifdef __linux__
 # include <dlfcn.h>
 #endif
diff --git a/src/plugins/intel_gpu/src/plugin/cldnn_graph.cpp b/src/plugins/intel_gpu/src/plugin/cldnn_graph.cpp
index 567f209257c..7c64fe6107d 100644
--- a/src/plugins/intel_gpu/src/plugin/cldnn_graph.cpp
+++ b/src/plugins/intel_gpu/src/plugin/cldnn_graph.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include <cldnn/graph/network.hpp>
-#include <cldnn/runtime/profiling.hpp>
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/graph/network.hpp"
+#include "intel_gpu/runtime/profiling.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include "cldnn_graph.h"
 #include "simple_math.h"
diff --git a/src/plugins/intel_gpu/src/plugin/cldnn_infer_request.cpp b/src/plugins/intel_gpu/src/plugin/cldnn_infer_request.cpp
index c1f356c36d6..eb0900d9b66 100644
--- a/src/plugins/intel_gpu/src/plugin/cldnn_infer_request.cpp
+++ b/src/plugins/intel_gpu/src/plugin/cldnn_infer_request.cpp
@@ -12,7 +12,7 @@
 #include "cldnn_remote_context.h"
 #include "cldnn_executable_network.h"
 #include "cldnn_itt.h"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 #include <ie_algorithm.hpp>
 #include <debug.h>
 
diff --git a/src/plugins/intel_gpu/src/plugin/cldnn_program.cpp b/src/plugins/intel_gpu/src/plugin/cldnn_program.cpp
index 03b35f61464..06096459acb 100644
--- a/src/plugins/intel_gpu/src/plugin/cldnn_program.cpp
+++ b/src/plugins/intel_gpu/src/plugin/cldnn_program.cpp
@@ -6,7 +6,7 @@
 #include "ngraph/ops.hpp"
 #include "ngraph_ops/nms_ie_internal.hpp"
 #include "cldnn_itt.h"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 using namespace InferenceEngine;
 using namespace InferenceEngine::details;
diff --git a/src/plugins/intel_gpu/src/plugin/cldnn_remote_context.cpp b/src/plugins/intel_gpu/src/plugin/cldnn_remote_context.cpp
index 657e9ff6416..d18c6ceb286 100644
--- a/src/plugins/intel_gpu/src/plugin/cldnn_remote_context.cpp
+++ b/src/plugins/intel_gpu/src/plugin/cldnn_remote_context.cpp
@@ -6,7 +6,7 @@
 #include "cldnn_remote_context.h"
 #include "cldnn_itt.h"
 #include "cldnn_engine.h"
-#include "cldnn/runtime/device_query.hpp"
+#include "intel_gpu/runtime/device_query.hpp"
 
 using namespace InferenceEngine;
 using namespace InferenceEngine::gpu;
diff --git a/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp b/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp
index f25e8b65e1d..83a5b3f6903 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/batch_to_space.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/batch_to_space.hpp"
+#include "intel_gpu/primitives/batch_to_space.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/broadcast.cpp b/src/plugins/intel_gpu/src/plugin/ops/broadcast.cpp
index d121393e827..8bd78096d50 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/broadcast.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/broadcast.cpp
@@ -8,9 +8,9 @@
 #include "ngraph/op/broadcast.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/broadcast.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/reshape.hpp"
+#include "intel_gpu/primitives/broadcast.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/concat.cpp b/src/plugins/intel_gpu/src/plugin/ops/concat.cpp
index 3fbd1ceecf8..020b394f55f 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/concat.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/concat.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/concat.hpp"
 
-#include "cldnn/primitives/concatenation.hpp"
+#include "intel_gpu/primitives/concatenation.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/constant.cpp b/src/plugins/intel_gpu/src/plugin/ops/constant.cpp
index 3e8648ddc0a..f41251adaeb 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/constant.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/constant.cpp
@@ -17,8 +17,8 @@
 #include "ngraph/op/variadic_split.hpp"
 #include "ngraph/op/util/op_types.hpp"
 
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/convert.cpp b/src/plugins/intel_gpu/src/plugin/ops/convert.cpp
index a9fd103dd08..073010637a8 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/convert.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/convert.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/convert.hpp"
 #include "ngraph/op/convert_like.hpp"
 
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp b/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp
index e4ea855cb6a..7a830435ae8 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp
@@ -13,11 +13,11 @@
 #include "ngraph/op/fake_quantize.hpp"
 #include "ngraph/op/util/op_types.hpp"
 
-#include "cldnn/primitives/convolution.hpp"
-#include "cldnn/primitives/deconvolution.hpp"
-#include "cldnn/primitives/binary_convolution.hpp"
-#include "cldnn/primitives/permute.hpp"
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/convolution.hpp"
+#include "intel_gpu/primitives/deconvolution.hpp"
+#include "intel_gpu/primitives/binary_convolution.hpp"
+#include "intel_gpu/primitives/permute.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp b/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp
index b0e7af10bdc..8f07a157d3e 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp
@@ -8,10 +8,10 @@
 #include "ngraph/op/ctc_greedy_decoder.hpp"
 #include "ngraph/op/ctc_greedy_decoder_seq_len.hpp"
 
-#include "cldnn/primitives/ctc_greedy_decoder.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/primitives/ctc_greedy_decoder.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 #include "transformations/utils/utils.hpp"
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp b/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp
index 19c26a52764..ea7b57fdf8f 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/cum_sum.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/cum_sum.hpp"
+#include "intel_gpu/primitives/cum_sum.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/custom.cpp b/src/plugins/intel_gpu/src/plugin/ops/custom.cpp
index c967100d1f9..398224398f9 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/custom.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/custom.cpp
@@ -9,8 +9,8 @@
 #include "ngraph/attribute_visitor.hpp"
 #include "ngraph/node.hpp"
 
-#include "cldnn/primitives/custom_gpu_primitive.hpp"
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/custom_gpu_primitive.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp b/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp
index 6e0d2c2c6ed..ec3ac592ac1 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/depth_to_space.hpp"
 
-#include "cldnn/primitives/depth_to_space.hpp"
+#include "intel_gpu/primitives/depth_to_space.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/detection_output.cpp b/src/plugins/intel_gpu/src/plugin/ops/detection_output.cpp
index 35f19bbf796..cfdcebda461 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/detection_output.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/detection_output.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/detection_output.hpp"
 
-#include "cldnn/primitives/detection_output.hpp"
+#include "intel_gpu/primitives/detection_output.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp
index 70ba74bb0dc..24a12626a11 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp
@@ -25,10 +25,10 @@
 #include "ngraph/op/power.hpp"
 #include "ngraph/op/floor_mod.hpp"
 
-#include "cldnn/primitives/activation.hpp"
-#include "cldnn/primitives/eltwise.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/reshape.hpp"
+#include "intel_gpu/primitives/activation.hpp"
+#include "intel_gpu/primitives/eltwise.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp b/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp
index 855e68de938..f7884822990 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp
@@ -9,8 +9,8 @@
 #include "ngraph/op/embeddingbag_offsets_sum.hpp"
 #include "ngraph/op/embeddingbag_packedsum.hpp"
 
-#include "cldnn/primitives/embedding_bag.hpp"
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/embedding_bag.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 #include "transformations/utils/utils.hpp"
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp
index 0f008965ab3..a4d9b67e10c 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp
@@ -7,8 +7,8 @@
 
 #include "ngraph/op/experimental_detectron_roi_feature.hpp"
 
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/primitives/experimental_detectron_roi_feature_extractor.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp b/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp
index c747df5e7ad..7dcd855b316 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/extractimagepatches.hpp"
 
-#include "cldnn/primitives/extract_image_patches.hpp"
+#include "intel_gpu/primitives/extract_image_patches.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/fake_quantize.cpp b/src/plugins/intel_gpu/src/plugin/ops/fake_quantize.cpp
index f2515ff83c4..30e14cee60a 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/fake_quantize.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/fake_quantize.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/fake_quantize.hpp"
 
-#include "cldnn/primitives/quantize.hpp"
+#include "intel_gpu/primitives/quantize.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/gather tree.cpp b/src/plugins/intel_gpu/src/plugin/ops/gather tree.cpp
index 2b54cd98507..80d36281789 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/gather tree.cpp	
+++ b/src/plugins/intel_gpu/src/plugin/ops/gather tree.cpp	
@@ -7,8 +7,8 @@
 
 #include "ngraph/op/gather_tree.hpp"
 
-#include "cldnn/primitives/gather_tree.hpp"
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/gather_tree.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/gather.cpp b/src/plugins/intel_gpu/src/plugin/ops/gather.cpp
index 90208c66d6f..3ce44e22447 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/gather.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/gather.cpp
@@ -7,8 +7,8 @@
 
 #include "ngraph/op/gather.hpp"
 
-#include "cldnn/primitives/gather.hpp"
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/gather.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/gather_elements.cpp b/src/plugins/intel_gpu/src/plugin/ops/gather_elements.cpp
index 43cc0dc335f..2b4f4bbd731 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/gather_elements.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/gather_elements.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/gather_elements.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/gather_elements.hpp"
+#include "intel_gpu/primitives/gather_elements.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/gather_nd.cpp b/src/plugins/intel_gpu/src/plugin/ops/gather_nd.cpp
index ba29fb765fc..12f2459d4ad 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/gather_nd.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/gather_nd.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/gather_nd.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/gather_nd.hpp"
+#include "intel_gpu/primitives/gather_nd.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/grn.cpp b/src/plugins/intel_gpu/src/plugin/ops/grn.cpp
index ed35f56496a..a4680397755 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/grn.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/grn.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/grn.hpp"
 
-#include "cldnn/primitives/grn.hpp"
+#include "intel_gpu/primitives/grn.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp b/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp
index 083ff0f545b..d4ae76d48dc 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp
@@ -9,7 +9,7 @@
 #include "ngraph/op/interpolate.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/resample.hpp"
+#include "intel_gpu/primitives/resample.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/loop.cpp b/src/plugins/intel_gpu/src/plugin/ops/loop.cpp
index 7201c143ad6..2d342d7f56c 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/loop.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/loop.cpp
@@ -15,11 +15,11 @@
 #include "transformations/utils/utils.hpp"
 #include "ie_ngraph_utils.hpp"
 
-#include "cldnn/primitives/loop.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/graph/topology.hpp"
+#include "intel_gpu/primitives/loop.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/graph/topology.hpp"
 
 #include <vector>
 #include <algorithm>
diff --git a/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp b/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp
index a28a88050c6..e6000881a69 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/lrn.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/lrn.hpp"
+#include "intel_gpu/primitives/lrn.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp b/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp
index 8dc523c16ab..66ef9d5b80f 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp
@@ -9,11 +9,11 @@
 #include "ngraph/op/constant.hpp"
 #include "ngraph/op/fake_quantize.hpp"
 
-#include "cldnn/primitives/gemm.hpp"
-#include "cldnn/primitives/fully_connected.hpp"
-#include "cldnn/primitives/reshape.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/permute.hpp"
+#include "intel_gpu/primitives/gemm.hpp"
+#include "intel_gpu/primitives/fully_connected.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/permute.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/mvn.cpp b/src/plugins/intel_gpu/src/plugin/ops/mvn.cpp
index c202acb4397..bb0c6c6ecb7 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/mvn.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/mvn.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/mvn.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/mvn.hpp"
+#include "intel_gpu/primitives/mvn.hpp"
 
 #include <algorithm>
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp
index 64e5eccf02e..d5889d03daf 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp
@@ -9,10 +9,10 @@
 #include <ngraph/opsets/opset3.hpp>
 #include <ngraph_ops/nms_ie_internal.hpp>
 
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/primitives/non_max_suppression.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/non_max_suppression.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp b/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp
index 61519721e1b..81393d96fa3 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp
@@ -8,8 +8,8 @@
 #include "ngraph/op/normalize_l2.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/normalize.hpp"
-#include "cldnn/primitives/data.hpp"
+#include "intel_gpu/primitives/normalize.hpp"
+#include "intel_gpu/primitives/data.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp b/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp
index 0c550c21845..33016805e8e 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp
@@ -8,7 +8,7 @@
 
 #include "ngraph/op/one_hot.hpp"
 
-#include "cldnn/primitives/one_hot.hpp"
+#include "intel_gpu/primitives/one_hot.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/pad.cpp b/src/plugins/intel_gpu/src/plugin/ops/pad.cpp
index c1ca44a611d..159c7494584 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/pad.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/pad.cpp
@@ -8,7 +8,7 @@
 
 #include "ngraph/op/pad.hpp"
 
-#include "cldnn/primitives/border.hpp"
+#include "intel_gpu/primitives/border.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp b/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp
index 4712339350d..f474aebe6a4 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp
@@ -7,10 +7,10 @@
 
 #include "ngraph/op/parameter.hpp"
 
-#include "cldnn/primitives/input_layout.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/primitives/concatenation.hpp"
+#include "intel_gpu/primitives/input_layout.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/primitives/concatenation.hpp"
 
 using namespace InferenceEngine;
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp b/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp
index 74688f1375c..bec3db76189 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/max_pool.hpp"
 #include "ngraph/op/avg_pool.hpp"
 
-#include "cldnn/primitives/pooling.hpp"
+#include "intel_gpu/primitives/pooling.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp b/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp
index 2aa29fb03d7..b40ea9a9736 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/prior_box.hpp"
 #include "ngraph/op/prior_box_clustered.hpp"
 
-#include "cldnn/primitives/prior_box.hpp"
+#include "intel_gpu/primitives/prior_box.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp b/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp
index ffca6d4e382..8048af72f57 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp
@@ -7,9 +7,9 @@
 
 #include "ngraph/op/proposal.hpp"
 
-#include "cldnn/primitives/proposal.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/primitives/proposal.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/reduce.cpp b/src/plugins/intel_gpu/src/plugin/ops/reduce.cpp
index fdb8c49277c..d59c42e5805 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/reduce.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/reduce.cpp
@@ -16,9 +16,9 @@
 #include "ngraph/op/max.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/reduce.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/reshape.hpp"
+#include "intel_gpu/primitives/reduce.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp b/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp
index f6bf4d9b282..fac0cb0573b 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/region_yolo.hpp"
 
-#include "cldnn/primitives/region_yolo.hpp"
+#include "intel_gpu/primitives/region_yolo.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/reorg_yolo.cpp b/src/plugins/intel_gpu/src/plugin/ops/reorg_yolo.cpp
index 45a8efc7d93..883d2cc4d6c 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/reorg_yolo.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/reorg_yolo.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/reorg_yolo.hpp"
 
-#include "cldnn/primitives/reorg_yolo.hpp"
+#include "intel_gpu/primitives/reorg_yolo.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/reshape.cpp b/src/plugins/intel_gpu/src/plugin/ops/reshape.cpp
index 33cf81595c9..e01a30f7856 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/reshape.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/reshape.cpp
@@ -9,8 +9,8 @@
 #include "ngraph/op/squeeze.hpp"
 #include "ngraph/op/unsqueeze.hpp"
 
-#include "cldnn/primitives/reshape.hpp"
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/result.cpp b/src/plugins/intel_gpu/src/plugin/ops/result.cpp
index cfc6331ef23..d591a47da55 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/result.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/result.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/result.hpp"
 
-#include "cldnn/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
 
 using namespace InferenceEngine;
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/reverse_sequence.cpp b/src/plugins/intel_gpu/src/plugin/ops/reverse_sequence.cpp
index 2e33cd9123c..8deb5f7ad95 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/reverse_sequence.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/reverse_sequence.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/reverse_sequence.hpp"
 
-#include "cldnn/primitives/reverse_sequence.hpp"
+#include "intel_gpu/primitives/reverse_sequence.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp b/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp
index 5412bc4d221..28a3bea4506 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp
@@ -8,12 +8,12 @@
 #include "ngraph/op/lstm_cell.hpp"
 #include "ngraph/op/lstm_sequence.hpp"
 
-#include "cldnn/primitives/reshape.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/fully_connected.hpp"
-#include "cldnn/primitives/lstm.hpp"
-#include "cldnn/primitives/crop.hpp"
-#include "cldnn/primitives/concatenation.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/fully_connected.hpp"
+#include "intel_gpu/primitives/lstm.hpp"
+#include "intel_gpu/primitives/crop.hpp"
+#include "intel_gpu/primitives/concatenation.hpp"
 
 namespace CLDNNPlugin {
 static cldnn::activation_func GetActivationFunc(std::string name) {
diff --git a/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp b/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp
index 1eda818d148..3e398270e64 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp
@@ -4,7 +4,7 @@
 #include "cldnn_program.h"
 #include "cldnn_common_utils.h"
 #include "ngraph/op/roi_align.hpp"
-#include "cldnn/primitives/roi_align.hpp"
+#include "intel_gpu/primitives/roi_align.hpp"
 #include <memory>
 
 namespace CLDNNPlugin {
diff --git a/src/plugins/intel_gpu/src/plugin/ops/roi_pooling.cpp b/src/plugins/intel_gpu/src/plugin/ops/roi_pooling.cpp
index 204de83727a..d486caf8587 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/roi_pooling.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/roi_pooling.cpp
@@ -9,7 +9,7 @@
 #include "ngraph/op/psroi_pooling.hpp"
 #include "ngraph/op/deformable_psroi_pooling.hpp"
 
-#include "cldnn/primitives/roi_pooling.hpp"
+#include "intel_gpu/primitives/roi_pooling.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp b/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp
index 6e8a93d9f2b..6c44082226a 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/scatter_elements_update.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/scatter_elements_update.hpp"
+#include "intel_gpu/primitives/scatter_elements_update.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp b/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp
index b57a2090f6d..7fb11a65f1c 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/scatter_nd_update.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/scatter_nd_update.hpp"
+#include "intel_gpu/primitives/scatter_nd_update.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/scatter_update.cpp b/src/plugins/intel_gpu/src/plugin/ops/scatter_update.cpp
index 5769536e08f..fbbd918a10f 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/scatter_update.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/scatter_update.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/scatter_update.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/scatter_update.hpp"
+#include "intel_gpu/primitives/scatter_update.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/select.cpp b/src/plugins/intel_gpu/src/plugin/ops/select.cpp
index 7d55ef49862..4cb50b6a026 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/select.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/select.cpp
@@ -7,9 +7,9 @@
 
 #include "ngraph/op/select.hpp"
 
-#include "cldnn/primitives/select.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/primitives/reshape.hpp"
+#include "intel_gpu/primitives/select.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp b/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp
index 2ac540a5e3a..3eb3db0143e 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/shuffle_channels.hpp"
 
-#include "cldnn/primitives/shuffle_channels.hpp"
+#include "intel_gpu/primitives/shuffle_channels.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/softmax.cpp b/src/plugins/intel_gpu/src/plugin/ops/softmax.cpp
index b9fe1ef89f7..2a457426afd 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/softmax.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/softmax.cpp
@@ -8,8 +8,8 @@
 #include "ngraph/op/softmax.hpp"
 #include "ngraph/op/log_softmax.hpp"
 
-#include "cldnn/primitives/softmax.hpp"
-#include "cldnn/primitives/activation.hpp"
+#include "intel_gpu/primitives/softmax.hpp"
+#include "intel_gpu/primitives/activation.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp b/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp
index 7471f3e2327..8ea2aec6435 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/space_to_batch.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/space_to_batch.hpp"
+#include "intel_gpu/primitives/space_to_batch.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/space_to_depth.cpp b/src/plugins/intel_gpu/src/plugin/ops/space_to_depth.cpp
index 8aa81351006..3b0384717bf 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/space_to_depth.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/space_to_depth.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/space_to_depth.hpp"
 
-#include "cldnn/primitives/space_to_depth.hpp"
+#include "intel_gpu/primitives/space_to_depth.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/split.cpp b/src/plugins/intel_gpu/src/plugin/ops/split.cpp
index 33d3e8084e9..d102b43bbd7 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/split.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/split.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/split.hpp"
 #include "ngraph/op/variadic_split.hpp"
 
-#include "cldnn/primitives/crop.hpp"
+#include "intel_gpu/primitives/crop.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp b/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp
index 696a0cab959..c80246e82c7 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp
@@ -8,9 +8,9 @@
 #include "ngraph/op/strided_slice.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/strided_slice.hpp"
-#include "cldnn/primitives/reshape.hpp"
-#include "cldnn/primitives/crop.hpp"
+#include "intel_gpu/primitives/strided_slice.hpp"
+#include "intel_gpu/primitives/reshape.hpp"
+#include "intel_gpu/primitives/crop.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/tensor_iterator.cpp b/src/plugins/intel_gpu/src/plugin/ops/tensor_iterator.cpp
index 5e3240d35a8..251be982867 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/tensor_iterator.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/tensor_iterator.cpp
@@ -13,11 +13,11 @@
 #include "ngraph/op/constant.hpp"
 #include "ngraph/op/util/sub_graph_base.hpp"
 
-#include "cldnn/primitives/loop.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/primitives/data.hpp"
-#include "cldnn/primitives/reorder.hpp"
-#include "cldnn/graph/topology.hpp"
+#include "intel_gpu/primitives/loop.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/primitives/data.hpp"
+#include "intel_gpu/primitives/reorder.hpp"
+#include "intel_gpu/graph/topology.hpp"
 
 #include <vector>
 #include <algorithm>
diff --git a/src/plugins/intel_gpu/src/plugin/ops/tile.cpp b/src/plugins/intel_gpu/src/plugin/ops/tile.cpp
index e4450effd8d..40eb817141b 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/tile.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/tile.cpp
@@ -7,7 +7,7 @@
 
 #include "ngraph/op/tile.hpp"
 
-#include "cldnn/primitives/tile.hpp"
+#include "intel_gpu/primitives/tile.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/topk.cpp b/src/plugins/intel_gpu/src/plugin/ops/topk.cpp
index 27c44b154fd..423e53968bf 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/topk.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/topk.cpp
@@ -7,9 +7,9 @@
 
 #include "ngraph/op/topk.hpp"
 
-#include "cldnn/primitives/arg_max_min.hpp"
-#include "cldnn/primitives/mutable_data.hpp"
-#include "cldnn/runtime/debug_configuration.hpp"
+#include "intel_gpu/primitives/arg_max_min.hpp"
+#include "intel_gpu/primitives/mutable_data.hpp"
+#include "intel_gpu/runtime/debug_configuration.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp b/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp
index cff6d3e032c..db1a481acf6 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp
@@ -8,7 +8,7 @@
 #include "ngraph/op/transpose.hpp"
 #include "ngraph/op/constant.hpp"
 
-#include "cldnn/primitives/permute.hpp"
+#include "intel_gpu/primitives/permute.hpp"
 
 namespace CLDNNPlugin {
 
diff --git a/src/plugins/intel_gpu/src/plugin/ops/unary.cpp b/src/plugins/intel_gpu/src/plugin/ops/unary.cpp
index 5c681aaf1df..aa6132172fd 100644
--- a/src/plugins/intel_gpu/src/plugin/ops/unary.cpp
+++ b/src/plugins/intel_gpu/src/plugin/ops/unary.cpp
@@ -41,7 +41,7 @@
 #include "ngraph/op/hsigmoid.hpp"
 #include "ngraph/op/round.hpp"
 
-#include "cldnn/primitives/activation.hpp"
+#include "intel_gpu/primitives/activation.hpp"
 
 namespace CLDNNPlugin {