diff --git a/.clang-tidy b/.clang-tidy
index 52724cdbf..84d708dd4 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -15,7 +15,6 @@ Checks: >
   -clang-analyzer-optin.cplusplus.UninitializedObject,
   -misc-const-correctness,
   -misc-header-include-cycle,
-  -misc-include-cleaner,
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
   -misc-unused-parameters,
@@ -28,6 +27,7 @@ Checks: >
   -readability-named-parameter
 
 WarningsAsErrors: "*"
+HeaderFilterRegex: '^(?!.*opencv2).*'
 
 CheckOptions:
   - key:             readability-identifier-naming.ClassCase
diff --git a/modules/core/perf/func_tests/perf_tests.cpp b/modules/core/perf/func_tests/perf_tests.cpp
index a5e184b9c..fd93b60a5 100644
--- a/modules/core/perf/func_tests/perf_tests.cpp
+++ b/modules/core/perf/func_tests/perf_tests.cpp
@@ -1,9 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/perf/func_tests/test_task.hpp"
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 
 TEST(perf_tests, check_perf_pipeline) {
   // Create data
diff --git a/modules/core/perf/src/perf.cpp b/modules/core/perf/src/perf.cpp
index c91fbc96d..4f1f3c490 100644
--- a/modules/core/perf/src/perf.cpp
+++ b/modules/core/perf/src/perf.cpp
@@ -2,9 +2,16 @@
 
 #include <gtest/gtest.h>
 
+#include <cstdint>
+#include <functional>
 #include <iomanip>
 #include <iostream>
+#include <memory>
 #include <sstream>
+#include <stdexcept>
+#include <string>
+
+#include "core/task/include/task.hpp"
 
 ppc::core::Perf::Perf(const std::shared_ptr<Task>& task_ptr) { SetTask(task_ptr); }
 
diff --git a/modules/core/task/func_tests/task_tests.cpp b/modules/core/task/func_tests/task_tests.cpp
index f610661fd..6f8065908 100644
--- a/modules/core/task/func_tests/task_tests.cpp
+++ b/modules/core/task/func_tests/task_tests.cpp
@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/func_tests/test_task.hpp"
diff --git a/modules/core/task/include/task.hpp b/modules/core/task/include/task.hpp
index 412042d5e..e6122a4d3 100644
--- a/modules/core/task/include/task.hpp
+++ b/modules/core/task/include/task.hpp
@@ -2,7 +2,6 @@
 
 #include <chrono>
 #include <cstdint>
-#include <filesystem>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/modules/core/task/src/task.cpp b/modules/core/task/src/task.cpp
index 0a5719239..ff0689d6d 100644
--- a/modules/core/task/src/task.cpp
+++ b/modules/core/task/src/task.cpp
@@ -2,7 +2,11 @@
 
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <iostream>
 #include <stdexcept>
+#include <string>
 #include <utility>
 
 void ppc::core::Task::SetData(TaskDataPtr task_data_ptr) {
diff --git a/modules/core/util/util.hpp b/modules/core/util/util.hpp
index db04df1ae..4d0ed4e3a 100644
--- a/modules/core/util/util.hpp
+++ b/modules/core/util/util.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdlib>
 #ifdef _WIN32
 #include <cstdint>
 #include <iostream>
diff --git a/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp
index b4db44b27..73ed0f7d3 100644
--- a/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp
+++ b/modules/ref/average_of_vector_elements/func_tests/ref_tests.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
 
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/average_of_vector_elements/include/ref_task.hpp b/modules/ref/average_of_vector_elements/include/ref_task.hpp
index 65195a78f..40e2282da 100644
--- a/modules/ref/average_of_vector_elements/include/ref_task.hpp
+++ b/modules/ref/average_of_vector_elements/include/ref_task.hpp
@@ -1,8 +1,6 @@
 #ifndef MODULES_REFERENCE_AVERAGE_OF_VECTOR_ELEMENTS_REF_TASK_HPP_
 #define MODULES_REFERENCE_AVERAGE_OF_VECTOR_ELEMENTS_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
 #include <memory>
 #include <numeric>
 #include <vector>
diff --git a/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp
index c01525951..06f34dc50 100644
--- a/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp
+++ b/modules/ref/max_of_vector_elements/func_tests/ref_tests.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
 
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/max_of_vector_elements/include/ref_task.hpp b/modules/ref/max_of_vector_elements/include/ref_task.hpp
index 2529667cc..80fdafeb9 100644
--- a/modules/ref/max_of_vector_elements/include/ref_task.hpp
+++ b/modules/ref/max_of_vector_elements/include/ref_task.hpp
@@ -1,11 +1,8 @@
 #ifndef MODULES_REFERENCE_MAX_OF_VECTOR_ELEMENTS_REF_TASK_HPP_
 #define MODULES_REFERENCE_MAX_OF_VECTOR_ELEMENTS_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
 #include <algorithm>
 #include <memory>
-#include <numeric>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp
index d8014d550..ec884943c 100644
--- a/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp
+++ b/modules/ref/min_of_vector_elements/func_tests/ref_tests.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
 
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/min_of_vector_elements/include/ref_task.hpp b/modules/ref/min_of_vector_elements/include/ref_task.hpp
index a787498a9..860f80508 100644
--- a/modules/ref/min_of_vector_elements/include/ref_task.hpp
+++ b/modules/ref/min_of_vector_elements/include/ref_task.hpp
@@ -1,11 +1,8 @@
 #ifndef MODULES_REFERENCE_MIN_OF_VECTOR_ELEMENTS_REF_TASK_HPP_
 #define MODULES_REFERENCE_MIN_OF_VECTOR_ELEMENTS_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
 #include <algorithm>
 #include <memory>
-#include <numeric>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp b/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp
index d0dba0364..2fc75f7b4 100644
--- a/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp
+++ b/modules/ref/most_different_neighbor_elements/func_tests/ref_tests.cpp
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
-#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/most_different_neighbor_elements/include/ref_task.hpp b/modules/ref/most_different_neighbor_elements/include/ref_task.hpp
index e7e0c9a28..350fb84a9 100644
--- a/modules/ref/most_different_neighbor_elements/include/ref_task.hpp
+++ b/modules/ref/most_different_neighbor_elements/include/ref_task.hpp
@@ -1,12 +1,8 @@
 #ifndef MODULES_REFERENCE_MOST_DIFFERENT_NEIGHBOR_ELEMENTS_REF_TASK_HPP_
 #define MODULES_REFERENCE_MOST_DIFFERENT_NEIGHBOR_ELEMENTS_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
 #include <algorithm>
-#include <functional>
 #include <memory>
-#include <numeric>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp b/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp
index 27e8566a9..aa4e8afeb 100644
--- a/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp
+++ b/modules/ref/nearest_neighbor_elements/func_tests/ref_tests.cpp
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
-#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/nearest_neighbor_elements/include/ref_task.hpp b/modules/ref/nearest_neighbor_elements/include/ref_task.hpp
index c095569e7..566bf5233 100644
--- a/modules/ref/nearest_neighbor_elements/include/ref_task.hpp
+++ b/modules/ref/nearest_neighbor_elements/include/ref_task.hpp
@@ -1,12 +1,8 @@
 #ifndef MODULES_REFERENCE_NEAREST_NEIGHBOR_ELEMENTS_REF_TASK_HPP_
 #define MODULES_REFERENCE_NEAREST_NEIGHBOR_ELEMENTS_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
 #include <algorithm>
-#include <functional>
 #include <memory>
-#include <numeric>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp b/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp
index 5fea9bce1..4fdd5c87b 100644
--- a/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp
+++ b/modules/ref/num_of_alternations_signs/func_tests/ref_tests.cpp
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
-#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/num_of_alternations_signs/include/ref_task.hpp b/modules/ref/num_of_alternations_signs/include/ref_task.hpp
index e749ef86b..85c7b7077 100644
--- a/modules/ref/num_of_alternations_signs/include/ref_task.hpp
+++ b/modules/ref/num_of_alternations_signs/include/ref_task.hpp
@@ -1,12 +1,9 @@
 #ifndef MODULES_REFERENCE_NUM_OF_ALTERNATIONS_SIGNS_REF_TASK_HPP_
 #define MODULES_REFERENCE_NUM_OF_ALTERNATIONS_SIGNS_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
 #include <algorithm>
 #include <functional>
 #include <memory>
-#include <numeric>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp b/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp
index 340df9ec4..bf9591959 100644
--- a/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp
+++ b/modules/ref/num_of_orderly_violations/func_tests/ref_tests.cpp
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 
-#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/num_of_orderly_violations/include/ref_task.hpp b/modules/ref/num_of_orderly_violations/include/ref_task.hpp
index b3a94d4f3..6301c5d4e 100644
--- a/modules/ref/num_of_orderly_violations/include/ref_task.hpp
+++ b/modules/ref/num_of_orderly_violations/include/ref_task.hpp
@@ -1,12 +1,8 @@
 #ifndef MODULES_REFERENCE_NUM_OF_ORDERLY_VIOLATIONS_REF_TASK_HPP_
 #define MODULES_REFERENCE_NUM_OF_ORDERLY_VIOLATIONS_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
 #include <algorithm>
-#include <functional>
 #include <memory>
-#include <numeric>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp b/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp
index 106d8655e..fa24db952 100644
--- a/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp
+++ b/modules/ref/sum_of_vector_elements/func_tests/ref_tests.cpp
@@ -1,5 +1,7 @@
 #include <gtest/gtest.h>
 
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/sum_of_vector_elements/include/ref_task.hpp b/modules/ref/sum_of_vector_elements/include/ref_task.hpp
index 3a09cd99c..de612dda1 100644
--- a/modules/ref/sum_of_vector_elements/include/ref_task.hpp
+++ b/modules/ref/sum_of_vector_elements/include/ref_task.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <gtest/gtest.h>
-
 #include <memory>
 #include <numeric>
 #include <vector>
diff --git a/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp b/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp
index 54456eaef..a6af378f6 100644
--- a/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp
+++ b/modules/ref/sum_values_by_rows_matrix/func_tests/ref_tests.cpp
@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp b/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp
index c07a58270..5175e66b5 100644
--- a/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp
+++ b/modules/ref/sum_values_by_rows_matrix/include/ref_task.hpp
@@ -1,8 +1,7 @@
 #ifndef MODULES_REFERENCE_SUM_VALUES_BY_ROWS_MATRIX_REF_TASK_HPP_
 #define MODULES_REFERENCE_SUM_VALUES_BY_ROWS_MATRIX_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
+#include <cstddef>
 #include <memory>
 #include <numeric>
 #include <vector>
diff --git a/modules/ref/vector_dot_product/func_tests/ref_tests.cpp b/modules/ref/vector_dot_product/func_tests/ref_tests.cpp
index 3e727b833..a1f987e52 100644
--- a/modules/ref/vector_dot_product/func_tests/ref_tests.cpp
+++ b/modules/ref/vector_dot_product/func_tests/ref_tests.cpp
@@ -1,5 +1,8 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/modules/ref/vector_dot_product/include/ref_task.hpp b/modules/ref/vector_dot_product/include/ref_task.hpp
index 7929726c5..03a69d9e2 100644
--- a/modules/ref/vector_dot_product/include/ref_task.hpp
+++ b/modules/ref/vector_dot_product/include/ref_task.hpp
@@ -1,8 +1,7 @@
 #ifndef MODULES_REFERENCE_VECTOR_DOT_PRODUCT_REF_TASK_HPP_
 #define MODULES_REFERENCE_VECTOR_DOT_PRODUCT_REF_TASK_HPP_
 
-#include <gtest/gtest.h>
-
+#include <cstddef>
 #include <memory>
 #include <numeric>
 #include <vector>
diff --git a/tasks/all/example/func_tests/func_all.cpp b/tasks/all/example/func_tests/func_all.cpp
index 072c347e4..da7389c0c 100644
--- a/tasks/all/example/func_tests/func_all.cpp
+++ b/tasks/all/example/func_tests/func_all.cpp
@@ -1,9 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <opencv2/opencv.hpp>
 #include <vector>
 
 #include "all/example/include/ops_all.hpp"
+#include "core/task/include/task.hpp"
 #include "core/util/util.hpp"
 
 TEST(nesterov_a_test_task_all, test_matmul_50) {
diff --git a/tasks/all/example/include/ops_all.hpp b/tasks/all/example/include/ops_all.hpp
index a919d81db..c1cb268cc 100644
--- a/tasks/all/example/include/ops_all.hpp
+++ b/tasks/all/example/include/ops_all.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include <oneapi/tbb.h>
-
 #include <boost/mpi/collectives.hpp>
 #include <boost/mpi/communicator.hpp>
+#include <utility>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/tasks/all/example/perf_tests/perf_all.cpp b/tasks/all/example/perf_tests/perf_all.cpp
index 7e664ba8b..820a24263 100644
--- a/tasks/all/example/perf_tests/perf_all.cpp
+++ b/tasks/all/example/perf_tests/perf_all.cpp
@@ -1,9 +1,15 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "all/example/include/ops_all.hpp"
+#include "boost/mpi/communicator.hpp"
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 
 TEST(nesterov_a_test_task_all, test_pipeline_run) {
   constexpr int kCount = 400;
diff --git a/tasks/all/example/src/ops_all.cpp b/tasks/all/example/src/ops_all.cpp
index 2a9a1698e..673559ada 100644
--- a/tasks/all/example/src/ops_all.cpp
+++ b/tasks/all/example/src/ops_all.cpp
@@ -1,9 +1,14 @@
 #include "all/example/include/ops_all.hpp"
 
 #include <cmath>
+#include <cstddef>
+#include <functional>
 #include <thread>
+#include <vector>
 
 #include "core/util/util.hpp"
+#include "oneapi/tbb/task_arena.h"
+#include "oneapi/tbb/task_group.h"
 
 namespace {
 void MatMul(const std::vector<int> &in_vec, int rc_size, std::vector<int> &out_vec) {
diff --git a/tasks/all/runner.cpp b/tasks/all/runner.cpp
index 3a6b34b62..86c2de286 100644
--- a/tasks/all/runner.cpp
+++ b/tasks/all/runner.cpp
@@ -3,7 +3,13 @@
 
 #include <boost/mpi/communicator.hpp>
 #include <boost/mpi/environment.hpp>
+#include <cstdio>
+#include <cstdlib>
 #include <memory>
+#include <string>
+#include <utility>
+
+#include "oneapi/tbb/global_control.h"
 
 class UnreadMessagesDetector : public ::testing::EmptyTestEventListener {
  public:
diff --git a/tasks/mpi/example/func_tests/main.cpp b/tasks/mpi/example/func_tests/main.cpp
index cd3ad6ffa..44d41ef32 100644
--- a/tasks/mpi/example/func_tests/main.cpp
+++ b/tasks/mpi/example/func_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
+#include <memory>
+#include <string>
 #include <vector>
 
+#include "core/task/include/task.hpp"
 #include "core/util/util.hpp"
 #include "mpi/example/include/ops_mpi.hpp"
 
diff --git a/tasks/mpi/example/include/ops_mpi.hpp b/tasks/mpi/example/include/ops_mpi.hpp
index 43a88592b..758631967 100644
--- a/tasks/mpi/example/include/ops_mpi.hpp
+++ b/tasks/mpi/example/include/ops_mpi.hpp
@@ -1,10 +1,7 @@
 #pragma once
 
-#include <gtest/gtest.h>
-
 #include <boost/mpi/collectives.hpp>
 #include <boost/mpi/communicator.hpp>
-#include <memory>
 #include <utility>
 #include <vector>
 
diff --git a/tasks/mpi/example/perf_tests/main.cpp b/tasks/mpi/example/perf_tests/main.cpp
index 7402e7328..2b52c4c67 100644
--- a/tasks/mpi/example/perf_tests/main.cpp
+++ b/tasks/mpi/example/perf_tests/main.cpp
@@ -1,8 +1,14 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
+#include "boost/mpi/communicator.hpp"
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 #include "mpi/example/include/ops_mpi.hpp"
 
 TEST(nesterov_a_test_task_mpi, test_pipeline_run) {
diff --git a/tasks/mpi/example/src/ops_mpi.cpp b/tasks/mpi/example/src/ops_mpi.cpp
index 1fa585bed..5f5d281ce 100644
--- a/tasks/mpi/example/src/ops_mpi.cpp
+++ b/tasks/mpi/example/src/ops_mpi.cpp
@@ -1,6 +1,7 @@
 #include "mpi/example/include/ops_mpi.hpp"
 
 #include <cmath>
+#include <cstddef>
 #include <vector>
 
 bool nesterov_a_test_task_mpi::TestTaskMPI::PreProcessingImpl() {
diff --git a/tasks/mpi/runner.cpp b/tasks/mpi/runner.cpp
index dc5256667..202dcb6a7 100644
--- a/tasks/mpi/runner.cpp
+++ b/tasks/mpi/runner.cpp
@@ -2,7 +2,11 @@
 
 #include <boost/mpi/communicator.hpp>
 #include <boost/mpi/environment.hpp>
+#include <cstdio>
+#include <cstdlib>
 #include <memory>
+#include <string>
+#include <utility>
 
 class UnreadMessagesDetector : public ::testing::EmptyTestEventListener {
  public:
diff --git a/tasks/omp/example/func_tests/main.cpp b/tasks/omp/example/func_tests/main.cpp
index 2b32f8db4..fbc7a5811 100644
--- a/tasks/omp/example/func_tests/main.cpp
+++ b/tasks/omp/example/func_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
+#include <memory>
+#include <string>
 #include <vector>
 
+#include "core/task/include/task.hpp"
 #include "core/util/util.hpp"
 #include "omp/example/include/ops_omp.hpp"
 
diff --git a/tasks/omp/example/include/ops_omp.hpp b/tasks/omp/example/include/ops_omp.hpp
index 039919d62..fef03e988 100644
--- a/tasks/omp/example/include/ops_omp.hpp
+++ b/tasks/omp/example/include/ops_omp.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <utility>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/tasks/omp/example/perf_tests/main.cpp b/tasks/omp/example/perf_tests/main.cpp
index 7d28c3e97..a53cb7511 100644
--- a/tasks/omp/example/perf_tests/main.cpp
+++ b/tasks/omp/example/perf_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 #include "omp/example/include/ops_omp.hpp"
 
 TEST(nesterov_a_test_task_omp, test_pipeline_run) {
diff --git a/tasks/omp/example/src/ops_omp.cpp b/tasks/omp/example/src/ops_omp.cpp
index 214b97294..7db50f2d5 100644
--- a/tasks/omp/example/src/ops_omp.cpp
+++ b/tasks/omp/example/src/ops_omp.cpp
@@ -1,6 +1,7 @@
 #include "omp/example/include/ops_omp.hpp"
 
 #include <cmath>
+#include <cstddef>
 #include <vector>
 
 bool nesterov_a_test_task_omp::TestTaskOpenMP::PreProcessingImpl() {
diff --git a/tasks/seq/example/func_tests/main.cpp b/tasks/seq/example/func_tests/main.cpp
index 40dc0a3ce..5390089db 100644
--- a/tasks/seq/example/func_tests/main.cpp
+++ b/tasks/seq/example/func_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
+#include <memory>
+#include <string>
 #include <vector>
 
+#include "core/task/include/task.hpp"
 #include "core/util/util.hpp"
 #include "seq/example/include/ops_seq.hpp"
 
diff --git a/tasks/seq/example/include/ops_seq.hpp b/tasks/seq/example/include/ops_seq.hpp
index 6bd579b75..728bde58d 100644
--- a/tasks/seq/example/include/ops_seq.hpp
+++ b/tasks/seq/example/include/ops_seq.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <utility>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/tasks/seq/example/perf_tests/main.cpp b/tasks/seq/example/perf_tests/main.cpp
index 34de94f62..3dfe18048 100644
--- a/tasks/seq/example/perf_tests/main.cpp
+++ b/tasks/seq/example/perf_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 #include "seq/example/include/ops_seq.hpp"
 
 TEST(nesterov_a_test_task_seq, test_pipeline_run) {
diff --git a/tasks/seq/example/src/ops_seq.cpp b/tasks/seq/example/src/ops_seq.cpp
index d58193713..23639db05 100644
--- a/tasks/seq/example/src/ops_seq.cpp
+++ b/tasks/seq/example/src/ops_seq.cpp
@@ -1,7 +1,8 @@
 #include "seq/example/include/ops_seq.hpp"
 
 #include <cmath>
-#include <thread>
+#include <cstddef>
+#include <vector>
 
 bool nesterov_a_test_task_seq::TestTaskSequential::PreProcessingImpl() {
   // Init value for input and output
diff --git a/tasks/seq/example_disabled/func_tests/main.cpp b/tasks/seq/example_disabled/func_tests/main.cpp
index 40dc0a3ce..5390089db 100644
--- a/tasks/seq/example_disabled/func_tests/main.cpp
+++ b/tasks/seq/example_disabled/func_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
+#include <memory>
+#include <string>
 #include <vector>
 
+#include "core/task/include/task.hpp"
 #include "core/util/util.hpp"
 #include "seq/example/include/ops_seq.hpp"
 
diff --git a/tasks/seq/example_disabled/include/ops_seq.hpp b/tasks/seq/example_disabled/include/ops_seq.hpp
index 6bd579b75..728bde58d 100644
--- a/tasks/seq/example_disabled/include/ops_seq.hpp
+++ b/tasks/seq/example_disabled/include/ops_seq.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <utility>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/tasks/seq/example_disabled/perf_tests/main.cpp b/tasks/seq/example_disabled/perf_tests/main.cpp
index 34de94f62..3dfe18048 100644
--- a/tasks/seq/example_disabled/perf_tests/main.cpp
+++ b/tasks/seq/example_disabled/perf_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 #include "seq/example/include/ops_seq.hpp"
 
 TEST(nesterov_a_test_task_seq, test_pipeline_run) {
diff --git a/tasks/seq/example_disabled/src/ops_seq.cpp b/tasks/seq/example_disabled/src/ops_seq.cpp
index d58193713..23639db05 100644
--- a/tasks/seq/example_disabled/src/ops_seq.cpp
+++ b/tasks/seq/example_disabled/src/ops_seq.cpp
@@ -1,7 +1,8 @@
 #include "seq/example/include/ops_seq.hpp"
 
 #include <cmath>
-#include <thread>
+#include <cstddef>
+#include <vector>
 
 bool nesterov_a_test_task_seq::TestTaskSequential::PreProcessingImpl() {
   // Init value for input and output
diff --git a/tasks/stl/example/func_tests/main.cpp b/tasks/stl/example/func_tests/main.cpp
index bcc096b9e..b706364ed 100644
--- a/tasks/stl/example/func_tests/main.cpp
+++ b/tasks/stl/example/func_tests/main.cpp
@@ -1,9 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
-#include <thread>
+#include <memory>
+#include <string>
 #include <vector>
 
+#include "core/task/include/task.hpp"
 #include "core/util/util.hpp"
 #include "stl/example/include/ops_stl.hpp"
 
diff --git a/tasks/stl/example/include/ops_stl.hpp b/tasks/stl/example/include/ops_stl.hpp
index 3e56f9de9..05b6b6dbf 100644
--- a/tasks/stl/example/include/ops_stl.hpp
+++ b/tasks/stl/example/include/ops_stl.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <utility>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/tasks/stl/example/perf_tests/main.cpp b/tasks/stl/example/perf_tests/main.cpp
index 3106beef8..7d5065dfe 100644
--- a/tasks/stl/example/perf_tests/main.cpp
+++ b/tasks/stl/example/perf_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 #include "stl/example/include/ops_stl.hpp"
 
 TEST(nesterov_a_test_task_stl, test_pipeline_run) {
diff --git a/tasks/stl/example/src/ops_stl.cpp b/tasks/stl/example/src/ops_stl.cpp
index d656391bb..61f1302e9 100644
--- a/tasks/stl/example/src/ops_stl.cpp
+++ b/tasks/stl/example/src/ops_stl.cpp
@@ -1,7 +1,8 @@
 #include "stl/example/include/ops_stl.hpp"
 
 #include <cmath>
-#include <future>
+#include <cstddef>
+#include <functional>
 #include <thread>
 #include <vector>
 
diff --git a/tasks/tbb/example/func_tests/main.cpp b/tasks/tbb/example/func_tests/main.cpp
index 20b732bad..f0aa3868d 100644
--- a/tasks/tbb/example/func_tests/main.cpp
+++ b/tasks/tbb/example/func_tests/main.cpp
@@ -1,9 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <fstream>
-#include <random>
+#include <memory>
+#include <string>
 #include <vector>
 
+#include "core/task/include/task.hpp"
 #include "core/util/util.hpp"
 #include "tbb/example/include/ops_tbb.hpp"
 
diff --git a/tasks/tbb/example/include/ops_tbb.hpp b/tasks/tbb/example/include/ops_tbb.hpp
index 0fe668d73..4e6286bd5 100644
--- a/tasks/tbb/example/include/ops_tbb.hpp
+++ b/tasks/tbb/example/include/ops_tbb.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <utility>
 #include <vector>
 
 #include "core/task/include/task.hpp"
diff --git a/tasks/tbb/example/perf_tests/main.cpp b/tasks/tbb/example/perf_tests/main.cpp
index 4e59cf13a..b6e4fedae 100644
--- a/tasks/tbb/example/perf_tests/main.cpp
+++ b/tasks/tbb/example/perf_tests/main.cpp
@@ -1,8 +1,13 @@
 #include <gtest/gtest.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <vector>
 
 #include "core/perf/include/perf.hpp"
+#include "core/task/include/task.hpp"
 #include "tbb/example/include/ops_tbb.hpp"
 
 TEST(nesterov_a_test_task_tbb, test_pipeline_run) {
diff --git a/tasks/tbb/example/src/ops_tbb.cpp b/tasks/tbb/example/src/ops_tbb.cpp
index 4f36ec169..f82673a2d 100644
--- a/tasks/tbb/example/src/ops_tbb.cpp
+++ b/tasks/tbb/example/src/ops_tbb.cpp
@@ -4,8 +4,12 @@
 
 #include <cmath>
 #include <core/util/util.hpp>
+#include <cstddef>
 #include <vector>
 
+#include "oneapi/tbb/task_arena.h"
+#include "oneapi/tbb/task_group.h"
+
 namespace {
 void MatMul(const std::vector<int> &in_vec, int rc_size, std::vector<int> &out_vec) {
   for (int i = 0; i < rc_size; ++i) {
diff --git a/tasks/tbb/runner.cpp b/tasks/tbb/runner.cpp
index 02a1bf0c0..eb71d7ece 100644
--- a/tasks/tbb/runner.cpp
+++ b/tasks/tbb/runner.cpp
@@ -2,6 +2,7 @@
 #include <tbb/global_control.h>
 
 #include "core/util/util.hpp"
+#include "oneapi/tbb/global_control.h"
 
 int main(int argc, char** argv) {
   // Limit the number of threads in TBB