diff --git a/config/config.cpp b/config/config.cpp
index 1265b95..b451da7 100644
--- a/config/config.cpp
+++ b/config/config.cpp
@@ -3,13 +3,12 @@
 
 #include "config.h"
 
-#include <climits>
+#include <cstdint>
 #include <filesystem>
+#include <string>
 
 #include "config_reader.h"
 
-using namespace std;
-
 namespace config {
 
 std::string log_file = "";
diff --git a/config/config.h b/config/config.h
index ed28d4a..99196a4 100644
--- a/config/config.h
+++ b/config/config.h
@@ -3,12 +3,11 @@
 
 #pragma once
 
-#define VISIBLE_FOR_TESTING __attribute__((visibility("default")))
-
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 
+#define VISIBLE_FOR_TESTING __attribute__((visibility("default")))
+
 namespace config {
 enum ConfigOption {
   USE_QAT_COMPRESS,
diff --git a/config/config_reader.cpp b/config/config_reader.cpp
index 64a166d..93c0be9 100644
--- a/config/config_reader.cpp
+++ b/config/config_reader.cpp
@@ -4,6 +4,8 @@
 #include "config_reader.h"
 
 #include <algorithm>
+#include <cstdint>
+#include <exception>
 #include <fstream>
 #include <regex>
 #include <sstream>
diff --git a/config/config_reader.h b/config/config_reader.h
index 8edd9ba..6b61d00 100644
--- a/config/config_reader.h
+++ b/config/config_reader.h
@@ -3,10 +3,9 @@
 
 #pragma once
 
-#include <stdint.h>
-
-#include <iostream>
+#include <cstdint>
 #include <map>
+#include <string>
 
 // The responsibility of this class is to parse the
 // Config file and store it in the std::map
diff --git a/iaa.cpp b/iaa.cpp
index 2580a24..1ec6fe2 100644
--- a/iaa.cpp
+++ b/iaa.cpp
@@ -1,18 +1,21 @@
 // Copyright (C) 2025 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
+#ifdef USE_IAA
+
 #include "iaa.h"
 
+#include <cstdint>
+#include <memory>
+#include <new>
+#include <thread>
+#include <utility>
+
 #include "config/config.h"
 #include "logging.h"
-#include "utils.h"
 
 using namespace config;
 
-#ifdef USE_IAA
-
-#include "utils.h"
-
 void IAAJob::InitJob(qpl_path_t execution_path) {
   uint32_t size;
   qpl_status status = qpl_get_job_size(execution_path, &size);
diff --git a/iaa.h b/iaa.h
index 214ed13..94e1b5b 100644
--- a/iaa.h
+++ b/iaa.h
@@ -4,13 +4,15 @@
 #pragma once
 
 #ifdef USE_IAA
-#define VISIBLE_FOR_TESTING __attribute__((visibility("default")))
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
 #include "qpl/qpl.h"
 
+#define VISIBLE_FOR_TESTING __attribute__((visibility("default")))
+
 inline constexpr unsigned int PREPENDED_BLOCK_LENGTH = 5;
 inline constexpr unsigned int MAX_BUFFER_SIZE = (2 << 20);
 
diff --git a/logging.h b/logging.h
index 911c473..4918b1e 100644
--- a/logging.h
+++ b/logging.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <fstream>
 #include <iostream>
 #include <memory>
diff --git a/qat.cpp b/qat.cpp
index bcebea7..0a2dd67 100644
--- a/qat.cpp
+++ b/qat.cpp
@@ -1,16 +1,20 @@
 // Copyright (C) 2025 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
+#ifdef USE_QAT
+
 #include "qat.h"
 
+#include <cstdint>
+#include <cstring>
+#include <new>
+#include <utility>
+
 #include "config/config.h"
 #include "logging.h"
-#include "utils.h"
 
 using namespace config;
 
-#ifdef USE_QAT
-
 void QATJob::QzSessionDeleter::operator()(QzSession_T *qzSession) const {
   if (!qzSession) {
     return;
diff --git a/qat.h b/qat.h
index 6709aba..3a04045 100644
--- a/qat.h
+++ b/qat.h
@@ -4,14 +4,16 @@
 #pragma once
 
 #ifdef USE_QAT
-#define VISIBLE_FOR_TESTING __attribute__((visibility("default")))
 
 #include <qatzip.h>
 
+#include <cstdint>
 #include <memory>
 
 #include "utils.h"
 
+#define VISIBLE_FOR_TESTING __attribute__((visibility("default")))
+
 inline constexpr unsigned int QAT_HW_BUFF_SZ = QZ_HW_BUFF_MAX_SZ;
 
 class QATJob {
diff --git a/sharded_map.h b/sharded_map.h
index 4319168..ab8dda8 100644
--- a/sharded_map.h
+++ b/sharded_map.h
@@ -1,15 +1,15 @@
 // Copyright (C) 2025 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef SHARDED_MAP_H
-#define SHARDED_MAP_H
+#pragma once
 
-#include <memory>
-#include <mutex>
+#include <functional>
 #include <shared_mutex>
+#include <string>
 #include <unordered_map>
+#include <utility>
 
-static const int SHARDS = 64;
+static constexpr int SHARDS = 64;
 
 template <typename Key, typename Value>
 class ShardedMap {
@@ -45,5 +45,3 @@ class ShardedMap {
   std::shared_mutex shard_mutexes[SHARDS];
   std::hash<std::string> hash;
 };
-
-#endif  // SHARDED_MAP_H
diff --git a/statistics.cpp b/statistics.cpp
index e0a93ff..9dabeb6 100644
--- a/statistics.cpp
+++ b/statistics.cpp
@@ -2,14 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "statistics.h"
+
 #ifdef ENABLE_STATISTICS
-#include <algorithm>
+
 #include <array>
-#include <sstream>
+#include <cstddef>
+#include <cstdint>
 #include <thread>
 
 #include "config/config.h"
 #include "logging.h"
+
 using namespace config;
 
 const std::array<const char*, STATS_COUNT> stat_names{
@@ -27,8 +30,7 @@ void PrintStats() {
   if (total_operations % configs[LOG_STATS_SAMPLES] != 0) {
     return;
   }
-  LogStats("Thread: ",
-           (std::ostringstream() << std::this_thread::get_id()).str(), "\n");
+  LogStats("Thread: ", std::this_thread::get_id(), "\n");
   for (size_t i = 0; i < stats.size(); ++i) {
     LogStats(stat_names[i], " = ", stats[i], "\n");
   }
diff --git a/tests/test_utils.cpp b/tests/test_utils.cpp
index 3b6cf4f..afb9dc8 100644
--- a/tests/test_utils.cpp
+++ b/tests/test_utils.cpp
@@ -3,7 +3,9 @@
 
 #include "test_utils.h"
 
+#include <cstring>
 #include <iostream>
+#include <string>
 
 #ifdef DEBUG_LOG
 void Log(std::string message) { std::cout << message << std::endl; }
diff --git a/tests/test_utils.h b/tests/test_utils.h
index 62350ac..17b7336 100644
--- a/tests/test_utils.h
+++ b/tests/test_utils.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <cstring>
+#include <cstddef>
 #include <string>
 
 #include "../zlib_accel.h"
diff --git a/utils.cpp b/utils.cpp
index 6f311f5..82ff618 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -3,6 +3,8 @@
 
 #include "utils.h"
 
+#include <cstdint>
+
 CompressedFormat GetCompressedFormat(int window_bits) {
   if (window_bits >= -15 && window_bits <= -8) {
     return CompressedFormat::DEFLATE_RAW;
diff --git a/utils.h b/utils.h
index 9ca6d32..7b6ddf3 100644
--- a/utils.h
+++ b/utils.h
@@ -5,8 +5,9 @@
 
 #include <cstdint>
 
-#define GZIP_EXT_XHDR_SIZE 14
-#define GZIP_EXT_HDRFTR_SIZE 32  // size of header + footer for gzip ext format
+inline constexpr uint32_t GZIP_EXT_XHDR_SIZE = 14;
+inline constexpr uint32_t GZIP_EXT_HDRFTR_SIZE =
+    32;  // size of header + footer for gzip ext format
 
 enum class CompressedFormat { DEFLATE_RAW, ZLIB, GZIP, INVALID };
 
diff --git a/zlib_accel.cpp b/zlib_accel.cpp
index 4101b88..5daac89 100644
--- a/zlib_accel.cpp
+++ b/zlib_accel.cpp
@@ -8,13 +8,11 @@
 #include <sys/param.h>
 #include <unistd.h>
 
+#include <cstdint>
 #include <cstring>
-#include <functional>
-#include <iostream>
-#include <limits>
-#include <mutex>
-#include <shared_mutex>
-#include <unordered_map>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include "config/config.h"
 #include "logging.h"
@@ -28,6 +26,7 @@
 #include "statistics.h"
 
 using namespace config;
+
 // Disable cfi-icall as it makes calls to orig* functions fail
 #if defined(__clang__)
 #pragma clang attribute push(__attribute__((no_sanitize("cfi-icall"))), \