diff --git a/docs/template_plugin/src/template_plugin.cpp b/docs/template_plugin/src/template_plugin.cpp
index 7a27dcff5ed..67a47f90d75 100644
--- a/docs/template_plugin/src/template_plugin.cpp
+++ b/docs/template_plugin/src/template_plugin.cpp
@@ -72,9 +72,7 @@ InferenceEngine::ExecutableNetworkInternal::Ptr Plugin::LoadExeNetworkImpl(const
         }
     }
 
-    auto clonedNetwork = cloneNet(network);
-    ConstTransformer transformator(clonedNetwork.get());
-    transformator.fullTrim();
+    auto clonedNetwork = cloneNetwork(network);
 
     return std::make_shared<ExecutableNetwork>(*clonedNetwork, cfg);
 }
diff --git a/inference-engine/src/cldnn_engine/cldnn_engine.cpp b/inference-engine/src/cldnn_engine/cldnn_engine.cpp
index f2a348caff1..c242ee9ba0b 100644
--- a/inference-engine/src/cldnn_engine/cldnn_engine.cpp
+++ b/inference-engine/src/cldnn_engine/cldnn_engine.cpp
@@ -32,6 +32,8 @@
 #include <transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.hpp>
 #include <transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.hpp>
 #include "convert_function_to_cnn_network.hpp"
+#include <graph_transformer.h>
+#include <ie_util_internal.hpp>
 
 #undef min
 #undef max
diff --git a/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp b/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
index e6c4cc3ad9e..9fa0341db20 100644
--- a/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
+++ b/inference-engine/src/gna_plugin/gna_plugin_entry_points.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <ie_plugin.hpp>
 #include <cpp_interfaces/base/ie_plugin_base.hpp>
+#include <ie_util_internal.hpp>
 #include "gna_plugin_internal.hpp"
 
 using namespace InferenceEngine;
diff --git a/inference-engine/src/hetero_plugin/hetero_executable_network.hpp b/inference-engine/src/hetero_plugin/hetero_executable_network.hpp
index 736cdd162b2..5b0b8796e79 100644
--- a/inference-engine/src/hetero_plugin/hetero_executable_network.hpp
+++ b/inference-engine/src/hetero_plugin/hetero_executable_network.hpp
@@ -16,7 +16,6 @@
 #include <unordered_set>
 
 #include <ie_common.h>
-#include <cpp/ie_plugin_cpp.hpp>
 #include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>
 
 #include "hetero_infer_request.hpp"
diff --git a/inference-engine/src/hetero_plugin/hetero_plugin.cpp b/inference-engine/src/hetero_plugin/hetero_plugin.cpp
index 0e7d4b995ec..ce5d967da89 100644
--- a/inference-engine/src/hetero_plugin/hetero_plugin.cpp
+++ b/inference-engine/src/hetero_plugin/hetero_plugin.cpp
@@ -15,6 +15,7 @@
 #include "hetero/hetero_plugin_config.hpp"
 #include <cpp_interfaces/base/ie_plugin_base.hpp>
 #include "hetero_executable_network.hpp"
+#include <ie_util_internal.hpp>
 
 using namespace InferenceEngine;
 using namespace InferenceEngine::PluginConfigParams;
diff --git a/inference-engine/src/hetero_plugin/hetero_plugin.hpp b/inference-engine/src/hetero_plugin/hetero_plugin.hpp
index 9b6cbd6043e..8ffa695b68c 100644
--- a/inference-engine/src/hetero_plugin/hetero_plugin.hpp
+++ b/inference-engine/src/hetero_plugin/hetero_plugin.hpp
@@ -7,7 +7,7 @@
 #include "description_buffer.hpp"
 #include "ie_icore.hpp"
 #include "cpp_interfaces/impl/ie_plugin_internal.hpp"
-#include "cpp/ie_plugin_cpp.hpp"
+#include "ie_util_internal.hpp"
 #include <memory>
 #include <string>
 #include <map>
diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp
index 587770ff0b8..3b88a77cf7c 100644
--- a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp
+++ b/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp
@@ -15,6 +15,8 @@
 #include <ie_system_conf.h>
 #include <generic_ie.hpp>
 #include <nodes/list.hpp>
+#include <graph_transformer.h>
+#include <ie_util_internal.hpp>
 
 #include "convert_function_to_cnn_network.hpp"
 #include <transformations/common_optimizations/common_optimizations.hpp>
diff --git a/inference-engine/src/multi_device/multi_device.cpp b/inference-engine/src/multi_device/multi_device.cpp
index 2f09d28b11c..f38903ab3d2 100644
--- a/inference-engine/src/multi_device/multi_device.cpp
+++ b/inference-engine/src/multi_device/multi_device.cpp
@@ -18,6 +18,7 @@
 #include <multi-device/multi_device_config.hpp>
 #include <ie_plugin_config.hpp>
 #include "multi_device.hpp"
+#include <ie_util_internal.hpp>
 
 namespace MultiDevicePlugin {
     using namespace InferenceEngine;
diff --git a/inference-engine/src/multi_device/multi_device.hpp b/inference-engine/src/multi_device/multi_device.hpp
index 29a40218a9f..411c78ec489 100644
--- a/inference-engine/src/multi_device/multi_device.hpp
+++ b/inference-engine/src/multi_device/multi_device.hpp
@@ -15,7 +15,6 @@
 #include <memory>
 #include <string>
 
-#include <cpp/ie_plugin_cpp.hpp>
 #include <ie_plugin_dispatcher.hpp>
 #include <cpp_interfaces/impl/ie_plugin_internal.hpp>
 #include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>
diff --git a/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp b/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp
index fb0221b025f..641166f56db 100644
--- a/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp
+++ b/inference-engine/src/plugin_api/cpp_interfaces/impl/ie_plugin_internal.hpp
@@ -10,8 +10,6 @@
 #pragma once
 
 #include <ie_plugin_config.hpp>
-#include <details/ie_cnn_network_tools.h>
-#include <ie_util_internal.hpp>
 
 #include <details/caseless.hpp>
 #include <map>
@@ -22,7 +20,6 @@
 #include "cpp_interfaces/base/ie_executable_network_base.hpp"
 #include "cpp_interfaces/impl/ie_executable_network_internal.hpp"
 #include "cpp_interfaces/interface/ie_iplugin_internal.hpp"
-#include "graph_transformer.h"
 
 using namespace InferenceEngine;
 using namespace InferenceEngine::details;
diff --git a/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp b/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp
index 2b7c78f618b..67fa3fcd343 100644
--- a/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp
+++ b/inference-engine/src/vpu/myriad_plugin/myriad_plugin.cpp
@@ -20,6 +20,7 @@
 
 #include "vpu/ngraph/transformations/dynamic_to_static_shape.hpp"
 #include "generic_ie.hpp"
+#include <ie_util_internal.hpp>
 
 #include "myriad_plugin.h"