diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 023dcaaccae..452b483fb6a 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -2,7 +2,7 @@ if (USE_CLANG_TIDY)
     set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
 endif ()
 
-add_subdirectory (common)
+add_subdirectory (base)
 add_subdirectory (daemon)
 add_subdirectory (loggers)
 add_subdirectory (pcg-random)
diff --git a/base/common/BorrowedObjectPool.h b/base/base/BorrowedObjectPool.h
similarity index 98%
rename from base/common/BorrowedObjectPool.h
rename to base/base/BorrowedObjectPool.h
index a9288ae2833..98a8b16ef8d 100644
--- a/base/common/BorrowedObjectPool.h
+++ b/base/base/BorrowedObjectPool.h
@@ -6,8 +6,8 @@
 #include <mutex>
 #include <condition_variable>
 
-#include <common/defines.h>
-#include <common/MoveOrCopyIfThrow.h>
+#include <base/defines.h>
+#include <base/MoveOrCopyIfThrow.h>
 
 /** Pool for limited size objects that cannot be used from different threads simultaneously.
   * The main use case is to have fixed size of objects that can be reused in difference threads during their lifetime
diff --git a/base/common/CMakeLists.txt b/base/base/CMakeLists.txt
similarity index 100%
rename from base/common/CMakeLists.txt
rename to base/base/CMakeLists.txt
diff --git a/base/common/DateLUT.cpp b/base/base/DateLUT.cpp
similarity index 100%
rename from base/common/DateLUT.cpp
rename to base/base/DateLUT.cpp
diff --git a/base/common/DateLUT.h b/base/base/DateLUT.h
similarity index 100%
rename from base/common/DateLUT.h
rename to base/base/DateLUT.h
diff --git a/base/common/DateLUTImpl.cpp b/base/base/DateLUTImpl.cpp
similarity index 99%
rename from base/common/DateLUTImpl.cpp
rename to base/base/DateLUTImpl.cpp
index 472f24f3805..09ed0b1495d 100644
--- a/base/common/DateLUTImpl.cpp
+++ b/base/base/DateLUTImpl.cpp
@@ -3,7 +3,7 @@
 #include <cctz/civil_time.h>
 #include <cctz/time_zone.h>
 #include <cctz/zone_info_source.h>
-#include <common/getResource.h>
+#include <base/getResource.h>
 #include <Poco/Exception.h>
 
 #include <algorithm>
diff --git a/base/common/DateLUTImpl.h b/base/base/DateLUTImpl.h
similarity index 100%
rename from base/common/DateLUTImpl.h
rename to base/base/DateLUTImpl.h
diff --git a/base/common/DayNum.h b/base/base/DayNum.h
similarity index 82%
rename from base/common/DayNum.h
rename to base/base/DayNum.h
index 5cf4d4635c8..b707579ca0a 100644
--- a/base/common/DayNum.h
+++ b/base/base/DayNum.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/strong_typedef.h>
+#include <base/types.h>
+#include <base/strong_typedef.h>
 
 /** Represents number of days since 1970-01-01.
   * See DateLUTImpl for usage examples.
diff --git a/base/common/Decimal.h b/base/base/Decimal.h
similarity index 99%
rename from base/common/Decimal.h
rename to base/base/Decimal.h
index e856abf23c7..aefe852b749 100644
--- a/base/common/Decimal.h
+++ b/base/base/Decimal.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "common/extended_types.h"
+#include <base/extended_types.h>
 
 #if !defined(NO_SANITIZE_UNDEFINED)
 #if defined(__clang__)
diff --git a/base/common/DecomposedFloat.h b/base/base/DecomposedFloat.h
similarity index 99%
rename from base/common/DecomposedFloat.h
rename to base/base/DecomposedFloat.h
index 21034908fe7..652b28966b2 100644
--- a/base/common/DecomposedFloat.h
+++ b/base/base/DecomposedFloat.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <cstddef>
 #include <cstring>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 
 
 /// Allows to check the internals of IEEE-754 floating point number.
diff --git a/base/common/EnumReflection.h b/base/base/EnumReflection.h
similarity index 100%
rename from base/common/EnumReflection.h
rename to base/base/EnumReflection.h
diff --git a/base/common/ErrorHandlers.h b/base/base/ErrorHandlers.h
similarity index 96%
rename from base/common/ErrorHandlers.h
rename to base/base/ErrorHandlers.h
index 67194ee043b..bce92cad458 100644
--- a/base/common/ErrorHandlers.h
+++ b/base/base/ErrorHandlers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Poco/ErrorHandler.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 
 
diff --git a/base/common/FunctorToStaticMethodAdaptor.h b/base/base/FunctorToStaticMethodAdaptor.h
similarity index 100%
rename from base/common/FunctorToStaticMethodAdaptor.h
rename to base/base/FunctorToStaticMethodAdaptor.h
diff --git a/base/common/JSON.cpp b/base/base/JSON.cpp
similarity index 99%
rename from base/common/JSON.cpp
rename to base/base/JSON.cpp
index 9823591a2b6..bf65e6d455b 100644
--- a/base/common/JSON.cpp
+++ b/base/base/JSON.cpp
@@ -3,9 +3,9 @@
 
 #include <Poco/UTF8Encoding.h>
 #include <Poco/NumberParser.h>
-#include <common/JSON.h>
-#include <common/find_symbols.h>
-#include <common/preciseExp10.h>
+#include <base/JSON.h>
+#include <base/find_symbols.h>
+#include <base/preciseExp10.h>
 
 #include <iostream>
 
diff --git a/base/common/JSON.h b/base/base/JSON.h
similarity index 99%
rename from base/common/JSON.h
rename to base/base/JSON.h
index 7039036eeb3..5965b2b17a9 100644
--- a/base/common/JSON.h
+++ b/base/base/JSON.h
@@ -2,8 +2,8 @@
 
 #include <typeinfo>
 #include <Poco/Exception.h>
-#include <common/StringRef.h>
-#include <common/types.h>
+#include <base/StringRef.h>
+#include <base/types.h>
 
 
 /** Очень простой класс для чтения JSON (или его кусочков).
diff --git a/base/common/LineReader.cpp b/base/base/LineReader.cpp
similarity index 99%
rename from base/common/LineReader.cpp
rename to base/base/LineReader.cpp
index 7dc37322bb0..c2786892aeb 100644
--- a/base/common/LineReader.cpp
+++ b/base/base/LineReader.cpp
@@ -1,4 +1,4 @@
-#include <common/LineReader.h>
+#include <base/LineReader.h>
 
 #include <iostream>
 #include <string_view>
diff --git a/base/common/LineReader.h b/base/base/LineReader.h
similarity index 98%
rename from base/common/LineReader.h
rename to base/base/LineReader.h
index 159a93ce40d..0e36a9e01d1 100644
--- a/base/common/LineReader.h
+++ b/base/base/LineReader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <atomic>
 #include <vector>
diff --git a/base/common/LocalDate.h b/base/base/LocalDate.h
similarity index 99%
rename from base/common/LocalDate.h
rename to base/base/LocalDate.h
index 484847e1ff4..d199b9dbb4b 100644
--- a/base/common/LocalDate.h
+++ b/base/base/LocalDate.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <sstream>
 #include <exception>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 
 /** Stores a calendar date in broken-down form (year, month, day-in-month).
diff --git a/base/common/LocalDateTime.h b/base/base/LocalDateTime.h
similarity index 98%
rename from base/common/LocalDateTime.h
rename to base/base/LocalDateTime.h
index dde283e5ebb..0edc12374bb 100644
--- a/base/common/LocalDateTime.h
+++ b/base/base/LocalDateTime.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <iomanip>
 #include <exception>
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
 
 
 /** Stores calendar date and time in broken-down form.
diff --git a/base/common/MoveOrCopyIfThrow.h b/base/base/MoveOrCopyIfThrow.h
similarity index 96%
rename from base/common/MoveOrCopyIfThrow.h
rename to base/base/MoveOrCopyIfThrow.h
index caa1b51e2bc..d826bcb3d34 100644
--- a/base/common/MoveOrCopyIfThrow.h
+++ b/base/base/MoveOrCopyIfThrow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace detail
 {
diff --git a/base/common/ReadlineLineReader.cpp b/base/base/ReadlineLineReader.cpp
similarity index 98%
rename from base/common/ReadlineLineReader.cpp
rename to base/base/ReadlineLineReader.cpp
index f2c2b60f327..de444a0b1d9 100644
--- a/base/common/ReadlineLineReader.cpp
+++ b/base/base/ReadlineLineReader.cpp
@@ -1,6 +1,6 @@
-#include <common/ReadlineLineReader.h>
-#include <common/errnoToString.h>
-#include <common/scope_guard.h>
+#include <base/ReadlineLineReader.h>
+#include <base/errnoToString.h>
+#include <base/scope_guard.h>
 
 #include <errno.h>
 #include <signal.h>
diff --git a/base/common/ReadlineLineReader.h b/base/base/ReadlineLineReader.h
similarity index 100%
rename from base/common/ReadlineLineReader.h
rename to base/base/ReadlineLineReader.h
diff --git a/base/common/ReplxxLineReader.cpp b/base/base/ReplxxLineReader.cpp
similarity index 99%
rename from base/common/ReplxxLineReader.cpp
rename to base/base/ReplxxLineReader.cpp
index c79013f1850..9bf6ec41255 100644
--- a/base/common/ReplxxLineReader.cpp
+++ b/base/base/ReplxxLineReader.cpp
@@ -1,5 +1,5 @@
-#include <common/ReplxxLineReader.h>
-#include <common/errnoToString.h>
+#include <base/ReplxxLineReader.h>
+#include <base/errnoToString.h>
 
 #include <chrono>
 #include <cerrno>
diff --git a/base/common/ReplxxLineReader.h b/base/base/ReplxxLineReader.h
similarity index 100%
rename from base/common/ReplxxLineReader.h
rename to base/base/ReplxxLineReader.h
diff --git a/base/common/SimpleCache.h b/base/base/SimpleCache.h
similarity index 98%
rename from base/common/SimpleCache.h
rename to base/base/SimpleCache.h
index c3bf019c226..71537e201f7 100644
--- a/base/common/SimpleCache.h
+++ b/base/base/SimpleCache.h
@@ -3,7 +3,7 @@
 #include <map>
 #include <tuple>
 #include <mutex>
-#include <common/function_traits.h>
+#include <base/function_traits.h>
 
 
 /** The simplest cache for a free function.
diff --git a/base/common/StringRef.cpp b/base/base/StringRef.cpp
similarity index 100%
rename from base/common/StringRef.cpp
rename to base/base/StringRef.cpp
diff --git a/base/common/StringRef.h b/base/base/StringRef.h
similarity index 99%
rename from base/common/StringRef.h
rename to base/base/StringRef.h
index 61abc268da4..d0184dbc24c 100644
--- a/base/common/StringRef.h
+++ b/base/base/StringRef.h
@@ -7,8 +7,8 @@
 #include <functional>
 #include <iosfwd>
 
-#include <common/types.h>
-#include <common/unaligned.h>
+#include <base/types.h>
+#include <base/unaligned.h>
 
 #include <city.h>
 
diff --git a/base/common/argsToConfig.cpp b/base/base/argsToConfig.cpp
similarity index 100%
rename from base/common/argsToConfig.cpp
rename to base/base/argsToConfig.cpp
diff --git a/base/common/argsToConfig.h b/base/base/argsToConfig.h
similarity index 100%
rename from base/common/argsToConfig.h
rename to base/base/argsToConfig.h
diff --git a/base/common/arithmeticOverflow.h b/base/base/arithmeticOverflow.h
similarity index 98%
rename from base/common/arithmeticOverflow.h
rename to base/base/arithmeticOverflow.h
index 0957342bbb4..9a0e27505e1 100644
--- a/base/common/arithmeticOverflow.h
+++ b/base/base/arithmeticOverflow.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/extended_types.h>
-#include <common/defines.h>
+#include <base/extended_types.h>
+#include <base/defines.h>
 
 
 namespace common
diff --git a/base/common/arraySize.h b/base/base/arraySize.h
similarity index 100%
rename from base/common/arraySize.h
rename to base/base/arraySize.h
diff --git a/base/common/bit_cast.h b/base/base/bit_cast.h
similarity index 100%
rename from base/common/bit_cast.h
rename to base/base/bit_cast.h
diff --git a/base/common/chrono_io.h b/base/base/chrono_io.h
similarity index 100%
rename from base/common/chrono_io.h
rename to base/base/chrono_io.h
diff --git a/base/common/constexpr_helpers.h b/base/base/constexpr_helpers.h
similarity index 100%
rename from base/common/constexpr_helpers.h
rename to base/base/constexpr_helpers.h
diff --git a/base/common/coverage.cpp b/base/base/coverage.cpp
similarity index 100%
rename from base/common/coverage.cpp
rename to base/base/coverage.cpp
diff --git a/base/common/coverage.h b/base/base/coverage.h
similarity index 100%
rename from base/common/coverage.h
rename to base/base/coverage.h
diff --git a/base/common/defines.h b/base/base/defines.h
similarity index 99%
rename from base/common/defines.h
rename to base/base/defines.h
index ada8245f494..7c64bced81c 100644
--- a/base/common/defines.h
+++ b/base/base/defines.h
@@ -8,7 +8,7 @@
 /// NOTE:
 /// - __has_feature cannot be simply undefined,
 ///   since this will be broken if some C++ header will be included after
-///   including <common/defines.h>
+///   including <base/defines.h>
 /// - it should not have fallback to 0,
 ///   since this may create false-positive detection (common problem)
 #if defined(__clang__) && defined(__has_feature)
diff --git a/base/common/demangle.cpp b/base/base/demangle.cpp
similarity index 96%
rename from base/common/demangle.cpp
rename to base/base/demangle.cpp
index d7fac7c6990..97906293bca 100644
--- a/base/common/demangle.cpp
+++ b/base/base/demangle.cpp
@@ -1,4 +1,4 @@
-#include <common/demangle.h>
+#include <base/demangle.h>
 
 #if defined(_MSC_VER)
 
diff --git a/base/common/demangle.h b/base/base/demangle.h
similarity index 100%
rename from base/common/demangle.h
rename to base/base/demangle.h
diff --git a/base/common/errnoToString.cpp b/base/base/errnoToString.cpp
similarity index 100%
rename from base/common/errnoToString.cpp
rename to base/base/errnoToString.cpp
diff --git a/base/common/errnoToString.h b/base/base/errnoToString.h
similarity index 100%
rename from base/common/errnoToString.h
rename to base/base/errnoToString.h
diff --git a/base/common/extended_types.h b/base/base/extended_types.h
similarity index 98%
rename from base/common/extended_types.h
rename to base/base/extended_types.h
index cbd5688c491..7deb8e17b8e 100644
--- a/base/common/extended_types.h
+++ b/base/base/extended_types.h
@@ -2,8 +2,8 @@
 
 #include <type_traits>
 
-#include <common/types.h>
-#include <common/wide_integer.h>
+#include <base/types.h>
+#include <base/wide_integer.h>
 
 
 using Int128 = wide::integer<128, signed>;
diff --git a/base/common/find_symbols.h b/base/base/find_symbols.h
similarity index 100%
rename from base/common/find_symbols.h
rename to base/base/find_symbols.h
diff --git a/base/common/function_traits.h b/base/base/function_traits.h
similarity index 100%
rename from base/common/function_traits.h
rename to base/base/function_traits.h
diff --git a/base/common/getFQDNOrHostName.cpp b/base/base/getFQDNOrHostName.cpp
similarity index 91%
rename from base/common/getFQDNOrHostName.cpp
rename to base/base/getFQDNOrHostName.cpp
index f67b37bd71c..2a4ba8e2e11 100644
--- a/base/common/getFQDNOrHostName.cpp
+++ b/base/base/getFQDNOrHostName.cpp
@@ -1,5 +1,5 @@
 #include <Poco/Net/DNS.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 
 
 namespace
diff --git a/base/common/getFQDNOrHostName.h b/base/base/getFQDNOrHostName.h
similarity index 100%
rename from base/common/getFQDNOrHostName.h
rename to base/base/getFQDNOrHostName.h
diff --git a/base/common/getMemoryAmount.cpp b/base/base/getMemoryAmount.cpp
similarity index 90%
rename from base/common/getMemoryAmount.cpp
rename to base/base/getMemoryAmount.cpp
index 1f1b2b8c5dd..59ad10335ed 100644
--- a/base/common/getMemoryAmount.cpp
+++ b/base/base/getMemoryAmount.cpp
@@ -1,6 +1,6 @@
 #include <stdexcept>
-#include "common/getMemoryAmount.h"
-#include "common/getPageSize.h"
+#include <base/getMemoryAmount.h>
+#include <base/getPageSize.h>
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/base/common/getMemoryAmount.h b/base/base/getMemoryAmount.h
similarity index 100%
rename from base/common/getMemoryAmount.h
rename to base/base/getMemoryAmount.h
diff --git a/base/common/getPageSize.cpp b/base/base/getPageSize.cpp
similarity index 71%
rename from base/common/getPageSize.cpp
rename to base/base/getPageSize.cpp
index e96149cc1fb..6f7e0c6e259 100644
--- a/base/common/getPageSize.cpp
+++ b/base/base/getPageSize.cpp
@@ -1,7 +1,7 @@
-#include "common/getPageSize.h"
-
+#include <base/getPageSize.h>
 #include <unistd.h>
 
+
 Int64 getPageSize()
 {
     return sysconf(_SC_PAGESIZE);
diff --git a/base/common/getPageSize.h b/base/base/getPageSize.h
similarity index 70%
rename from base/common/getPageSize.h
rename to base/base/getPageSize.h
index 8a35acbfe9b..ce9fc740713 100644
--- a/base/common/getPageSize.h
+++ b/base/base/getPageSize.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "common/types.h"
+#include <base/types.h>
+
 
 /// Get memory page size
 Int64 getPageSize();
diff --git a/base/common/getResource.cpp b/base/base/getResource.cpp
similarity index 100%
rename from base/common/getResource.cpp
rename to base/base/getResource.cpp
diff --git a/base/common/getResource.h b/base/base/getResource.h
similarity index 100%
rename from base/common/getResource.h
rename to base/base/getResource.h
diff --git a/base/common/getThreadId.cpp b/base/base/getThreadId.cpp
similarity index 96%
rename from base/common/getThreadId.cpp
rename to base/base/getThreadId.cpp
index 054e9be9074..21167b19d32 100644
--- a/base/common/getThreadId.cpp
+++ b/base/base/getThreadId.cpp
@@ -1,4 +1,4 @@
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 #if defined(OS_ANDROID)
     #include <sys/types.h>
diff --git a/base/common/getThreadId.h b/base/base/getThreadId.h
similarity index 100%
rename from base/common/getThreadId.h
rename to base/base/getThreadId.h
diff --git a/base/common/insertAtEnd.h b/base/base/insertAtEnd.h
similarity index 100%
rename from base/common/insertAtEnd.h
rename to base/base/insertAtEnd.h
diff --git a/base/common/iostream_debug_helpers.h b/base/base/iostream_debug_helpers.h
similarity index 100%
rename from base/common/iostream_debug_helpers.h
rename to base/base/iostream_debug_helpers.h
diff --git a/base/common/itoa.h b/base/base/itoa.h
similarity index 99%
rename from base/common/itoa.h
rename to base/base/itoa.h
index 4c86239de36..da7c2ffc73e 100644
--- a/base/common/itoa.h
+++ b/base/base/itoa.h
@@ -30,7 +30,7 @@
 #include <cstddef>
 #include <cstring>
 #include <type_traits>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 
 
 namespace impl
diff --git a/base/common/logger_useful.h b/base/base/logger_useful.h
similarity index 100%
rename from base/common/logger_useful.h
rename to base/base/logger_useful.h
diff --git a/base/common/map.h b/base/base/map.h
similarity index 100%
rename from base/common/map.h
rename to base/base/map.h
diff --git a/base/common/mremap.cpp b/base/base/mremap.cpp
similarity index 96%
rename from base/common/mremap.cpp
rename to base/base/mremap.cpp
index d2d8d7fde4f..ebf6c6e0249 100644
--- a/base/common/mremap.cpp
+++ b/base/base/mremap.cpp
@@ -1,4 +1,4 @@
-#include <common/mremap.h>
+#include <base/mremap.h>
 
 #include <cstddef>
 #include <cstdlib>
diff --git a/base/common/mremap.h b/base/base/mremap.h
similarity index 100%
rename from base/common/mremap.h
rename to base/base/mremap.h
diff --git a/base/common/phdr_cache.cpp b/base/base/phdr_cache.cpp
similarity index 99%
rename from base/common/phdr_cache.cpp
rename to base/base/phdr_cache.cpp
index 8ca9137cd29..a642bb7cd59 100644
--- a/base/common/phdr_cache.cpp
+++ b/base/base/phdr_cache.cpp
@@ -4,7 +4,7 @@
 
 /// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #if defined(__linux__) && !defined(THREAD_SANITIZER)
     #define USE_PHDR_CACHE 1
diff --git a/base/common/phdr_cache.h b/base/base/phdr_cache.h
similarity index 100%
rename from base/common/phdr_cache.h
rename to base/base/phdr_cache.h
diff --git a/base/common/preciseExp10.cpp b/base/base/preciseExp10.cpp
similarity index 100%
rename from base/common/preciseExp10.cpp
rename to base/base/preciseExp10.cpp
diff --git a/base/common/preciseExp10.h b/base/base/preciseExp10.h
similarity index 100%
rename from base/common/preciseExp10.h
rename to base/base/preciseExp10.h
diff --git a/base/common/range.h b/base/base/range.h
similarity index 100%
rename from base/common/range.h
rename to base/base/range.h
diff --git a/base/common/removeDuplicates.h b/base/base/removeDuplicates.h
similarity index 100%
rename from base/common/removeDuplicates.h
rename to base/base/removeDuplicates.h
diff --git a/base/common/scope_guard.h b/base/base/scope_guard.h
similarity index 100%
rename from base/common/scope_guard.h
rename to base/base/scope_guard.h
diff --git a/base/common/scope_guard_safe.h b/base/base/scope_guard_safe.h
similarity index 97%
rename from base/common/scope_guard_safe.h
rename to base/base/scope_guard_safe.h
index a52b4a14f48..73c85b65b57 100644
--- a/base/common/scope_guard_safe.h
+++ b/base/base/scope_guard_safe.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/scope_guard.h>
-#include <common/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/logger_useful.h>
 #include <Common/MemoryTracker.h>
 
 /// Same as SCOPE_EXIT() but block the MEMORY_LIMIT_EXCEEDED errors.
diff --git a/base/common/setTerminalEcho.cpp b/base/base/setTerminalEcho.cpp
similarity index 90%
rename from base/common/setTerminalEcho.cpp
rename to base/base/setTerminalEcho.cpp
index 66db216a235..2f478f10933 100644
--- a/base/common/setTerminalEcho.cpp
+++ b/base/base/setTerminalEcho.cpp
@@ -1,5 +1,5 @@
-#include <common/setTerminalEcho.h>
-#include <common/errnoToString.h>
+#include <base/setTerminalEcho.h>
+#include <base/errnoToString.h>
 #include <stdexcept>
 #include <cstring>
 #include <string>
diff --git a/base/common/setTerminalEcho.h b/base/base/setTerminalEcho.h
similarity index 100%
rename from base/common/setTerminalEcho.h
rename to base/base/setTerminalEcho.h
diff --git a/base/common/shared_ptr_helper.h b/base/base/shared_ptr_helper.h
similarity index 100%
rename from base/common/shared_ptr_helper.h
rename to base/base/shared_ptr_helper.h
diff --git a/base/common/shift10.cpp b/base/base/shift10.cpp
similarity index 99%
rename from base/common/shift10.cpp
rename to base/base/shift10.cpp
index b7b39182145..db2f4a6963e 100644
--- a/base/common/shift10.cpp
+++ b/base/base/shift10.cpp
@@ -1,4 +1,4 @@
-#include <common/shift10.h>
+#include <base/shift10.h>
 
 #include "defines.h"
 
diff --git a/base/common/shift10.h b/base/base/shift10.h
similarity index 93%
rename from base/common/shift10.h
rename to base/base/shift10.h
index c50121cfb27..0f54d1f2988 100644
--- a/base/common/shift10.h
+++ b/base/base/shift10.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 /** Almost the same as x = x * exp10(exponent), but gives more accurate result.
   * Example:
diff --git a/base/common/sleep.cpp b/base/base/sleep.cpp
similarity index 98%
rename from base/common/sleep.cpp
rename to base/base/sleep.cpp
index 85bbc8edfcc..88cb53556cd 100644
--- a/base/common/sleep.cpp
+++ b/base/base/sleep.cpp
@@ -1,4 +1,4 @@
-#include "common/sleep.h"
+#include <base/sleep.h>
 
 #include <time.h>
 #include <errno.h>
diff --git a/base/common/sleep.h b/base/base/sleep.h
similarity index 100%
rename from base/common/sleep.h
rename to base/base/sleep.h
diff --git a/base/common/sort.h b/base/base/sort.h
similarity index 100%
rename from base/common/sort.h
rename to base/base/sort.h
diff --git a/base/common/strong_typedef.h b/base/base/strong_typedef.h
similarity index 100%
rename from base/common/strong_typedef.h
rename to base/base/strong_typedef.h
diff --git a/base/common/terminalColors.cpp b/base/base/terminalColors.cpp
similarity index 97%
rename from base/common/terminalColors.cpp
rename to base/base/terminalColors.cpp
index af1f02d331f..4c2013c6499 100644
--- a/base/common/terminalColors.cpp
+++ b/base/base/terminalColors.cpp
@@ -1,5 +1,5 @@
 #include <string>
-#include <common/terminalColors.h>
+#include <base/terminalColors.h>
 
 
 std::string setColor(UInt64 hash)
diff --git a/base/common/terminalColors.h b/base/base/terminalColors.h
similarity index 94%
rename from base/common/terminalColors.h
rename to base/base/terminalColors.h
index 9de9693bca7..971c2b9efb0 100644
--- a/base/common/terminalColors.h
+++ b/base/base/terminalColors.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <common/types.h>
+#include <base/types.h>
 
 
 /** Set color in terminal based on 64-bit hash value.
diff --git a/base/common/tests/CMakeLists.txt b/base/base/tests/CMakeLists.txt
similarity index 100%
rename from base/common/tests/CMakeLists.txt
rename to base/base/tests/CMakeLists.txt
diff --git a/base/common/tests/dump_variable.cpp b/base/base/tests/dump_variable.cpp
similarity index 96%
rename from base/common/tests/dump_variable.cpp
rename to base/base/tests/dump_variable.cpp
index 17d2f9f69ec..9addc298ecb 100644
--- a/base/common/tests/dump_variable.cpp
+++ b/base/base/tests/dump_variable.cpp
@@ -1,4 +1,4 @@
-#include <common/iostream_debug_helpers.h>
+#include <base/iostream_debug_helpers.h>
 
 #include <iostream>
 #include <memory>
diff --git a/base/common/throwError.h b/base/base/throwError.h
similarity index 100%
rename from base/common/throwError.h
rename to base/base/throwError.h
diff --git a/base/common/time.h b/base/base/time.h
similarity index 100%
rename from base/common/time.h
rename to base/base/time.h
diff --git a/base/common/types.h b/base/base/types.h
similarity index 100%
rename from base/common/types.h
rename to base/base/types.h
diff --git a/base/common/unaligned.h b/base/base/unaligned.h
similarity index 100%
rename from base/common/unaligned.h
rename to base/base/unaligned.h
diff --git a/base/common/unit.h b/base/base/unit.h
similarity index 100%
rename from base/common/unit.h
rename to base/base/unit.h
diff --git a/base/common/wide_integer.h b/base/base/wide_integer.h
similarity index 100%
rename from base/common/wide_integer.h
rename to base/base/wide_integer.h
diff --git a/base/common/wide_integer_impl.h b/base/base/wide_integer_impl.h
similarity index 100%
rename from base/common/wide_integer_impl.h
rename to base/base/wide_integer_impl.h
diff --git a/base/common/wide_integer_to_string.h b/base/base/wide_integer_to_string.h
similarity index 100%
rename from base/common/wide_integer_to_string.h
rename to base/base/wide_integer_to_string.h
diff --git a/base/bridge/IBridge.cpp b/base/bridge/IBridge.cpp
index 35a9b95c97f..553973b645d 100644
--- a/base/bridge/IBridge.cpp
+++ b/base/bridge/IBridge.cpp
@@ -4,12 +4,12 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/HelpFormatter.h>
 
-#include <common/logger_useful.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/SensitiveDataMasker.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 #include <IO/ReadHelpers.h>
 #include <Formats/registerFormats.h>
 #include <Server/HTTP/HTTPServer.h>
diff --git a/base/daemon/BaseDaemon.cpp b/base/daemon/BaseDaemon.cpp
index 141b7b7bbc6..bbb40ebac63 100644
--- a/base/daemon/BaseDaemon.cpp
+++ b/base/daemon/BaseDaemon.cpp
@@ -25,7 +25,7 @@
 #include <fstream>
 #include <sstream>
 #include <memory>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Poco/Observer.h>
 #include <Poco/AutoPtr.h>
@@ -38,12 +38,12 @@
 #include <Poco/SyslogChannel.h>
 #include <Poco/DirectoryIterator.h>
 
-#include <common/logger_useful.h>
-#include <common/ErrorHandlers.h>
-#include <common/argsToConfig.h>
-#include <common/getThreadId.h>
-#include <common/coverage.h>
-#include <common/sleep.h>
+#include <base/logger_useful.h>
+#include <base/ErrorHandlers.h>
+#include <base/argsToConfig.h>
+#include <base/getThreadId.h>
+#include <base/coverage.h>
+#include <base/sleep.h>
 
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromFileDescriptorDiscardOnFailure.h>
diff --git a/base/daemon/BaseDaemon.h b/base/daemon/BaseDaemon.h
index 3d47d85a9f5..54a74369dce 100644
--- a/base/daemon/BaseDaemon.h
+++ b/base/daemon/BaseDaemon.h
@@ -16,9 +16,9 @@
 #include <Poco/Util/ServerApplication.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/Version.h>
-#include <common/types.h>
-#include <common/logger_useful.h>
-#include <common/getThreadId.h>
+#include <base/types.h>
+#include <base/logger_useful.h>
+#include <base/getThreadId.h>
 #include <daemon/GraphiteWriter.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/StatusFile.h>
diff --git a/base/daemon/GraphiteWriter.cpp b/base/daemon/GraphiteWriter.cpp
index f28019dec01..176b48372d9 100644
--- a/base/daemon/GraphiteWriter.cpp
+++ b/base/daemon/GraphiteWriter.cpp
@@ -2,7 +2,7 @@
 #include <daemon/BaseDaemon.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Poco/Util/Application.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 
 #include <mutex>
 #include <iomanip>
diff --git a/base/daemon/GraphiteWriter.h b/base/daemon/GraphiteWriter.h
index fc07d2b7a40..ef44d82bced 100644
--- a/base/daemon/GraphiteWriter.h
+++ b/base/daemon/GraphiteWriter.h
@@ -5,7 +5,7 @@
 #include <Poco/Net/StreamSocket.h>
 #include <Poco/Net/SocketStream.h>
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 /// пишет в Graphite данные в формате
diff --git a/base/daemon/SentryWriter.cpp b/base/daemon/SentryWriter.cpp
index 470e1deb362..ad914ff8cf4 100644
--- a/base/daemon/SentryWriter.cpp
+++ b/base/daemon/SentryWriter.cpp
@@ -3,10 +3,10 @@
 #include <Poco/Util/Application.h>
 #include <Poco/Util/LayeredConfiguration.h>
 
-#include <common/defines.h>
-#include <common/getFQDNOrHostName.h>
-#include <common/getMemoryAmount.h>
-#include <common/logger_useful.h>
+#include <base/defines.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/getMemoryAmount.h>
+#include <base/logger_useful.h>
 
 #include <Common/formatReadable.h>
 #include <Common/SymbolIndex.h>
diff --git a/base/loggers/ExtendedLogChannel.cpp b/base/loggers/ExtendedLogChannel.cpp
index 4ab6ad5c96a..fa414216aa5 100644
--- a/base/loggers/ExtendedLogChannel.cpp
+++ b/base/loggers/ExtendedLogChannel.cpp
@@ -3,7 +3,7 @@
 #include <sys/time.h>
 #include <Common/CurrentThread.h>
 #include <Common/Exception.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 
 namespace DB
diff --git a/base/loggers/OwnPatternFormatter.cpp b/base/loggers/OwnPatternFormatter.cpp
index e62039f4a27..3e1c66acba3 100644
--- a/base/loggers/OwnPatternFormatter.cpp
+++ b/base/loggers/OwnPatternFormatter.cpp
@@ -8,8 +8,8 @@
 #include <Common/HashTable/Hash.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Common/CurrentThread.h>
-#include <common/getThreadId.h>
-#include <common/terminalColors.h>
+#include <base/getThreadId.h>
+#include <base/terminalColors.h>
 #include "Loggers.h"
 
 
diff --git a/base/loggers/OwnSplitChannel.cpp b/base/loggers/OwnSplitChannel.cpp
index eb881e4a661..62fdddad28c 100644
--- a/base/loggers/OwnSplitChannel.cpp
+++ b/base/loggers/OwnSplitChannel.cpp
@@ -9,7 +9,7 @@
 #include <Poco/Message.h>
 #include <Common/CurrentThread.h>
 #include <Common/DNSResolver.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 #include <Common/SensitiveDataMasker.h>
 #include <Common/IO.h>
 
diff --git a/base/mysqlxx/Pool.cpp b/base/mysqlxx/Pool.cpp
index cee386311d4..a74feb54cd3 100644
--- a/base/mysqlxx/Pool.cpp
+++ b/base/mysqlxx/Pool.cpp
@@ -7,7 +7,7 @@
 #endif
 
 #include <mysqlxx/Pool.h>
-#include <common/sleep.h>
+#include <base/sleep.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <ctime>
 
diff --git a/base/mysqlxx/Value.h b/base/mysqlxx/Value.h
index 57cfd452045..6d3b2e96ebd 100644
--- a/base/mysqlxx/Value.h
+++ b/base/mysqlxx/Value.h
@@ -8,12 +8,12 @@
 #include <string>
 #include <limits>
 
-#include <common/preciseExp10.h>
-#include <common/types.h>
-#include <common/DateLUT.h>
+#include <base/preciseExp10.h>
+#include <base/types.h>
+#include <base/DateLUT.h>
 
 #include <mysqlxx/Types.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 
 
 namespace mysqlxx
diff --git a/base/mysqlxx/mysqlxx.h b/base/mysqlxx/mysqlxx.h
index d64dadfc367..0caadcbb720 100644
--- a/base/mysqlxx/mysqlxx.h
+++ b/base/mysqlxx/mysqlxx.h
@@ -3,8 +3,8 @@
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/Transaction.h>
 #include <mysqlxx/Pool.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
 #include <mysqlxx/Null.h>
 
 
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 9e9cbf29e39..e2e26f75fa2 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -8,7 +8,7 @@
 #include <unordered_set>
 #include <algorithm>
 #include <optional>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <Poco/String.h>
@@ -16,8 +16,8 @@
 #include <string>
 #include "Client.h"
 
-#include <common/argsToConfig.h>
-#include <common/find_symbols.h>
+#include <base/argsToConfig.h>
+#include <base/find_symbols.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config_version.h>
diff --git a/programs/copier/ClusterCopierApp.cpp b/programs/copier/ClusterCopierApp.cpp
index 69f2fd3383c..b8714d0851d 100644
--- a/programs/copier/ClusterCopierApp.cpp
+++ b/programs/copier/ClusterCopierApp.cpp
@@ -3,7 +3,7 @@
 #include <Common/TerminalSize.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Formats/registerFormats.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 #include <unistd.h>
 #include <filesystem>
 
diff --git a/programs/copier/Internals.h b/programs/copier/Internals.h
index 8a3e676baf5..e04258aaf32 100644
--- a/programs/copier/Internals.h
+++ b/programs/copier/Internals.h
@@ -13,12 +13,12 @@
 #include <Poco/SplitterChannel.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <boost/algorithm/string.hpp>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ThreadPool.h>
 #include <Common/Exception.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/isLocalAddress.h>
 #include <Common/typeid_cast.h>
 #include <Common/ClickHouseRevision.h>
diff --git a/programs/copier/TaskTableAndShard.h b/programs/copier/TaskTableAndShard.h
index 35170c134ff..16696a1bd23 100644
--- a/programs/copier/TaskTableAndShard.h
+++ b/programs/copier/TaskTableAndShard.h
@@ -6,7 +6,7 @@
 
 #include <Core/Defines.h>
 
-#include <common/map.h>
+#include <base/map.h>
 #include <boost/algorithm/string/join.hpp>
 
 
diff --git a/programs/git-import/git-import.cpp b/programs/git-import/git-import.cpp
index 7977cfba79d..749dcbfee5f 100644
--- a/programs/git-import/git-import.cpp
+++ b/programs/git-import/git-import.cpp
@@ -18,7 +18,7 @@
 #include <Common/SipHash.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ShellCommand.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 #include <IO/copyData.h>
 #include <IO/ReadHelpers.h>
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index 3a40ba077ed..e001d0ceb53 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -20,8 +20,8 @@
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/OpenSSLHelpers.h>
 #include <Common/hex.h>
-#include <common/getResource.h>
-#include <common/sleep.h>
+#include <base/getResource.h>
+#include <base/sleep.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/ReadBufferFromFile.h>
diff --git a/programs/keeper-converter/KeeperConverter.cpp b/programs/keeper-converter/KeeperConverter.cpp
index 15dbc8bd220..fcf117a4cff 100644
--- a/programs/keeper-converter/KeeperConverter.cpp
+++ b/programs/keeper-converter/KeeperConverter.cpp
@@ -8,7 +8,7 @@
 #include <Poco/ConsoleChannel.h>
 #include <Poco/AutoPtr.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 int mainEntryClickHouseKeeperConverter(int argc, char ** argv)
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index 759feffb90e..a8dff091858 100644
--- a/programs/keeper/Keeper.cpp
+++ b/programs/keeper/Keeper.cpp
@@ -9,10 +9,10 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/TCPServerParams.h>
 #include <Poco/Net/TCPServer.h>
-#include <common/defines.h>
-#include <common/logger_useful.h>
-#include <common/ErrorHandlers.h>
-#include <common/scope_guard.h>
+#include <base/defines.h>
+#include <base/logger_useful.h>
+#include <base/ErrorHandlers.h>
+#include <base/scope_guard.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Version.h>
 #include <Poco/Environment.h>
diff --git a/programs/library-bridge/HandlerFactory.h b/programs/library-bridge/HandlerFactory.h
index 93f0721bf01..021ca2132cc 100644
--- a/programs/library-bridge/HandlerFactory.h
+++ b/programs/library-bridge/HandlerFactory.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandlerFactory.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/programs/library-bridge/Handlers.h b/programs/library-bridge/Handlers.h
index 58af24b06d1..52c6e723ac5 100644
--- a/programs/library-bridge/Handlers.h
+++ b/programs/library-bridge/Handlers.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "SharedLibraryHandler.h"
 
 
diff --git a/programs/library-bridge/LibraryInterface.cpp b/programs/library-bridge/LibraryInterface.cpp
index 3975368c17f..998b47a0537 100644
--- a/programs/library-bridge/LibraryInterface.cpp
+++ b/programs/library-bridge/LibraryInterface.cpp
@@ -1,6 +1,6 @@
 #include "LibraryInterface.h"
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace
 {
diff --git a/programs/library-bridge/LibraryUtils.h b/programs/library-bridge/LibraryUtils.h
index 859b7e2633f..b2498df0031 100644
--- a/programs/library-bridge/LibraryUtils.h
+++ b/programs/library-bridge/LibraryUtils.h
@@ -2,8 +2,8 @@
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Core/Block.h>
-#include <common/bit_cast.h>
-#include <common/range.h>
+#include <base/bit_cast.h>
+#include <base/range.h>
 
 #include "LibraryInterface.h"
 
diff --git a/programs/library-bridge/SharedLibraryHandler.cpp b/programs/library-bridge/SharedLibraryHandler.cpp
index b31dcdee097..c553f49e161 100644
--- a/programs/library-bridge/SharedLibraryHandler.cpp
+++ b/programs/library-bridge/SharedLibraryHandler.cpp
@@ -1,8 +1,8 @@
 #include "SharedLibraryHandler.h"
 
-#include <common/scope_guard.h>
-#include <common/bit_cast.h>
-#include <common/find_symbols.h>
+#include <base/scope_guard.h>
+#include <base/bit_cast.h>
+#include <base/find_symbols.h>
 #include <IO/ReadHelpers.h>
 
 
diff --git a/programs/library-bridge/SharedLibraryHandler.h b/programs/library-bridge/SharedLibraryHandler.h
index fa476995e32..1dc923467d9 100644
--- a/programs/library-bridge/SharedLibraryHandler.h
+++ b/programs/library-bridge/SharedLibraryHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/SharedLibrary.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <DataStreams/OneBlockInputStream.h>
 #include "LibraryUtils.h"
 
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index 98d796514c6..1627e6fa638 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -13,8 +13,8 @@
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/loadMetadata.h>
 #include <Interpreters/DatabaseCatalog.h>
-#include <common/getFQDNOrHostName.h>
-#include <common/scope_guard_safe.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/scope_guard_safe.h>
 #include <Interpreters/UserDefinedSQLObjectsLoader.h>
 #include <Interpreters/Session.h>
 #include <Common/Exception.h>
@@ -34,7 +34,7 @@
 #include <IO/UseSSL.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/IAST.h>
-#include <common/ErrorHandlers.h>
+#include <base/ErrorHandlers.h>
 #include <Functions/registerFunctions.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <TableFunctions/registerTableFunctions.h>
@@ -44,7 +44,7 @@
 #include <Formats/registerFormats.h>
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options.hpp>
-#include <common/argsToConfig.h>
+#include <base/argsToConfig.h>
 #include <Common/TerminalSize.h>
 #include <Common/randomSeed.h>
 #include <filesystem>
diff --git a/programs/main.cpp b/programs/main.cpp
index 1ae96bffecd..8c70dcacc99 100644
--- a/programs/main.cpp
+++ b/programs/main.cpp
@@ -21,8 +21,8 @@
 #include <Common/getHashOfLoadedBinary.h>
 #include <Common/IO.h>
 
-#include <common/phdr_cache.h>
-#include <common/scope_guard.h>
+#include <base/phdr_cache.h>
+#include <base/scope_guard.h>
 
 
 /// Universal executable for various clickhouse applications
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index 748c26675fd..9d5e03d871e 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -29,9 +29,9 @@
 #include <Processors/QueryPipelineBuilder.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Core/Block.h>
-#include <common/StringRef.h>
-#include <common/DateLUT.h>
-#include <common/bit_cast.h>
+#include <base/StringRef.h>
+#include <base/DateLUT.h>
+#include <base/bit_cast.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <memory>
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 8ea1efe843a..8ceeddcd7ab 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -12,8 +12,8 @@
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/NumberParser.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Common/quoteString.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
diff --git a/programs/odbc-bridge/HandlerFactory.cpp b/programs/odbc-bridge/HandlerFactory.cpp
index 49984453d33..6a5ef89ab8b 100644
--- a/programs/odbc-bridge/HandlerFactory.cpp
+++ b/programs/odbc-bridge/HandlerFactory.cpp
@@ -3,7 +3,7 @@
 #include "ColumnInfoHandler.h"
 #include <Poco/URI.h>
 #include <Poco/Net/HTTPServerRequest.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index 1e57ae167c9..c7cad68f19e 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -10,8 +10,8 @@
 #include <Parsers/parseQuery.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
 #include "ODBCConnectionFactory.h"
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index 2f43cbd4ff2..da53dcd75fb 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -16,7 +16,7 @@
 #include <Poco/Net/HTMLForm.h>
 #include <Poco/ThreadPool.h>
 #include <Processors/Formats/InputStreamFromInputFormat.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Server/HTTP/HTMLForm.h>
 
 #include <mutex>
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.cpp b/programs/odbc-bridge/ODBCBlockInputStream.cpp
index e1935c62725..53633b3d293 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockInputStream.cpp
@@ -8,7 +8,7 @@
 #include <Common/assert_cast.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.cpp b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
index 8a4387c2389..32ceea3aef8 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
@@ -1,10 +1,10 @@
 #include "ODBCBlockOutputStream.h"
 
 #include <Common/hex.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Core/Field.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
 #include "getIdentifierQuote.h"
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
diff --git a/programs/odbc-bridge/ODBCConnectionFactory.h b/programs/odbc-bridge/ODBCConnectionFactory.h
index ca403eca662..13396206a46 100644
--- a/programs/odbc-bridge/ODBCConnectionFactory.h
+++ b/programs/odbc-bridge/ODBCConnectionFactory.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <nanodbc/nanodbc.h>
 #include <mutex>
-#include <common/BorrowedObjectPool.h>
+#include <base/BorrowedObjectPool.h>
 #include <unordered_map>
 
 
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index 6ef6f03a137..7b526bd8041 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -7,7 +7,7 @@
 #include <IO/WriteHelpers.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "validateODBCConnectionString.h"
 #include "ODBCConnectionFactory.h"
 #include <sql.h>
diff --git a/programs/odbc-bridge/getIdentifierQuote.cpp b/programs/odbc-bridge/getIdentifierQuote.cpp
index eebb14eb245..d9361537db4 100644
--- a/programs/odbc-bridge/getIdentifierQuote.cpp
+++ b/programs/odbc-bridge/getIdentifierQuote.cpp
@@ -2,7 +2,7 @@
 
 #if USE_ODBC
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <sql.h>
 #include <sqlext.h>
 
diff --git a/programs/odbc-bridge/validateODBCConnectionString.cpp b/programs/odbc-bridge/validateODBCConnectionString.cpp
index a54021431ef..a87a8f58ede 100644
--- a/programs/odbc-bridge/validateODBCConnectionString.cpp
+++ b/programs/odbc-bridge/validateODBCConnectionString.cpp
@@ -2,7 +2,7 @@
 #include <cstring>
 #include <algorithm>
 #include <Poco/String.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include "validateODBCConnectionString.h"
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 17ec7aceeb6..f38995e8173 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -14,14 +14,14 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Environment.h>
-#include <common/scope_guard_safe.h>
-#include <common/defines.h>
-#include <common/logger_useful.h>
-#include <common/phdr_cache.h>
-#include <common/ErrorHandlers.h>
-#include <common/getMemoryAmount.h>
-#include <common/errnoToString.h>
-#include <common/coverage.h>
+#include <base/scope_guard_safe.h>
+#include <base/defines.h>
+#include <base/logger_useful.h>
+#include <base/phdr_cache.h>
+#include <base/ErrorHandlers.h>
+#include <base/getMemoryAmount.h>
+#include <base/errnoToString.h>
+#include <base/coverage.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/DNSResolver.h>
 #include <Common/CurrentMetrics.h>
@@ -30,7 +30,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperNodeCache.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/getExecutablePath.h>
diff --git a/programs/server/clickhouse-server.cpp b/programs/server/clickhouse-server.cpp
index 58fa37990de..f49dc21d9fe 100644
--- a/programs/server/clickhouse-server.cpp
+++ b/programs/server/clickhouse-server.cpp
@@ -1,6 +1,6 @@
 #include <new>
 
-#include <common/phdr_cache.h>
+#include <base/phdr_cache.h>
 
 
 int mainEntryClickHouseServer(int argc, char ** argv);
diff --git a/src/Access/AccessControlManager.cpp b/src/Access/AccessControlManager.cpp
index 95701bd42df..ff3ebdea9f8 100644
--- a/src/Access/AccessControlManager.cpp
+++ b/src/Access/AccessControlManager.cpp
@@ -13,7 +13,7 @@
 #include <Access/SettingsProfilesCache.h>
 #include <Access/ExternalAuthenticators.h>
 #include <Core/Settings.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Poco/ExpireCache.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/src/Access/AccessFlags.h b/src/Access/AccessFlags.h
index 7e32f423564..b107248e02b 100644
--- a/src/Access/AccessFlags.h
+++ b/src/Access/AccessFlags.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Access/AccessType.h>
-#include <common/types.h>
-#include <common/range.h>
+#include <base/types.h>
+#include <base/range.h>
 #include <Common/Exception.h>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
diff --git a/src/Access/AccessRights.cpp b/src/Access/AccessRights.cpp
index d4b2dc8a252..6cc1292a9f5 100644
--- a/src/Access/AccessRights.cpp
+++ b/src/Access/AccessRights.cpp
@@ -1,5 +1,5 @@
 #include <Access/AccessRights.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <boost/container/small_vector.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/sort.hpp>
diff --git a/src/Access/AccessRights.h b/src/Access/AccessRights.h
index a90616ea27f..2657b66d824 100644
--- a/src/Access/AccessRights.h
+++ b/src/Access/AccessRights.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Access/AccessRightsElement.h>
 #include <memory>
 #include <vector>
diff --git a/src/Access/AccessType.h b/src/Access/AccessType.h
index 3e1597dc890..5e156b23e58 100644
--- a/src/Access/AccessType.h
+++ b/src/Access/AccessType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <array>
diff --git a/src/Access/AllowedClientHosts.cpp b/src/Access/AllowedClientHosts.cpp
index 5ac05bea88d..bfb1288b931 100644
--- a/src/Access/AllowedClientHosts.cpp
+++ b/src/Access/AllowedClientHosts.cpp
@@ -1,8 +1,8 @@
 #include <Access/AllowedClientHosts.h>
 #include <Common/Exception.h>
-#include <common/SimpleCache.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/SimpleCache.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Functions/likePatternToRegexp.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/RegularExpression.h>
diff --git a/src/Access/AllowedClientHosts.h b/src/Access/AllowedClientHosts.h
index 7b21fd7e236..30c0dac076e 100644
--- a/src/Access/AllowedClientHosts.h
+++ b/src/Access/AllowedClientHosts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Net/IPAddress.h>
 #include <memory>
 #include <vector>
diff --git a/src/Access/Authentication.h b/src/Access/Authentication.h
index 54542cb504a..8622db7dab5 100644
--- a/src/Access/Authentication.h
+++ b/src/Access/Authentication.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/OpenSSLHelpers.h>
 #include <Poco/SHA1Engine.h>
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index 5a615ad8fd6..a186ffb3495 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -14,7 +14,7 @@
 #include <Core/Settings.h>
 #include <IO/WriteHelpers.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/algorithm/set_algorithm.hpp>
 #include <assert.h>
diff --git a/src/Access/ContextAccess.h b/src/Access/ContextAccess.h
index cde69471800..8f5f5a096e7 100644
--- a/src/Access/ContextAccess.h
+++ b/src/Access/ContextAccess.h
@@ -4,8 +4,8 @@
 #include <Access/RowPolicy.h>
 #include <Interpreters/ClientInfo.h>
 #include <Core/UUID.h>
-#include <common/scope_guard.h>
-#include <common/shared_ptr_helper.h>
+#include <base/scope_guard.h>
+#include <base/shared_ptr_helper.h>
 #include <boost/container/flat_set.hpp>
 #include <mutex>
 
diff --git a/src/Access/Credentials.h b/src/Access/Credentials.h
index 256ed3853ab..1f99f0042f7 100644
--- a/src/Access/Credentials.h
+++ b/src/Access/Credentials.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <memory>
 
 
diff --git a/src/Access/DiskAccessStorage.cpp b/src/Access/DiskAccessStorage.cpp
index 6c995f52f2b..e3d773f4d91 100644
--- a/src/Access/DiskAccessStorage.cpp
+++ b/src/Access/DiskAccessStorage.cpp
@@ -14,7 +14,7 @@
 #include <Interpreters/InterpreterCreateUserQuery.h>
 #include <Interpreters/InterpreterShowGrantsQuery.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
diff --git a/src/Access/EnabledQuota.cpp b/src/Access/EnabledQuota.cpp
index 4affa4f3ec1..d776b2b851a 100644
--- a/src/Access/EnabledQuota.cpp
+++ b/src/Access/EnabledQuota.cpp
@@ -2,8 +2,8 @@
 #include <Access/QuotaUsage.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
-#include <common/chrono_io.h>
-#include <common/range.h>
+#include <base/chrono_io.h>
+#include <base/range.h>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/range/algorithm/fill.hpp>
 
diff --git a/src/Access/EnabledRoles.h b/src/Access/EnabledRoles.h
index 5cb00eb1829..efec5833fca 100644
--- a/src/Access/EnabledRoles.h
+++ b/src/Access/EnabledRoles.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/UUID.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <boost/container/flat_set.hpp>
 #include <list>
 #include <mutex>
diff --git a/src/Access/EnabledRowPolicies.h b/src/Access/EnabledRowPolicies.h
index 5e819733963..8ed923e98e4 100644
--- a/src/Access/EnabledRowPolicies.h
+++ b/src/Access/EnabledRowPolicies.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/RowPolicy.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/UUID.h>
 #include <boost/smart_ptr/atomic_shared_ptr.hpp>
 #include <unordered_map>
diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h
index 24f1f7b6528..8ece77cd9ef 100644
--- a/src/Access/ExternalAuthenticators.h
+++ b/src/Access/ExternalAuthenticators.h
@@ -3,7 +3,7 @@
 #include <Access/LDAPClient.h>
 #include <Access/Credentials.h>
 #include <Access/GSSAcceptor.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <chrono>
 #include <map>
diff --git a/src/Access/GSSAcceptor.cpp b/src/Access/GSSAcceptor.cpp
index a33e825f510..207baf955e0 100644
--- a/src/Access/GSSAcceptor.cpp
+++ b/src/Access/GSSAcceptor.cpp
@@ -1,6 +1,6 @@
 #include <Access/GSSAcceptor.h>
 #include <Common/Exception.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Poco/StringTokenizer.h>
 
diff --git a/src/Access/GSSAcceptor.h b/src/Access/GSSAcceptor.h
index 8d207c59c01..aa11507e559 100644
--- a/src/Access/GSSAcceptor.h
+++ b/src/Access/GSSAcceptor.h
@@ -5,7 +5,7 @@
 #endif
 
 #include <Access/Credentials.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <memory>
 
 #if USE_KRB5
diff --git a/src/Access/IAccessEntity.h b/src/Access/IAccessEntity.h
index 18b450bff5c..d0fbde8da97 100644
--- a/src/Access/IAccessEntity.h
+++ b/src/Access/IAccessEntity.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/typeid_cast.h>
 #include <Common/quoteString.h>
 #include <boost/algorithm/string.hpp>
diff --git a/src/Access/IAccessStorage.h b/src/Access/IAccessStorage.h
index bf45ed5b5ce..e9df2e3c1a4 100644
--- a/src/Access/IAccessStorage.h
+++ b/src/Access/IAccessStorage.h
@@ -3,7 +3,7 @@
 #include <Access/IAccessEntity.h>
 #include <Core/Types.h>
 #include <Core/UUID.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <functional>
 #include <optional>
 #include <vector>
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 07b9d089198..8a612982c79 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -6,8 +6,8 @@
 #include <Access/Credentials.h>
 #include <Access/LDAPClient.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index 3e5b10494ed..6cfff07b436 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -3,8 +3,8 @@
 #include <Access/MemoryAccessStorage.h>
 #include <Access/LDAPClient.h>
 #include <Access/Credentials.h>
-#include <common/types.h>
-#include <common/scope_guard.h>
+#include <base/types.h>
+#include <base/scope_guard.h>
 #include <map>
 #include <mutex>
 #include <set>
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index c12b0f22ab0..c666520c069 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -1,7 +1,7 @@
 #include <Access/LDAPClient.h>
 #include <Common/Exception.h>
-#include <common/scope_guard.h>
-#include <common/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Logger.h>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/Access/LDAPClient.h b/src/Access/LDAPClient.h
index 85003da31f1..143047c6f95 100644
--- a/src/Access/LDAPClient.h
+++ b/src/Access/LDAPClient.h
@@ -4,7 +4,7 @@
 #   include "config_core.h"
 #endif
 
-#include <common/types.h>
+#include <base/types.h>
 
 #if USE_LDAP
 #   include <ldap.h>
diff --git a/src/Access/MemoryAccessStorage.cpp b/src/Access/MemoryAccessStorage.cpp
index e788ca11cf2..68a24146107 100644
--- a/src/Access/MemoryAccessStorage.cpp
+++ b/src/Access/MemoryAccessStorage.cpp
@@ -1,5 +1,5 @@
 #include <Access/MemoryAccessStorage.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <boost/container/flat_set.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
diff --git a/src/Access/MultipleAccessStorage.cpp b/src/Access/MultipleAccessStorage.cpp
index dbeecc8a2bc..bb2ef4a6df4 100644
--- a/src/Access/MultipleAccessStorage.cpp
+++ b/src/Access/MultipleAccessStorage.cpp
@@ -1,7 +1,7 @@
 #include <Access/MultipleAccessStorage.h>
 #include <Access/Credentials.h>
 #include <Common/Exception.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/algorithm/copy.hpp>
diff --git a/src/Access/Quota.h b/src/Access/Quota.h
index 5adc6ec95e1..5d23cf11d42 100644
--- a/src/Access/Quota.h
+++ b/src/Access/Quota.h
@@ -2,7 +2,7 @@
 
 #include <Access/IAccessEntity.h>
 #include <Access/RolesOrUsersSet.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/lexical_cast.hpp>
 #include <chrono>
diff --git a/src/Access/QuotaCache.cpp b/src/Access/QuotaCache.cpp
index c20a436e1b9..f742751d5fd 100644
--- a/src/Access/QuotaCache.cpp
+++ b/src/Access/QuotaCache.cpp
@@ -4,7 +4,7 @@
 #include <Access/AccessControlManager.h>
 #include <Common/Exception.h>
 #include <Common/thread_local_rng.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/algorithm/lower_bound.hpp>
diff --git a/src/Access/QuotaCache.h b/src/Access/QuotaCache.h
index b5918f86dd4..e991399d2e9 100644
--- a/src/Access/QuotaCache.h
+++ b/src/Access/QuotaCache.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/EnabledQuota.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <memory>
 #include <mutex>
 #include <map>
diff --git a/src/Access/ReplicatedAccessStorage.cpp b/src/Access/ReplicatedAccessStorage.cpp
index 7c71e264cd0..d50ecda0c9e 100644
--- a/src/Access/ReplicatedAccessStorage.cpp
+++ b/src/Access/ReplicatedAccessStorage.cpp
@@ -7,8 +7,8 @@
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/escapeForFileName.h>
-#include <common/range.h>
-#include <common/sleep.h>
+#include <base/range.h>
+#include <base/sleep.h>
 
 
 namespace DB
diff --git a/src/Access/ReplicatedAccessStorage.h b/src/Access/ReplicatedAccessStorage.h
index 377a82fd511..0df1d5ef5ff 100644
--- a/src/Access/ReplicatedAccessStorage.h
+++ b/src/Access/ReplicatedAccessStorage.h
@@ -4,7 +4,7 @@
 #include <Common/ThreadPool.h>
 #include <Common/ZooKeeper/Common.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <Coordination/ThreadSafeQueue.h>
 #include <atomic>
 #include <list>
diff --git a/src/Access/RowPolicyCache.cpp b/src/Access/RowPolicyCache.cpp
index b4e3c7d16ab..c8402dbdbd4 100644
--- a/src/Access/RowPolicyCache.cpp
+++ b/src/Access/RowPolicyCache.cpp
@@ -6,7 +6,7 @@
 #include <Parsers/makeASTForLogicalFunction.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <Core/Defines.h>
 
diff --git a/src/Access/RowPolicyCache.h b/src/Access/RowPolicyCache.h
index 6f3964cdadb..959eb989d4c 100644
--- a/src/Access/RowPolicyCache.h
+++ b/src/Access/RowPolicyCache.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/EnabledRowPolicies.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <mutex>
 #include <map>
 #include <unordered_map>
diff --git a/src/Access/SettingsProfileElement.cpp b/src/Access/SettingsProfileElement.cpp
index edbb7509e9e..b42bcd1c279 100644
--- a/src/Access/SettingsProfileElement.cpp
+++ b/src/Access/SettingsProfileElement.cpp
@@ -7,7 +7,7 @@
 #include <Common/SettingsChanges.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/removeDuplicates.h>
+#include <base/removeDuplicates.h>
 
 
 namespace DB
diff --git a/src/Access/SettingsProfilesCache.h b/src/Access/SettingsProfilesCache.h
index 23a37212883..e5ba70b9df8 100644
--- a/src/Access/SettingsProfilesCache.h
+++ b/src/Access/SettingsProfilesCache.h
@@ -2,7 +2,7 @@
 
 #include <Access/EnabledSettings.h>
 #include <Poco/LRUCache.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <map>
 #include <unordered_map>
 
diff --git a/src/Access/SettingsProfilesInfo.cpp b/src/Access/SettingsProfilesInfo.cpp
index 46ebb6084e7..7efb16dd865 100644
--- a/src/Access/SettingsProfilesInfo.cpp
+++ b/src/Access/SettingsProfilesInfo.cpp
@@ -1,6 +1,6 @@
 #include <Access/SettingsProfilesInfo.h>
 #include <Access/SettingsConstraintsAndProfileIDs.h>
-#include <common/removeDuplicates.h>
+#include <base/removeDuplicates.h>
 
 
 namespace DB
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index 68333ed45da..9a906f96a99 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -13,7 +13,7 @@
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <cstring>
diff --git a/src/AggregateFunctions/AggregateFunctionArgMinMax.h b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
index 335ee7c8ecb..6c43c3ed061 100644
--- a/src/AggregateFunctions/AggregateFunctionArgMinMax.h
+++ b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <DataTypes/IDataType.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionMinMaxAny.h> // SingleValueDataString used in embedded compiler
diff --git a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
index c31be25e950..9375d6da3da 100644
--- a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
+++ b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
@@ -8,7 +8,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp
index eac7e6e9409..5186153b69a 100644
--- a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.h b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
index 365bc45f7b7..3f2b7276c0f 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.h
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
@@ -7,7 +7,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
 #include <Common/PODArray_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
index 2b7b28266c1..14e5abcfb97 100644
--- a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
+++ b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index 8fa4b235c2c..189272a7058 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -9,7 +9,7 @@
 #include <Columns/ColumnNullable.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/assert_cast.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <AggregateFunctions/IAggregateFunction.h>
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
index b7da1f28fd3..9a92e02cce2 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
@@ -7,7 +7,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
 #include <Common/PODArray_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/AggregateFunctions/AggregateFunctionResample.h b/src/AggregateFunctions/AggregateFunctionResample.h
index 45aad8c1a56..f315960fb86 100644
--- a/src/AggregateFunctions/AggregateFunctionResample.h
+++ b/src/AggregateFunctions/AggregateFunctionResample.h
@@ -4,7 +4,7 @@
 #include <Columns/ColumnArray.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Common/assert_cast.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.h b/src/AggregateFunctions/AggregateFunctionRetention.h
index 896160bbe14..5d15a2e9583 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.h
+++ b/src/AggregateFunctions/AggregateFunctionRetention.h
@@ -9,7 +9,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Common/ArenaAllocator.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <bitset>
 
 #include <AggregateFunctions/IAggregateFunction.h>
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
index 846476a5b79..0c1b75798c8 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 5dfe820b6be..ab3df6ed38b 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <Common/PODArray.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
index d86499b90f3..9cdec775957 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
@@ -8,7 +8,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Context.h>
 #include <Common/CurrentThread.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 51c10d05f6f..627bfbe602b 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -2,11 +2,11 @@
 
 #include <DataTypes/DataTypeString.h>
 #include <AggregateFunctions/IAggregateFunction.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Columns/ColumnString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/ReadBufferFromString.h>
 #include <Common/HashTable/HashMap.h>
 
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index 1fd1c1e170b..a76507fe2a2 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index 19c784553f2..3f8412cba5c 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -3,7 +3,7 @@
 #include <city.h>
 #include <type_traits>
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
index 7d74041d3d7..a5bcad2764a 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 #include <Common/CombinedCardinalityEstimator.h>
 #include <Common/SipHash.h>
diff --git a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
index a1599a0935b..72bfc230864 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
index 961a8ff9081..d75a12f7a0d 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index cdc6b8f2065..61e4e424652 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -7,7 +7,7 @@
 #include <Core/Field.h>
 #include <Interpreters/Context_fwd.h>
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
diff --git a/src/AggregateFunctions/QuantileBFloat16Histogram.h b/src/AggregateFunctions/QuantileBFloat16Histogram.h
index 501cd8dcf2d..2a71522c1fc 100644
--- a/src/AggregateFunctions/QuantileBFloat16Histogram.h
+++ b/src/AggregateFunctions/QuantileBFloat16Histogram.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/bit_cast.h>
+#include <base/types.h>
+#include <base/bit_cast.h>
 #include <Common/HashTable/HashMap.h>
 
 #include <IO/ReadBuffer.h>
diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h
index 1536f0fac6e..58eccc038cc 100644
--- a/src/AggregateFunctions/QuantileExact.h
+++ b/src/AggregateFunctions/QuantileExact.h
@@ -5,8 +5,8 @@
 #include <IO/WriteBuffer.h>
 #include <Common/NaNUtils.h>
 #include <Common/PODArray.h>
-#include <common/sort.h>
-#include <common/types.h>
+#include <base/sort.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/QuantileTiming.h b/src/AggregateFunctions/QuantileTiming.h
index 7a88e320b89..36f1da3ee60 100644
--- a/src/AggregateFunctions/QuantileTiming.h
+++ b/src/AggregateFunctions/QuantileTiming.h
@@ -6,7 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/PODArray.h>
-#include <common/sort.h>
+#include <base/sort.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/ReservoirSampler.h b/src/AggregateFunctions/ReservoirSampler.h
index 53e64626a77..d113d659520 100644
--- a/src/AggregateFunctions/ReservoirSampler.h
+++ b/src/AggregateFunctions/ReservoirSampler.h
@@ -3,7 +3,7 @@
 #include <limits>
 #include <algorithm>
 #include <climits>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/AggregateFunctions/ReservoirSamplerDeterministic.h b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index 2687e0b4a67..ca716b24ce2 100644
--- a/src/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <climits>
 #include <AggregateFunctions/ReservoirSampler.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/HashTable/Hash.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/AggregateFunctions/UniquesHashSet.h b/src/AggregateFunctions/UniquesHashSet.h
index 13c59cd5225..b51bb6b988d 100644
--- a/src/AggregateFunctions/UniquesHashSet.h
+++ b/src/AggregateFunctions/UniquesHashSet.h
@@ -2,7 +2,7 @@
 
 #include <math.h>
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Backups/BackupUtils.cpp b/src/Backups/BackupUtils.cpp
index 06673cae371..7a935d721a6 100644
--- a/src/Backups/BackupUtils.cpp
+++ b/src/Backups/BackupUtils.cpp
@@ -14,7 +14,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/formatAST.h>
 #include <Storages/IStorage.h>
-#include <common/insertAtEnd.h>
+#include <base/insertAtEnd.h>
 #include <boost/range/adaptor/reversed.hpp>
 #include <filesystem>
 
diff --git a/src/Bridge/IBridgeHelper.h b/src/Bridge/IBridgeHelper.h
index 0537658663d..51b201442f1 100644
--- a/src/Bridge/IBridgeHelper.h
+++ b/src/Bridge/IBridgeHelper.h
@@ -6,7 +6,7 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Common/ShellCommand.h>
 #include <IO/ConnectionTimeoutsContext.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Bridge/LibraryBridgeHelper.cpp b/src/Bridge/LibraryBridgeHelper.cpp
index 24a1cac3d4e..7f3e3f8009c 100644
--- a/src/Bridge/LibraryBridgeHelper.cpp
+++ b/src/Bridge/LibraryBridgeHelper.cpp
@@ -11,8 +11,8 @@
 #include <Formats/FormatFactory.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/ShellCommand.h>
-#include <common/logger_useful.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
 #include <Core/Field.h>
 #include <Common/escapeForFileName.h>
 
diff --git a/src/Bridge/XDBCBridgeHelper.h b/src/Bridge/XDBCBridgeHelper.h
index b3613c381d0..d6d2af3a045 100644
--- a/src/Bridge/XDBCBridgeHelper.h
+++ b/src/Bridge/XDBCBridgeHelper.h
@@ -11,8 +11,8 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/ShellCommand.h>
 #include <IO/ConnectionTimeoutsContext.h>
-#include <common/logger_useful.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
 #include <Bridge/IBridgeHelper.h>
 
 #if !defined(ARCADIA_BUILD)
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 8d5fdbc9dc6..e7649b66f50 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -4,11 +4,11 @@
 #include <iomanip>
 #include <filesystem>
 
-#include <common/argsToConfig.h>
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
-#include <common/LineReader.h>
-#include <common/scope_guard_safe.h>
+#include <base/argsToConfig.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
+#include <base/LineReader.h>
+#include <base/scope_guard_safe.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config_version.h>
diff --git a/src/Client/ClientBaseHelpers.cpp b/src/Client/ClientBaseHelpers.cpp
index c473d607451..a530e48ee35 100644
--- a/src/Client/ClientBaseHelpers.cpp
+++ b/src/Client/ClientBaseHelpers.cpp
@@ -1,8 +1,8 @@
 #include "ClientBaseHelpers.h"
 
 
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
 #include <Parsers/Lexer.h>
 #include <Common/UTF8Helpers.h>
 
diff --git a/src/Client/ClientBaseHelpers.h b/src/Client/ClientBaseHelpers.h
index 64fb0616647..048a4c17f10 100644
--- a/src/Client/ClientBaseHelpers.h
+++ b/src/Client/ClientBaseHelpers.h
@@ -3,7 +3,7 @@
 #include <Core/Types.h>
 
 #if USE_REPLXX
-#   include <common/ReplxxLineReader.h>
+#   include <base/ReplxxLineReader.h>
 #endif
 
 
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index 002d7dd6487..84ce6edac73 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Net/StreamSocket.h>
 
diff --git a/src/Client/ConnectionParameters.cpp b/src/Client/ConnectionParameters.cpp
index 79dbe265d84..9ec4d663eef 100644
--- a/src/Client/ConnectionParameters.cpp
+++ b/src/Client/ConnectionParameters.cpp
@@ -9,8 +9,8 @@
 #include <Common/Exception.h>
 #include <Common/isLocalAddress.h>
 #include <Common/DNSResolver.h>
-#include <common/setTerminalEcho.h>
-#include <common/scope_guard.h>
+#include <base/setTerminalEcho.h>
+#include <base/scope_guard.h>
 
 #if !defined(ARCADIA_BUILD)
 #include <readpassphrase/readpassphrase.h> // Y_IGNORE
diff --git a/src/Client/ConnectionPoolWithFailover.cpp b/src/Client/ConnectionPoolWithFailover.cpp
index eff589edaa8..c0b4965aae3 100644
--- a/src/Client/ConnectionPoolWithFailover.cpp
+++ b/src/Client/ConnectionPoolWithFailover.cpp
@@ -6,7 +6,7 @@
 
 #include <Common/BitHelpers.h>
 #include <Common/quoteString.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/isLocalAddress.h>
 #include <Common/ProfileEvents.h>
 #include <Core/Settings.h>
diff --git a/src/Client/Suggest.h b/src/Client/Suggest.h
index d22ee038f37..65b60ceffc4 100644
--- a/src/Client/Suggest.h
+++ b/src/Client/Suggest.h
@@ -6,7 +6,7 @@
 #include <Client/IServerConnection.h>
 #include <Client/LocalConnection.h>
 #include <IO/ConnectionTimeouts.h>
-#include <common/LineReader.h>
+#include <base/LineReader.h>
 #include <thread>
 
 
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 7c7c6a4d9db..e7da87e160d 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -10,8 +10,8 @@
 #include <Columns/ColumnCompressed.h>
 #include <Columns/MaskOperations.h>
 
-#include <common/unaligned.h>
-#include <common/sort.h>
+#include <base/unaligned.h>
+#include <base/sort.h>
 
 #include <DataStreams/ColumnGathererStream.h>
 
diff --git a/src/Columns/ColumnConst.cpp b/src/Columns/ColumnConst.cpp
index e5c656e2d31..f723816e36e 100644
--- a/src/Columns/ColumnConst.cpp
+++ b/src/Columns/ColumnConst.cpp
@@ -6,7 +6,7 @@
 #include <Common/WeakHash.h>
 #include <Common/HashTable/Hash.h>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #if defined(MEMORY_SANITIZER)
     #include <sanitizer/msan_interface.h>
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index ceda12c4b84..7dc89fb6ee8 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -5,9 +5,9 @@
 #include <Common/WeakHash.h>
 #include <Common/HashTable/Hash.h>
 
-#include <common/unaligned.h>
-#include <common/sort.h>
-#include <common/scope_guard.h>
+#include <base/unaligned.h>
+#include <base/sort.h>
+#include <base/scope_guard.h>
 
 
 #include <IO/WriteHelpers.h>
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index 34cc4751eb9..bf560f3a6c3 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -6,7 +6,7 @@
 #include <Core/Field.h>
 #include <Core/DecimalFunctions.h>
 #include <Common/typeid_cast.h>
-#include <common/sort.h>
+#include <base/sort.h>
 #include <Core/TypeId.h>
 #include <Core/TypeName.h>
 
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index ce4f11a38d6..7e13954ff1d 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -11,8 +11,8 @@
 #include <Common/assert_cast.h>
 #include <Common/memcmpSmall.h>
 #include <Common/memcpySmall.h>
-#include <common/sort.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/scope_guard.h>
 
 #if defined(__SSE2__)
 #    include <emmintrin.h>
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index a77bb7a4754..04e7d03d8c3 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -7,8 +7,8 @@
 #include <Common/HashTable/HashMap.h>
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
-#include <common/sort.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index c547a380ff3..03addee4f8d 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -4,8 +4,8 @@
 #include <DataStreams/ColumnGathererStream.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/WeakHash.h>
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index d02fa66baf4..1cf9a529fa2 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -10,9 +10,9 @@
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
 #include <Common/memcmpSmall.h>
-#include <common/sort.h>
-#include <common/unaligned.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/unaligned.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index 406797e2ce8..f053c32fda1 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -9,9 +9,9 @@
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
-#include <common/sort.h>
-#include <common/map.h>
-#include <common/range.h>
+#include <base/sort.h>
+#include <base/map.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index 72904c5ab8f..66bb56983fc 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -13,9 +13,9 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include "Columns/ColumnConst.h"
 
 
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 5a7659a11b5..acdf38033d9 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -14,10 +14,10 @@
 #include <Common/SipHash.h>
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
-#include <common/sort.h>
-#include <common/unaligned.h>
-#include <common/bit_cast.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/unaligned.h>
+#include <base/bit_cast.h>
+#include <base/scope_guard.h>
 
 #include <cmath>
 #include <cstring>
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index 30f3ad6a132..e34c7abfc39 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -4,7 +4,7 @@
 #include <Columns/IColumn.h>
 #include <Columns/IColumnImpl.h>
 #include <Columns/ColumnVectorHelper.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Core/Field.h>
 #include <Common/assert_cast.h>
 #include <Core/TypeId.h>
diff --git a/src/Columns/ColumnsNumber.h b/src/Columns/ColumnsNumber.h
index 48721c32fa0..654d0c73254 100644
--- a/src/Columns/ColumnsNumber.h
+++ b/src/Columns/ColumnsNumber.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Columns/ColumnVector.h>
 
 
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index 0bcee1624b4..996f4c8a535 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -4,7 +4,7 @@
 #include <Common/PODArray_fwd.h>
 #include <Common/Exception.h>
 #include <Common/typeid_cast.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Core/Types.h>
 
 
diff --git a/src/Columns/ReverseIndex.h b/src/Columns/ReverseIndex.h
index 1db42fcd6a1..9f13dbef1f9 100644
--- a/src/Columns/ReverseIndex.h
+++ b/src/Columns/ReverseIndex.h
@@ -6,8 +6,8 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
-#include <common/unaligned.h>
+#include <base/range.h>
+#include <base/unaligned.h>
 
 
 namespace DB
diff --git a/src/Common/Allocator.h b/src/Common/Allocator.h
index f20f11889ce..c2c9ecd689d 100644
--- a/src/Common/Allocator.h
+++ b/src/Common/Allocator.h
@@ -25,8 +25,8 @@
     /// mremap will lead to false positives.
     #define DISABLE_MREMAP 1
 #endif
-#include <common/mremap.h>
-#include <common/getPageSize.h>
+#include <base/mremap.h>
+#include <base/getPageSize.h>
 
 #include <Common/CurrentMemoryTracker.h>
 #include <Common/Exception.h>
diff --git a/src/Common/ArrayCache.h b/src/Common/ArrayCache.h
index b305cc8199d..19f775db31f 100644
--- a/src/Common/ArrayCache.h
+++ b/src/Common/ArrayCache.h
@@ -11,9 +11,9 @@
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/noncopyable.hpp>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
diff --git a/src/Common/BitHelpers.h b/src/Common/BitHelpers.h
index e79daeba14e..9c6071822f3 100644
--- a/src/Common/BitHelpers.h
+++ b/src/Common/BitHelpers.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <cassert>
 #include <type_traits>
-#include <common/defines.h>
+#include <base/defines.h>
 
 
 /** For zero argument, result is zero.
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index 3ffa9bb71de..f32707798f7 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -6,7 +6,7 @@
 #include <Common/Arena.h>
 #include <Common/LRUCache.h>
 #include <Common/assert_cast.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Common/ConcurrentBoundedQueue.h b/src/Common/ConcurrentBoundedQueue.h
index bc9d55ff8f5..240c433f923 100644
--- a/src/Common/ConcurrentBoundedQueue.h
+++ b/src/Common/ConcurrentBoundedQueue.h
@@ -7,7 +7,7 @@
 #include <Poco/Mutex.h>
 #include <Poco/Semaphore.h>
 
-#include <common/MoveOrCopyIfThrow.h>
+#include <base/MoveOrCopyIfThrow.h>
 #include <Common/Exception.h>
 
 namespace DB
diff --git a/src/Common/Config/AbstractConfigurationComparison.cpp b/src/Common/Config/AbstractConfigurationComparison.cpp
index eb677debb02..f304460f914 100644
--- a/src/Common/Config/AbstractConfigurationComparison.cpp
+++ b/src/Common/Config/AbstractConfigurationComparison.cpp
@@ -2,7 +2,7 @@
 #include <Common/getMultipleKeysFromConfig.h>
 
 #include <unordered_set>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
 
diff --git a/src/Common/Config/AbstractConfigurationComparison.h b/src/Common/Config/AbstractConfigurationComparison.h
index 6e1d8a890bb..75e0b77b1ca 100644
--- a/src/Common/Config/AbstractConfigurationComparison.h
+++ b/src/Common/Config/AbstractConfigurationComparison.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace Poco::Util
 {
diff --git a/src/Common/Config/ConfigProcessor.cpp b/src/Common/Config/ConfigProcessor.cpp
index bf6fcd71d15..09397e31787 100644
--- a/src/Common/Config/ConfigProcessor.cpp
+++ b/src/Common/Config/ConfigProcessor.cpp
@@ -20,8 +20,8 @@
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Exception.h>
-#include <common/getResource.h>
-#include <common/errnoToString.h>
+#include <base/getResource.h>
+#include <base/errnoToString.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
diff --git a/src/Common/Config/ConfigProcessor.h b/src/Common/Config/ConfigProcessor.h
index e13e66547a3..caffad5faca 100644
--- a/src/Common/Config/ConfigProcessor.h
+++ b/src/Common/Config/ConfigProcessor.h
@@ -18,7 +18,7 @@
 #include <Poco/DirectoryIterator.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace zkutil
diff --git a/src/Common/Config/ConfigReloader.cpp b/src/Common/Config/ConfigReloader.cpp
index 01bb4f556d6..25e0ff7221c 100644
--- a/src/Common/Config/ConfigReloader.cpp
+++ b/src/Common/Config/ConfigReloader.cpp
@@ -1,7 +1,7 @@
 #include "ConfigReloader.h"
 
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/setThreadName.h>
 #include "ConfigProcessor.h"
 #include <filesystem>
diff --git a/src/Common/Config/YAMLParser.cpp b/src/Common/Config/YAMLParser.cpp
index e7917a0a616..9f52d9cf36c 100644
--- a/src/Common/Config/YAMLParser.cpp
+++ b/src/Common/Config/YAMLParser.cpp
@@ -21,7 +21,7 @@
 
 #include <yaml-cpp/yaml.h> // Y_IGNORE
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 using namespace Poco::XML;
 
diff --git a/src/Common/Config/YAMLParser.h b/src/Common/Config/YAMLParser.h
index a716f3de9b1..b983e85a4fe 100644
--- a/src/Common/Config/YAMLParser.h
+++ b/src/Common/Config/YAMLParser.h
@@ -8,7 +8,7 @@
 
 #include <Poco/DOM/Document.h>
 #include "Poco/DOM/AutoPtr.h"
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #if USE_YAML_CPP
 
diff --git a/src/Common/CounterInFile.h b/src/Common/CounterInFile.h
index 6326261234d..343ef95dd26 100644
--- a/src/Common/CounterInFile.h
+++ b/src/Common/CounterInFile.h
@@ -15,7 +15,7 @@
 #include <IO/WriteHelpers.h>
 
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/CpuId.h b/src/Common/CpuId.h
index 2db247173a6..e814442ef80 100644
--- a/src/Common/CpuId.h
+++ b/src/Common/CpuId.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #if defined(__x86_64__) || defined(__i386__)
 #include <cpuid.h>
diff --git a/src/Common/CurrentMemoryTracker.h b/src/Common/CurrentMemoryTracker.h
index 2f9ace4291f..5f735b10be9 100644
--- a/src/Common/CurrentMemoryTracker.h
+++ b/src/Common/CurrentMemoryTracker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 /// Convenience methods, that use current thread's memory_tracker if it is available.
 namespace CurrentMemoryTracker
diff --git a/src/Common/CurrentMetrics.h b/src/Common/CurrentMetrics.h
index 7d63b25f0f0..f6f4785a95a 100644
--- a/src/Common/CurrentMetrics.h
+++ b/src/Common/CurrentMetrics.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <utility>
 #include <atomic>
-#include <common/types.h>
+#include <base/types.h>
 
 /** Allows to count number of simultaneously happening processes or current value of some metric.
   *  - for high-level profiling.
diff --git a/src/Common/CurrentThread.cpp b/src/Common/CurrentThread.cpp
index c93b22c443a..c6b9e027c48 100644
--- a/src/Common/CurrentThread.cpp
+++ b/src/Common/CurrentThread.cpp
@@ -1,12 +1,12 @@
 #include <memory>
 
 #include "CurrentThread.h"
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ThreadStatus.h>
 #include <Common/TaskStatsInfoGetter.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/Context.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 #include <Poco/Logger.h>
 
 
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index c6ac7e9933a..96ea7f7e795 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Common/ThreadStatus.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #include <memory>
 #include <string>
diff --git a/src/Common/DNSResolver.cpp b/src/Common/DNSResolver.cpp
index 4fe0f0bb8c8..46aa731b2c5 100644
--- a/src/Common/DNSResolver.cpp
+++ b/src/Common/DNSResolver.cpp
@@ -1,9 +1,9 @@
 #include "DNSResolver.h"
-#include <common/SimpleCache.h>
+#include <base/SimpleCache.h>
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/DNS.h>
 #include <Poco/Net/NetException.h>
diff --git a/src/Common/DNSResolver.h b/src/Common/DNSResolver.h
index 57c28188f58..3cefa37fd70 100644
--- a/src/Common/DNSResolver.h
+++ b/src/Common/DNSResolver.h
@@ -2,10 +2,10 @@
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/SocketAddress.h>
 #include <memory>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Names.h>
 #include <boost/noncopyable.hpp>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/Elf.cpp b/src/Common/Elf.cpp
index 9e312dc79f2..ebf4e38ba13 100644
--- a/src/Common/Elf.cpp
+++ b/src/Common/Elf.cpp
@@ -2,7 +2,7 @@
 
 #include <Common/Elf.h>
 #include <Common/Exception.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <string.h>
 
diff --git a/src/Common/Epoll.cpp b/src/Common/Epoll.cpp
index 454c1a115f7..c86af5e49e3 100644
--- a/src/Common/Epoll.cpp
+++ b/src/Common/Epoll.cpp
@@ -3,7 +3,7 @@
 #include "Epoll.h"
 #include <Common/Exception.h>
 #include <unistd.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Common/ErrorCodes.h b/src/Common/ErrorCodes.h
index be36aa6fd50..4d5fa632e45 100644
--- a/src/Common/ErrorCodes.h
+++ b/src/Common/ErrorCodes.h
@@ -6,7 +6,7 @@
 #include <mutex>
 #include <string_view>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 /** Allows to count number of simultaneously happening error codes.
   * See also Exception.cpp for incrementing part.
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index 408cab8b702..d506d48c25d 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -4,14 +4,14 @@
 #include <cxxabi.h>
 #include <cstdlib>
 #include <Poco/String.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadBufferFromFile.h>
-#include <common/demangle.h>
-#include <common/errnoToString.h>
+#include <base/demangle.h>
+#include <base/errnoToString.h>
 #include <Common/formatReadable.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/ErrorCodes.h>
diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h
index 666bb23e75e..ff0758fd3b2 100644
--- a/src/Common/ExternalLoaderStatus.h
+++ b/src/Common/ExternalLoaderStatus.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <vector>
-#include <common/EnumReflection.h>
-#include <common/types.h>
+#include <base/EnumReflection.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Common/Fiber.h b/src/Common/Fiber.h
index e3ad8af12cd..11549c6cd93 100644
--- a/src/Common/Fiber.h
+++ b/src/Common/Fiber.h
@@ -1,7 +1,7 @@
 #pragma once
 /// defines.h should be included before fiber.hpp
 /// BOOST_USE_ASAN, BOOST_USE_TSAN and BOOST_USE_UCONTEXT should be correctly defined for sanitizers.
-#include <common/defines.h>
+#include <base/defines.h>
 #include <boost/context/fiber.hpp>
 
 using Fiber = boost::context::fiber;
diff --git a/src/Common/FiberStack.h b/src/Common/FiberStack.h
index db825722da5..94d4cee197c 100644
--- a/src/Common/FiberStack.h
+++ b/src/Common/FiberStack.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/defines.h>
+#include <base/defines.h>
 #include <boost/context/stack_context.hpp>
 #include <Common/formatReadable.h>
 #include <Common/CurrentMemoryTracker.h>
diff --git a/src/Common/FieldVisitorConvertToNumber.h b/src/Common/FieldVisitorConvertToNumber.h
index 4f0a821b288..6db65fe63ea 100644
--- a/src/Common/FieldVisitorConvertToNumber.h
+++ b/src/Common/FieldVisitorConvertToNumber.h
@@ -2,7 +2,7 @@
 
 #include <Common/FieldVisitors.h>
 #include <Common/NaNUtils.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <type_traits>
 
 
diff --git a/src/Common/FieldVisitorsAccurateComparison.h b/src/Common/FieldVisitorsAccurateComparison.h
index f7f976b3f15..795620da0cb 100644
--- a/src/Common/FieldVisitorsAccurateComparison.h
+++ b/src/Common/FieldVisitorsAccurateComparison.h
@@ -2,7 +2,7 @@
 
 #include <Core/Field.h>
 #include <Core/AccurateComparison.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <Common/FieldVisitors.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Common/FileChecker.cpp b/src/Common/FileChecker.cpp
index 91be58e3e39..14705a9b0b0 100644
--- a/src/Common/FileChecker.cpp
+++ b/src/Common/FileChecker.cpp
@@ -1,4 +1,4 @@
-#include <common/JSON.h>
+#include <base/JSON.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromString.h>
diff --git a/src/Common/FileChecker.h b/src/Common/FileChecker.h
index 73e4470f231..688c2b78486 100644
--- a/src/Common/FileChecker.h
+++ b/src/Common/FileChecker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Storages/CheckResults.h>
 #include <Disks/IDisk.h>
 
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 669bff15ffb..695ac30524d 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -2,9 +2,9 @@
 
 #include <city.h>
 #include <Core/Types.h>
-#include <common/types.h>
-#include <common/unaligned.h>
-#include <common/StringRef.h>
+#include <base/types.h>
+#include <base/unaligned.h>
+#include <base/StringRef.h>
 
 #include <type_traits>
 
diff --git a/src/Common/HashTable/HashTable.h b/src/Common/HashTable/HashTable.h
index e25b3191652..b0f16dfdb8b 100644
--- a/src/Common/HashTable/HashTable.h
+++ b/src/Common/HashTable/HashTable.h
@@ -10,7 +10,7 @@
 #include <boost/noncopyable.hpp>
 
 #include <Core/Defines.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/MemorySanitizer.h>
 
diff --git a/src/Common/HashTable/LRUHashMap.h b/src/Common/HashTable/LRUHashMap.h
index bdefee351b1..2f0c4cfc744 100644
--- a/src/Common/HashTable/LRUHashMap.h
+++ b/src/Common/HashTable/LRUHashMap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <boost/intrusive/trivial_value_traits.hpp>
 #include <boost/intrusive/list.hpp>
diff --git a/src/Common/HyperLogLogCounter.h b/src/Common/HyperLogLogCounter.h
index 1cb014a050a..c840151bce9 100644
--- a/src/Common/HyperLogLogCounter.h
+++ b/src/Common/HyperLogLogCounter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/HyperLogLogBiasEstimator.h>
 #include <Common/CompactArray.h>
 #include <Common/HashTable/Hash.h>
diff --git a/src/Common/IFactoryWithAliases.h b/src/Common/IFactoryWithAliases.h
index 5ef795c92d0..f7da302a942 100644
--- a/src/Common/IFactoryWithAliases.h
+++ b/src/Common/IFactoryWithAliases.h
@@ -2,7 +2,7 @@
 
 #include <Common/Exception.h>
 #include <Common/NamePrompter.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/String.h>
 
 #include <unordered_map>
diff --git a/src/Common/IPv6ToBinary.h b/src/Common/IPv6ToBinary.h
index d766d408359..584ed44f2e6 100644
--- a/src/Common/IPv6ToBinary.h
+++ b/src/Common/IPv6ToBinary.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <array>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace Poco { namespace Net { class IPAddress; }}
 
diff --git a/src/Common/IntervalKind.h b/src/Common/IntervalKind.h
index a837836bed7..85372ffa9ab 100644
--- a/src/Common/IntervalKind.h
+++ b/src/Common/IntervalKind.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/EnumReflection.h>
+#include <base/types.h>
+#include <base/EnumReflection.h>
 
 namespace DB
 {
diff --git a/src/Common/LRUCache.h b/src/Common/LRUCache.h
index 10533a154d1..93abfce3c4e 100644
--- a/src/Common/LRUCache.h
+++ b/src/Common/LRUCache.h
@@ -7,7 +7,7 @@
 #include <mutex>
 #include <atomic>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/Macros.cpp b/src/Common/Macros.cpp
index 7882449b595..339f3f43fc4 100644
--- a/src/Common/Macros.cpp
+++ b/src/Common/Macros.cpp
@@ -2,7 +2,7 @@
 #include <Common/Macros.h>
 #include <Common/Exception.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/Macros.h b/src/Common/Macros.h
index 9298dbfc2d5..3e6fbff1519 100644
--- a/src/Common/Macros.h
+++ b/src/Common/Macros.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Names.h>
 #include <Interpreters/StorageID.h>
 
diff --git a/src/Common/MemorySanitizer.h b/src/Common/MemorySanitizer.h
index b52f1d74a2b..a230fe22bb8 100644
--- a/src/Common/MemorySanitizer.h
+++ b/src/Common/MemorySanitizer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #ifdef __clang__
 #pragma clang diagnostic push
diff --git a/src/Common/MemoryStatisticsOS.cpp b/src/Common/MemoryStatisticsOS.cpp
index f1022d887c1..220d7a2013b 100644
--- a/src/Common/MemoryStatisticsOS.cpp
+++ b/src/Common/MemoryStatisticsOS.cpp
@@ -8,8 +8,8 @@
 
 #include "MemoryStatisticsOS.h"
 
-#include <common/logger_useful.h>
-#include <common/getPageSize.h>
+#include <base/logger_useful.h>
+#include <base/getPageSize.h>
 #include <Common/Exception.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index ad8647d6da4..205771a5f6c 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -4,7 +4,7 @@
 #include "Common/TraceCollector.h"
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/thread_local_rng.h>
 
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index d6833de544c..36560fec334 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <atomic>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/VariableContext.h>
 
@@ -14,7 +14,7 @@
 /// outside of try/catch block of thread functions. ALLOW_ALLOCATIONS_IN_SCOPE cancels effect of
 /// DENY_ALLOCATIONS_IN_SCOPE in the inner scope. In Release builds these macros do nothing.
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 extern thread_local bool memory_tracker_always_throw_logical_error_on_allocation;
 #define ALLOCATIONS_IN_SCOPE_IMPL_CONCAT(n, val) \
         bool _allocations_flag_prev_val##n = memory_tracker_always_throw_logical_error_on_allocation; \
diff --git a/src/Common/NamePrompter.h b/src/Common/NamePrompter.h
index bb17f860f29..4a44a3adeaa 100644
--- a/src/Common/NamePrompter.h
+++ b/src/Common/NamePrompter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/PODArray.h>
 
 #include <algorithm>
diff --git a/src/Common/OpenSSLHelpers.cpp b/src/Common/OpenSSLHelpers.cpp
index d8e862b3700..d7e73b75f56 100644
--- a/src/Common/OpenSSLHelpers.cpp
+++ b/src/Common/OpenSSLHelpers.cpp
@@ -4,7 +4,7 @@
 
 #if USE_SSL
 #include "OpenSSLHelpers.h"
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <openssl/err.h>
 #include <openssl/sha.h>
 
diff --git a/src/Common/OpenSSLHelpers.h b/src/Common/OpenSSLHelpers.h
index 1058a611ac6..e5cfcef9afe 100644
--- a/src/Common/OpenSSLHelpers.h
+++ b/src/Common/OpenSSLHelpers.h
@@ -5,7 +5,7 @@
 #endif
 
 #if USE_SSL
-#    include <common/types.h>
+#    include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index d90ac0469c5..8a621b8db1c 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -8,7 +8,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <common/strong_typedef.h>
+#include <base/strong_typedef.h>
 
 #include <Common/Allocator.h>
 #include <Common/Exception.h>
diff --git a/src/Common/PODArray_fwd.h b/src/Common/PODArray_fwd.h
index 22f9230c01c..ec7b3bf4331 100644
--- a/src/Common/PODArray_fwd.h
+++ b/src/Common/PODArray_fwd.h
@@ -4,7 +4,7 @@
   * PODArray.
   */
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Allocator_fwd.h>
 
 namespace DB
diff --git a/src/Common/PipeFDs.cpp b/src/Common/PipeFDs.cpp
index a5c21e3d872..9064007fc6e 100644
--- a/src/Common/PipeFDs.cpp
+++ b/src/Common/PipeFDs.cpp
@@ -2,8 +2,8 @@
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
 
-#include <common/logger_useful.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/errnoToString.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/Common/PoolBase.h b/src/Common/PoolBase.h
index 6fc5aee26dd..3f7f340c5d1 100644
--- a/src/Common/PoolBase.h
+++ b/src/Common/PoolBase.h
@@ -5,7 +5,7 @@
 #include <Poco/Timespan.h>
 #include <boost/noncopyable.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 
 
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index e84e249d179..b8fa00d2703 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -5,8 +5,8 @@
 #include <climits>
 #include <random>
 #include <functional>
-#include <common/types.h>
-#include <common/scope_guard.h>
+#include <base/types.h>
+#include <base/scope_guard.h>
 #include <Common/PoolBase.h>
 #include <Common/ProfileEvents.h>
 #include <Common/NetException.h>
diff --git a/src/Common/ProcfsMetricsProvider.cpp b/src/Common/ProcfsMetricsProvider.cpp
index fcc4124aa85..ee8fb37c4c5 100644
--- a/src/Common/ProcfsMetricsProvider.cpp
+++ b/src/Common/ProcfsMetricsProvider.cpp
@@ -6,8 +6,8 @@
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
 
-#include <common/find_symbols.h>
-#include <common/logger_useful.h>
+#include <base/find_symbols.h>
+#include <base/logger_useful.h>
 
 #include <cassert>
 #include <sys/types.h>
diff --git a/src/Common/QueryProfiler.cpp b/src/Common/QueryProfiler.cpp
index 17af6eeed22..983ae864575 100644
--- a/src/Common/QueryProfiler.cpp
+++ b/src/Common/QueryProfiler.cpp
@@ -5,9 +5,9 @@
 #include <Common/StackTrace.h>
 #include <Common/TraceCollector.h>
 #include <Common/thread_local_rng.h>
-#include <common/logger_useful.h>
-#include <common/phdr_cache.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/phdr_cache.h>
+#include <base/errnoToString.h>
 
 #include <random>
 
diff --git a/src/Common/QueryProfiler.h b/src/Common/QueryProfiler.h
index e5a1662e2d4..6ef55ce871a 100644
--- a/src/Common/QueryProfiler.h
+++ b/src/Common/QueryProfiler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <signal.h>
 #include <time.h>
 
diff --git a/src/Common/RWLock.h b/src/Common/RWLock.h
index c0bc01c5460..e54fcaea433 100644
--- a/src/Common/RWLock.h
+++ b/src/Common/RWLock.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <chrono>
 #include <list>
diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h
index 65ef32f3d81..b1e4d7d02f1 100644
--- a/src/Common/RadixSort.h
+++ b/src/Common/RadixSort.h
@@ -13,8 +13,8 @@
 #include <type_traits>
 #include <memory>
 
-#include <common/bit_cast.h>
-#include <common/extended_types.h>
+#include <base/bit_cast.h>
+#include <base/extended_types.h>
 #include <Core/Defines.h>
 
 
diff --git a/src/Common/SensitiveDataMasker.cpp b/src/Common/SensitiveDataMasker.cpp
index d3d9991bc90..145a63d1ceb 100644
--- a/src/Common/SensitiveDataMasker.cpp
+++ b/src/Common/SensitiveDataMasker.cpp
@@ -9,7 +9,7 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
diff --git a/src/Common/SharedLibrary.cpp b/src/Common/SharedLibrary.cpp
index 37da308d5af..89c3467fcc8 100644
--- a/src/Common/SharedLibrary.cpp
+++ b/src/Common/SharedLibrary.cpp
@@ -1,7 +1,7 @@
 #include "SharedLibrary.h"
 #include <string>
 #include <boost/core/noncopyable.hpp>
-#include <common/phdr_cache.h>
+#include <base/phdr_cache.h>
 #include "Exception.h"
 
 
diff --git a/src/Common/ShellCommand.cpp b/src/Common/ShellCommand.cpp
index 0d7d19a6d3f..f238e976f8a 100644
--- a/src/Common/ShellCommand.cpp
+++ b/src/Common/ShellCommand.cpp
@@ -6,8 +6,8 @@
 #include <time.h>
 #include <csignal>
 
-#include <common/logger_useful.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/errnoToString.h>
 #include <Common/Exception.h>
 #include <Common/ShellCommand.h>
 #include <Common/PipeFDs.h>
diff --git a/src/Common/SimpleIncrement.h b/src/Common/SimpleIncrement.h
index 4896d2192f4..f88660f64f1 100644
--- a/src/Common/SimpleIncrement.h
+++ b/src/Common/SimpleIncrement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <atomic>
 
 
diff --git a/src/Common/SipHash.h b/src/Common/SipHash.h
index 92d635eb63c..559744abe72 100644
--- a/src/Common/SipHash.h
+++ b/src/Common/SipHash.h
@@ -13,8 +13,8 @@
   * (~ 700 MB/sec, 15 million strings per second)
   */
 
-#include <common/types.h>
-#include <common/unaligned.h>
+#include <base/types.h>
+#include <base/unaligned.h>
 #include <string>
 #include <type_traits>
 #include <Core/Defines.h>
diff --git a/src/Common/SmallObjectPool.h b/src/Common/SmallObjectPool.h
index 0eda8931946..947942e3aaf 100644
--- a/src/Common/SmallObjectPool.h
+++ b/src/Common/SmallObjectPool.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Arena.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 
 namespace DB
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index a9d4700490e..dcb1bc32c3a 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -5,8 +5,8 @@
 #include <Common/Elf.h>
 #include <Common/SymbolIndex.h>
 #include <Common/MemorySanitizer.h>
-#include <common/SimpleCache.h>
-#include <common/demangle.h>
+#include <base/SimpleCache.h>
+#include <base/demangle.h>
 
 #include <cstring>
 #include <filesystem>
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 62acb70563f..06a17e73091 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <string>
 #include <vector>
diff --git a/src/Common/StatusFile.cpp b/src/Common/StatusFile.cpp
index ceedf518608..5e4c31b149e 100644
--- a/src/Common/StatusFile.cpp
+++ b/src/Common/StatusFile.cpp
@@ -4,10 +4,10 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <common/logger_useful.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/errnoToString.h>
 #include <Common/ClickHouseRevision.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/LimitReadBuffer.h>
diff --git a/src/Common/StatusInfo.h b/src/Common/StatusInfo.h
index de92bb838ba..99d6a6f23f5 100644
--- a/src/Common/StatusInfo.h
+++ b/src/Common/StatusInfo.h
@@ -5,7 +5,7 @@
 #include <utility>
 #include <atomic>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 #include <mutex>
 #include <unordered_map>
 
diff --git a/src/Common/Stopwatch.h b/src/Common/Stopwatch.h
index c307f94b19a..8aaa3aaa179 100644
--- a/src/Common/Stopwatch.h
+++ b/src/Common/Stopwatch.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/time.h>
-#include <common/types.h>
+#include <base/time.h>
+#include <base/types.h>
 
 #include <atomic>
 #include <memory>
diff --git a/src/Common/StringSearcher.h b/src/Common/StringSearcher.h
index 09011d910ea..af1d36adf81 100644
--- a/src/Common/StringSearcher.h
+++ b/src/Common/StringSearcher.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
 #include <Core/Defines.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <Poco/Unicode.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/Common/TLDListsHolder.cpp b/src/Common/TLDListsHolder.cpp
index db0a762f826..3f3c0814538 100644
--- a/src/Common/TLDListsHolder.cpp
+++ b/src/Common/TLDListsHolder.cpp
@@ -1,6 +1,6 @@
 #include <Common/TLDListsHolder.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <string_view>
diff --git a/src/Common/TLDListsHolder.h b/src/Common/TLDListsHolder.h
index 3900f9c30d2..025954727c5 100644
--- a/src/Common/TLDListsHolder.h
+++ b/src/Common/TLDListsHolder.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/defines.h>
-#include <common/StringRef.h>
+#include <base/defines.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/StringHashSet.h>
 #include <Common/Arena.h>
 #include <Poco/Util/AbstractConfiguration.h>
diff --git a/src/Common/TaskStatsInfoGetter.cpp b/src/Common/TaskStatsInfoGetter.cpp
index 92978a0ad8c..f2ef0f6d2aa 100644
--- a/src/Common/TaskStatsInfoGetter.cpp
+++ b/src/Common/TaskStatsInfoGetter.cpp
@@ -1,13 +1,13 @@
 #include "TaskStatsInfoGetter.h"
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <unistd.h>
 
 #if defined(OS_LINUX)
 
 #include "hasLinuxCapability.h"
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/Common/TaskStatsInfoGetter.h b/src/Common/TaskStatsInfoGetter.h
index 00ecf91c475..08e35757212 100644
--- a/src/Common/TaskStatsInfoGetter.h
+++ b/src/Common/TaskStatsInfoGetter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <sys/types.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <boost/noncopyable.hpp>
 
 struct taskstats;
diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index 896d8ee4e62..ee153ad44f4 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -7,10 +7,10 @@
 
 #include <random>
 
-#include <common/sleep.h>
+#include <base/sleep.h>
 
 #include <IO/ReadHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/Exception.h>
 #include <Common/thread_local_rng.h>
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index 5716d02803c..6e803d77601 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -14,7 +14,7 @@
 
 #include <Poco/Event.h>
 #include <Common/ThreadStatus.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 /** Very simple thread pool similar to boost::threadpool.
   * Advantages:
diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp
index 7b69bf766db..3e2bb2bdf6e 100644
--- a/src/Common/ThreadProfileEvents.cpp
+++ b/src/Common/ThreadProfileEvents.cpp
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 
 
 namespace DB
diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h
index cf5196f3636..5d8f879eca7 100644
--- a/src/Common/ThreadProfileEvents.h
+++ b/src/Common/ThreadProfileEvents.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ProfileEvents.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <pthread.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 #if defined(__linux__)
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 0c777623fc7..b1d76c4660e 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -2,12 +2,12 @@
 #include <Common/ThreadProfileEvents.h>
 #include <Common/QueryProfiler.h>
 #include <Common/ThreadStatus.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
 
 #include <Poco/Logger.h>
-#include <common/getThreadId.h>
-#include <common/getPageSize.h>
+#include <base/getThreadId.h>
+#include <base/getPageSize.h>
 
 #include <csignal>
 
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index 7fe9247106f..9e8d8f637b8 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -6,7 +6,7 @@
 #include <Common/MemoryTracker.h>
 #include <Common/OpenTelemetryTraceContext.h>
 #include <Common/ProfileEvents.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/src/Common/Throttler.h b/src/Common/Throttler.h
index a30df74d510..b2c704e5308 100644
--- a/src/Common/Throttler.h
+++ b/src/Common/Throttler.h
@@ -2,7 +2,7 @@
 
 #include <mutex>
 #include <memory>
-#include <common/sleep.h>
+#include <base/sleep.h>
 #include <atomic>
 
 namespace DB
diff --git a/src/Common/TraceCollector.cpp b/src/Common/TraceCollector.cpp
index 1c6074c5cf9..d84202449d1 100644
--- a/src/Common/TraceCollector.cpp
+++ b/src/Common/TraceCollector.cpp
@@ -12,7 +12,7 @@
 #include <Common/PipeFDs.h>
 #include <Common/StackTrace.h>
 #include <Common/setThreadName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/UTF8Helpers.h b/src/Common/UTF8Helpers.h
index f25ed55a6af..e33a3f1427c 100644
--- a/src/Common/UTF8Helpers.h
+++ b/src/Common/UTF8Helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/BitHelpers.h>
 #include <Poco/UTF8Encoding.h>
 
diff --git a/src/Common/UnicodeBar.cpp b/src/Common/UnicodeBar.cpp
index 0e1f792c9fe..9cb3069aebb 100644
--- a/src/Common/UnicodeBar.cpp
+++ b/src/Common/UnicodeBar.cpp
@@ -1,8 +1,8 @@
 #include <cstring>
 #include <cmath>
 #include <string>
-#include <common/types.h>
-#include <common/arithmeticOverflow.h>
+#include <base/types.h>
+#include <base/arithmeticOverflow.h>
 #include <Common/Exception.h>
 #include <Common/UnicodeBar.h>
 #include <Common/NaNUtils.h>
diff --git a/src/Common/UnicodeBar.h b/src/Common/UnicodeBar.h
index e6f49dde856..64705aa5022 100644
--- a/src/Common/UnicodeBar.h
+++ b/src/Common/UnicodeBar.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <common/types.h>
+#include <base/types.h>
 
 #define UNICODE_BAR_CHAR_SIZE (strlen("█"))
 
diff --git a/src/Common/VersionNumber.h b/src/Common/VersionNumber.h
index fb5de7fdfb6..389644266c4 100644
--- a/src/Common/VersionNumber.h
+++ b/src/Common/VersionNumber.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <iostream>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Common/Visitor.h b/src/Common/Visitor.h
index 48e9abe1341..c46c1286324 100644
--- a/src/Common/Visitor.h
+++ b/src/Common/Visitor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <Common/TypeList.h>
 #include <Common/Exception.h>
 
diff --git a/src/Common/Volnitsky.h b/src/Common/Volnitsky.h
index 13cef28ddcf..f08172c8a77 100644
--- a/src/Common/Volnitsky.h
+++ b/src/Common/Volnitsky.h
@@ -4,13 +4,13 @@
 #include <vector>
 #include <stdint.h>
 #include <string.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Unicode.h>
 #include <Common/StringSearcher.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
-#include <common/StringRef.h>
-#include <common/unaligned.h>
+#include <base/StringRef.h>
+#include <base/unaligned.h>
 
 /** Search for a substring in a string by Volnitsky's algorithm
   * http://volnitsky.com/project/str_search/
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index 30d816aad15..1a816616c7c 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 
 #include <vector>
diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index 49eb7ad764d..be210644e70 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -1,7 +1,7 @@
 #include <Common/ZooKeeper/TestKeeper.h>
 #include <Common/setThreadName.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <sstream>
 #include <iomanip>
diff --git a/src/Common/ZooKeeper/Types.h b/src/Common/ZooKeeper/Types.h
index 33be2853068..35d4188d3e2 100644
--- a/src/Common/ZooKeeper/Types.h
+++ b/src/Common/ZooKeeper/Types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <future>
 #include <memory>
 #include <vector>
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index 220b52104b5..e347e6de362 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -7,8 +7,8 @@
 #include <filesystem>
 #include <pcg-random/pcg_random.hpp>
 
-#include <common/logger_useful.h>
-#include <common/find_symbols.h>
+#include <base/logger_useful.h>
+#include <base/find_symbols.h>
 #include <Common/randomSeed.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Exception.h>
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index 27dfdad7cdd..5ee25aba1fb 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Stopwatch.h>
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index f96d29d3290..bc8fe0fe365 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <IO/ReadHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <array>
 
 
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index 19b73efcb9d..d79a94169b2 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -7,7 +7,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index f84edca3cf1..ce37ca7b650 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ThreadPool.h>
diff --git a/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp b/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
index 5f1487da9a2..cd0f9f024fd 100644
--- a/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
+++ b/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
@@ -5,7 +5,7 @@
 #include <Common/ZooKeeper/ZooKeeperImpl.h>
 #include <Common/typeid_cast.h>
 #include <iostream>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 using namespace Coordination;
diff --git a/src/Common/assert_cast.h b/src/Common/assert_cast.h
index b70068b8e81..c7a3db478df 100644
--- a/src/Common/assert_cast.h
+++ b/src/Common/assert_cast.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include <Common/Exception.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 
 
 namespace DB
diff --git a/src/Common/checkStackSize.cpp b/src/Common/checkStackSize.cpp
index f8b13cd8ca2..69757a12f52 100644
--- a/src/Common/checkStackSize.cpp
+++ b/src/Common/checkStackSize.cpp
@@ -1,6 +1,6 @@
 #include <Common/checkStackSize.h>
 #include <Common/Exception.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <pthread.h>
 #include <cstdint>
 
diff --git a/src/Common/createHardLink.h b/src/Common/createHardLink.h
index c2b01cf817b..46ddeaf2830 100644
--- a/src/Common/createHardLink.h
+++ b/src/Common/createHardLink.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Common/examples/arena_with_free_lists.cpp b/src/Common/examples/arena_with_free_lists.cpp
index dc830fdb89c..5997a9ff4b0 100644
--- a/src/Common/examples/arena_with_free_lists.cpp
+++ b/src/Common/examples/arena_with_free_lists.cpp
@@ -12,10 +12,10 @@
 #include <memory>
 #include <array>
 #include <sys/resource.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
-#include <common/StringRef.h>
-#include <common/arraySize.h>
+#include <base/StringRef.h>
+#include <base/arraySize.h>
 #include <Common/Arena.h>
 #include <Core/Field.h>
 #include <Common/Stopwatch.h>
diff --git a/src/Common/examples/average.cpp b/src/Common/examples/average.cpp
index efe78212f06..5a42d8c5020 100644
--- a/src/Common/examples/average.cpp
+++ b/src/Common/examples/average.cpp
@@ -3,7 +3,7 @@
 
 #include <fmt/format.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/PODArray.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Common/Arena.h>
diff --git a/src/Common/examples/chaos_sanitizer.cpp b/src/Common/examples/chaos_sanitizer.cpp
index 05bf16e3638..0b7d21aa33e 100644
--- a/src/Common/examples/chaos_sanitizer.cpp
+++ b/src/Common/examples/chaos_sanitizer.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <atomic>
 
-#include <common/sleep.h>
+#include <base/sleep.h>
 
 #include <IO/ReadHelpers.h>
 
diff --git a/src/Common/examples/integer_hash_tables_and_hashes.cpp b/src/Common/examples/integer_hash_tables_and_hashes.cpp
index 12f4ed450bf..0e9390ab3ac 100644
--- a/src/Common/examples/integer_hash_tables_and_hashes.cpp
+++ b/src/Common/examples/integer_hash_tables_and_hashes.cpp
@@ -13,7 +13,7 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 //#define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
diff --git a/src/Common/examples/integer_hash_tables_benchmark.cpp b/src/Common/examples/integer_hash_tables_benchmark.cpp
index f81add6d6cb..8fbf8797c4e 100644
--- a/src/Common/examples/integer_hash_tables_benchmark.cpp
+++ b/src/Common/examples/integer_hash_tables_benchmark.cpp
@@ -10,7 +10,7 @@
 
 #include <Common/Stopwatch.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
diff --git a/src/Common/examples/radix_sort.cpp b/src/Common/examples/radix_sort.cpp
index 0fb3c904466..ababfe5422a 100644
--- a/src/Common/examples/radix_sort.cpp
+++ b/src/Common/examples/radix_sort.cpp
@@ -1,6 +1,6 @@
 #include <iomanip>
 #include <pcg_random.hpp>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 //#if defined(NDEBUG)
 //#undef NDEBUG
diff --git a/src/Common/examples/simple_cache.cpp b/src/Common/examples/simple_cache.cpp
index 8fe18c5594c..2be4a307df0 100644
--- a/src/Common/examples/simple_cache.cpp
+++ b/src/Common/examples/simple_cache.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <common/SimpleCache.h>
+#include <base/SimpleCache.h>
 
 
 static int func(int x, int y)
diff --git a/src/Common/examples/space_saving.cpp b/src/Common/examples/space_saving.cpp
index df336c8b773..e765d1c98b4 100644
--- a/src/Common/examples/space_saving.cpp
+++ b/src/Common/examples/space_saving.cpp
@@ -4,7 +4,7 @@
 #include <string>
 
 #include <Common/SpaceSaving.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 int main(int, char **)
 {
diff --git a/src/Common/examples/symbol_index.cpp b/src/Common/examples/symbol_index.cpp
index 496fa7dc3fe..5c0896be2a8 100644
--- a/src/Common/examples/symbol_index.cpp
+++ b/src/Common/examples/symbol_index.cpp
@@ -2,7 +2,7 @@
 #include <Common/Elf.h>
 #include <Common/Dwarf.h>
 #include <Core/Defines.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <iostream>
 #include <dlfcn.h>
 
diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
index 551b4ee0fc5..de5802cde6d 100644
--- a/src/Common/filesystemHelpers.h
+++ b/src/Common/filesystemHelpers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 
 #include <filesystem>
diff --git a/src/Common/formatIPv6.cpp b/src/Common/formatIPv6.cpp
index cffdc425237..f23e3f1ba99 100644
--- a/src/Common/formatIPv6.cpp
+++ b/src/Common/formatIPv6.cpp
@@ -2,7 +2,7 @@
 #include <Common/hex.h>
 #include <Common/StringUtils/StringUtils.h>
 
-#include <common/range.h>
+#include <base/range.h>
 #include <array>
 #include <algorithm>
 
diff --git a/src/Common/formatIPv6.h b/src/Common/formatIPv6.h
index bb8acd6d17a..1a65adae55b 100644
--- a/src/Common/formatIPv6.h
+++ b/src/Common/formatIPv6.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <string.h>
 #include <algorithm>
 #include <utility>
-#include <common/range.h>
+#include <base/range.h>
 #include <Common/hex.h>
 #include <Common/StringUtils/StringUtils.h>
 
diff --git a/src/Common/hex.h b/src/Common/hex.h
index 82eff776244..aae53bef766 100644
--- a/src/Common/hex.h
+++ b/src/Common/hex.h
@@ -21,7 +21,7 @@ inline char hexDigitLowercase(unsigned char c)
 #include <cstring>
 #include <cstddef>
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 /// Maps 0..255 to 00..FF or 00..ff correspondingly
diff --git a/src/Common/intExp.h b/src/Common/intExp.h
index b2d704e58b2..3529990ef3b 100644
--- a/src/Common/intExp.h
+++ b/src/Common/intExp.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <limits>
 
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 
 // Also defined in Core/Defines.h
 #if !defined(NO_SANITIZE_UNDEFINED)
diff --git a/src/Common/isLocalAddress.cpp b/src/Common/isLocalAddress.cpp
index 9e22c58f94c..d79e4cebd15 100644
--- a/src/Common/isLocalAddress.cpp
+++ b/src/Common/isLocalAddress.cpp
@@ -3,7 +3,7 @@
 #include <ifaddrs.h>
 #include <cstring>
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/SocketAddress.h>
diff --git a/src/Common/isLocalAddress.h b/src/Common/isLocalAddress.h
index 3d0db2d9550..42977775b09 100644
--- a/src/Common/isLocalAddress.h
+++ b/src/Common/isLocalAddress.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Net/IPAddress.h>
 
 
diff --git a/src/Common/isValidUTF8.h b/src/Common/isValidUTF8.h
index e2396852845..595c2eda0fa 100644
--- a/src/Common/isValidUTF8.h
+++ b/src/Common/isValidUTF8.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB::UTF8
 {
diff --git a/src/Common/memory.h b/src/Common/memory.h
index 84c6af9a1be..0dc163a54a1 100644
--- a/src/Common/memory.h
+++ b/src/Common/memory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <new>
-#include <common/defines.h>
+#include <base/defines.h>
 
 #include <Common/CurrentMemoryTracker.h>
 
diff --git a/src/Common/parseAddress.cpp b/src/Common/parseAddress.cpp
index e02b5d16db7..04e3bd27e14 100644
--- a/src/Common/parseAddress.cpp
+++ b/src/Common/parseAddress.cpp
@@ -1,7 +1,7 @@
 #include <Common/parseAddress.h>
 #include <Common/Exception.h>
 #include <IO/ReadHelpers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Common/parseAddress.h b/src/Common/parseAddress.h
index 602a9adc0b2..86340982c67 100644
--- a/src/Common/parseAddress.h
+++ b/src/Common/parseAddress.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <map>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index 477f5e0f250..7c8053037ea 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -2,7 +2,7 @@
 #include <Common/Exception.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/parseRemoteDescription.h b/src/Common/parseRemoteDescription.h
index f691a57dc73..eef8fbfefe4 100644
--- a/src/Common/parseRemoteDescription.h
+++ b/src/Common/parseRemoteDescription.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <vector>
 namespace DB
 {
diff --git a/src/Common/quoteString.h b/src/Common/quoteString.h
index 3d395a35b03..e7aa62d99e5 100644
--- a/src/Common/quoteString.h
+++ b/src/Common/quoteString.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/StringRef.h>
+#include <base/types.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/Common/randomSeed.cpp b/src/Common/randomSeed.cpp
index ded224e56c3..74088d0a4f3 100644
--- a/src/Common/randomSeed.cpp
+++ b/src/Common/randomSeed.cpp
@@ -4,8 +4,8 @@
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
 #include <Common/SipHash.h>
-#include <common/getThreadId.h>
-#include <common/types.h>
+#include <base/getThreadId.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/randomSeed.h b/src/Common/randomSeed.h
index 4f04e4b974a..99b8a88f982 100644
--- a/src/Common/randomSeed.h
+++ b/src/Common/randomSeed.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <common/types.h>
+#include <base/types.h>
 
 /** Returns a number suitable as seed for PRNG. Use clock_gettime, pid and so on. */
 DB::UInt64 randomSeed();
diff --git a/src/Common/tests/gtest_DateLUTImpl.cpp b/src/Common/tests/gtest_DateLUTImpl.cpp
index 74fd7cb6149..a621f05c517 100644
--- a/src/Common/tests/gtest_DateLUTImpl.cpp
+++ b/src/Common/tests/gtest_DateLUTImpl.cpp
@@ -1,5 +1,5 @@
-#include <common/DateLUT.h>
-#include <common/DateLUTImpl.h>
+#include <base/DateLUT.h>
+#include <base/DateLUTImpl.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/Common/tests/gtest_find_symbols.cpp b/src/Common/tests/gtest_find_symbols.cpp
index 79a7ed032df..1daab982d01 100644
--- a/src/Common/tests/gtest_find_symbols.cpp
+++ b/src/Common/tests/gtest_find_symbols.cpp
@@ -1,6 +1,6 @@
 #include <string>
 #include <vector>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <gtest/gtest.h>
 
 
diff --git a/src/Common/tests/gtest_json_test.cpp b/src/Common/tests/gtest_json_test.cpp
index 726fb836030..fb2a7243965 100644
--- a/src/Common/tests/gtest_json_test.cpp
+++ b/src/Common/tests/gtest_json_test.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <exception>
 #include <string_view>
-#include <common/JSON.h>
+#include <base/JSON.h>
 
 #include <boost/range/irange.hpp>
 #include <gtest/gtest.h>
diff --git a/src/Common/tests/gtest_local_date_time_comparison.cpp b/src/Common/tests/gtest_local_date_time_comparison.cpp
index f75c2647100..9f66da51c94 100644
--- a/src/Common/tests/gtest_local_date_time_comparison.cpp
+++ b/src/Common/tests/gtest_local_date_time_comparison.cpp
@@ -2,7 +2,7 @@
 #include <stdexcept>
 #include <gtest/gtest.h>
 
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 
 
 void fillStackWithGarbage()
diff --git a/src/Common/tests/gtest_log.cpp b/src/Common/tests/gtest_log.cpp
index 4769b8c0261..5addb5acf5d 100644
--- a/src/Common/tests/gtest_log.cpp
+++ b/src/Common/tests/gtest_log.cpp
@@ -1,6 +1,6 @@
 #include <string>
 #include <vector>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <gtest/gtest.h>
 
 #include <Poco/Logger.h>
diff --git a/src/Common/tests/gtest_rw_lock.cpp b/src/Common/tests/gtest_rw_lock.cpp
index c77e405e18b..6ba67a40445 100644
--- a/src/Common/tests/gtest_rw_lock.cpp
+++ b/src/Common/tests/gtest_rw_lock.cpp
@@ -3,9 +3,9 @@
 #include <Common/Exception.h>
 #include <Common/RWLock.h>
 #include <Common/Stopwatch.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ThreadPool.h>
-#include <common/phdr_cache.h>
+#include <base/phdr_cache.h>
 #include <random>
 #include <pcg_random.hpp>
 #include <thread>
diff --git a/src/Common/tests/gtest_shell_command.cpp b/src/Common/tests/gtest_shell_command.cpp
index ba1c470bf82..d6d0a544e9b 100644
--- a/src/Common/tests/gtest_shell_command.cpp
+++ b/src/Common/tests/gtest_shell_command.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ShellCommand.h>
 #include <IO/copyData.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
diff --git a/src/Common/tests/gtest_strong_typedef.cpp b/src/Common/tests/gtest_strong_typedef.cpp
index cb358459e68..98e8df86154 100644
--- a/src/Common/tests/gtest_strong_typedef.cpp
+++ b/src/Common/tests/gtest_strong_typedef.cpp
@@ -1,4 +1,4 @@
-#include <common/strong_typedef.h>
+#include <base/strong_typedef.h>
 #include <set>
 #include <unordered_set>
 #include <memory>
diff --git a/src/Common/tests/gtest_wide_integer.cpp b/src/Common/tests/gtest_wide_integer.cpp
index d1876a7b9a6..4021ae0ea91 100644
--- a/src/Common/tests/gtest_wide_integer.cpp
+++ b/src/Common/tests/gtest_wide_integer.cpp
@@ -8,7 +8,7 @@
 #include <Core/Types.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 
 
 static_assert(is_signed_v<Int128>);
diff --git a/src/Common/typeid_cast.h b/src/Common/typeid_cast.h
index 85534a971f5..b656c6548ea 100644
--- a/src/Common/typeid_cast.h
+++ b/src/Common/typeid_cast.h
@@ -6,9 +6,9 @@
 #include <memory>
 #include <string>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Common/Exception.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 
 
 namespace DB
diff --git a/src/Compression/CompressedWriteBuffer.cpp b/src/Compression/CompressedWriteBuffer.cpp
index 7454e09fda0..bcf3bdd9c97 100644
--- a/src/Compression/CompressedWriteBuffer.cpp
+++ b/src/Compression/CompressedWriteBuffer.cpp
@@ -1,8 +1,8 @@
 #include <city.h>
 #include <string.h>
 
-#include <common/unaligned.h>
-#include <common/types.h>
+#include <base/unaligned.h>
+#include <base/types.h>
 
 #include "CompressedWriteBuffer.h"
 #include <Compression/CompressionFactory.h>
diff --git a/src/Compression/CompressionCodecDelta.cpp b/src/Compression/CompressionCodecDelta.cpp
index e8c5b4f878d..07dd8219fae 100644
--- a/src/Compression/CompressionCodecDelta.cpp
+++ b/src/Compression/CompressionCodecDelta.cpp
@@ -1,7 +1,7 @@
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 57b5a41c6f7..3af43911015 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -5,7 +5,7 @@
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTIdentifier.h>
 
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index d35411d6266..7a2922b53cd 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -1,13 +1,13 @@
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
 #endif
-#include "Common/Exception.h"
-#include "common/types.h"
-#include "IO/VarInt.h"
+#include <Common/Exception.h>
+#include <base/types.h>
+#include <IO/VarInt.h>
 #include <Compression/CompressionFactory.h>
 #include <Compression/CompressionCodecEncrypted.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ErrorCodes.h>
 
 // This depends on BoringSSL-specific API, notably <openssl/aead.h>.
diff --git a/src/Compression/CompressionCodecEncrypted.h b/src/Compression/CompressionCodecEncrypted.h
index 7869e4d7194..75c29ee98a1 100644
--- a/src/Compression/CompressionCodecEncrypted.h
+++ b/src/Compression/CompressionCodecEncrypted.h
@@ -3,7 +3,7 @@
 #if !defined(ARCADIA_BUILD)
 #include <string_view>
 #include <unordered_map>
-#include <common/types.h>
+#include <base/types.h>
 #include <Compression/ICompressionCodec.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Common/MultiVersion.h>
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 317116712cb..d6ea0267550 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -5,7 +5,7 @@
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTIdentifier.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Compression/CompressionCodecMultiple.cpp b/src/Compression/CompressionCodecMultiple.cpp
index a0336d66a05..8ad054673e1 100644
--- a/src/Compression/CompressionCodecMultiple.cpp
+++ b/src/Compression/CompressionCodecMultiple.cpp
@@ -1,7 +1,7 @@
 #include <Compression/CompressionCodecMultiple.h>
 #include <Compression/CompressionInfo.h>
 #include <Common/PODArray.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Compression/CompressionFactory.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index 377db915bce..66e9082dc4a 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -2,7 +2,7 @@
 
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index 9753a47e1d8..ba52aee69f8 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -3,7 +3,7 @@
 #include <cassert>
 
 #include <Parsers/ASTFunction.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Common/Exception.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Compression/ICompressionCodec.h b/src/Compression/ICompressionCodec.h
index 7a401186be3..a741e65dfdd 100644
--- a/src/Compression/ICompressionCodec.h
+++ b/src/Compression/ICompressionCodec.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <Compression/CompressionInfo.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST.h>
 #include <Common/SipHash.h>
 
diff --git a/src/Compression/LZ4_decompress_faster.cpp b/src/Compression/LZ4_decompress_faster.cpp
index 1aeae6b1b9a..85cd9fa3ab0 100644
--- a/src/Compression/LZ4_decompress_faster.cpp
+++ b/src/Compression/LZ4_decompress_faster.cpp
@@ -4,8 +4,8 @@
 #include <iostream>
 #include <Core/Defines.h>
 #include <Common/Stopwatch.h>
-#include <common/types.h>
-#include <common/unaligned.h>
+#include <base/types.h>
+#include <base/unaligned.h>
 
 #ifdef __SSE2__
 #include <emmintrin.h>
diff --git a/src/Compression/getCompressionCodecForFile.cpp b/src/Compression/getCompressionCodecForFile.cpp
index 1557985ff66..a3ad2c93cc0 100644
--- a/src/Compression/getCompressionCodecForFile.cpp
+++ b/src/Compression/getCompressionCodecForFile.cpp
@@ -4,7 +4,7 @@
 #include <IO/ReadBufferFromFileBase.h>
 #include <Compression/CompressionCodecMultiple.h>
 #include <Common/PODArray.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index dc0334c3c0c..f0d234e5cc5 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -2,7 +2,7 @@
 
 #include <Common/PODArray.h>
 #include <Common/Stopwatch.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/IDataType.h>
 #include <IO/ReadBufferFromMemory.h>
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
index 967e94c390c..14df3aab03b 100644
--- a/src/Coordination/Changelog.cpp
+++ b/src/Coordination/Changelog.cpp
@@ -9,7 +9,7 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <Common/Exception.h>
 #include <Common/SipHash.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp
index cd46817e82f..6201834d17d 100644
--- a/src/Coordination/CoordinationSettings.cpp
+++ b/src/Coordination/CoordinationSettings.cpp
@@ -1,6 +1,6 @@
 #include <Coordination/CoordinationSettings.h>
 #include <Core/Settings.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/KeeperDispatcher.h b/src/Coordination/KeeperDispatcher.h
index a20603f12c5..f49063f8dea 100644
--- a/src/Coordination/KeeperDispatcher.h
+++ b/src/Coordination/KeeperDispatcher.h
@@ -11,7 +11,7 @@
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <functional>
 #include <Coordination/KeeperServer.h>
 #include <Coordination/CoordinationSettings.h>
diff --git a/src/Coordination/KeeperLogStore.h b/src/Coordination/KeeperLogStore.h
index d9f17c57342..bd0ecb78130 100644
--- a/src/Coordination/KeeperLogStore.h
+++ b/src/Coordination/KeeperLogStore.h
@@ -4,7 +4,7 @@
 #include <mutex>
 #include <Core/Types.h>
 #include <Coordination/Changelog.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index eb1f8437cc9..a7e96156dc1 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -7,7 +7,7 @@
 #include <Coordination/KeeperStorage.h>
 #include <Coordination/CoordinationSettings.h>
 #include <unordered_map>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index 0e032e29670..fcf9c7d14c4 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -2,7 +2,7 @@
 
 #include <Coordination/KeeperStorage.h>
 #include <libnuraft/nuraft.hxx> // Y_IGNORE
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Coordination/ThreadSafeQueue.h>
 #include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperSnapshotManager.h>
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 1e5a74ef5eb..b6938da958b 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -3,7 +3,7 @@
 #include <Common/setThreadName.h>
 #include <mutex>
 #include <functional>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <sstream>
 #include <iomanip>
diff --git a/src/Coordination/LoggerWrapper.h b/src/Coordination/LoggerWrapper.h
index 25a1969d2e9..12b24d99cc9 100644
--- a/src/Coordination/LoggerWrapper.h
+++ b/src/Coordination/LoggerWrapper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <libnuraft/nuraft.hxx> // Y_IGNORE
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Core/SettingsEnums.h>
 
 namespace DB
diff --git a/src/Coordination/SessionExpiryQueue.cpp b/src/Coordination/SessionExpiryQueue.cpp
index b6d3843f1d7..d56851e3bdd 100644
--- a/src/Coordination/SessionExpiryQueue.cpp
+++ b/src/Coordination/SessionExpiryQueue.cpp
@@ -1,5 +1,5 @@
 #include <Coordination/SessionExpiryQueue.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/SnapshotableHashTable.h b/src/Coordination/SnapshotableHashTable.h
index 9987081ba87..454d1110196 100644
--- a/src/Coordination/SnapshotableHashTable.h
+++ b/src/Coordination/SnapshotableHashTable.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <unordered_map>
 #include <list>
 #include <atomic>
diff --git a/src/Coordination/WriteBufferFromNuraftBuffer.cpp b/src/Coordination/WriteBufferFromNuraftBuffer.cpp
index 1a16b7cef24..debf8fff70f 100644
--- a/src/Coordination/WriteBufferFromNuraftBuffer.cpp
+++ b/src/Coordination/WriteBufferFromNuraftBuffer.cpp
@@ -1,5 +1,5 @@
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/ZooKeeperDataReader.h b/src/Coordination/ZooKeeperDataReader.h
index 5f26457c113..1ff2ea740c9 100644
--- a/src/Coordination/ZooKeeperDataReader.h
+++ b/src/Coordination/ZooKeeperDataReader.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <Coordination/KeeperStorage.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index c6a4e723ec5..99dd64a21cd 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -21,7 +21,7 @@
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <libnuraft/nuraft.hxx> // Y_IGNORE
 #include <thread>
 #include <Coordination/KeeperLogStore.h>
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index 0f4a2bb2d1f..ab82a966a76 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -2,10 +2,10 @@
 
 #include <cmath>
 #include <limits>
-#include <common/DecomposedFloat.h>
+#include <base/DecomposedFloat.h>
 #include <Core/Defines.h>
 #include <Core/Types.h>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 #include <Common/NaNUtils.h>
 
 /** Preceptually-correct number comparisons.
diff --git a/src/Core/BackgroundSchedulePool.cpp b/src/Core/BackgroundSchedulePool.cpp
index f241eb29dbd..9a42f752db2 100644
--- a/src/Core/BackgroundSchedulePool.cpp
+++ b/src/Core/BackgroundSchedulePool.cpp
@@ -3,9 +3,9 @@
 #include <Common/setThreadName.h>
 #include <Common/Stopwatch.h>
 #include <Common/CurrentThread.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <chrono>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
diff --git a/src/Core/BaseSettings.cpp b/src/Core/BaseSettings.cpp
index ff2ddf81cff..f23682f1888 100644
--- a/src/Core/BaseSettings.cpp
+++ b/src/Core/BaseSettings.cpp
@@ -1,7 +1,7 @@
 #include <Core/BaseSettings.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Core/BaseSettings.h b/src/Core/BaseSettings.h
index eb12249fe07..7dca93212a2 100644
--- a/src/Core/BaseSettings.h
+++ b/src/Core/BaseSettings.h
@@ -2,7 +2,7 @@
 
 #include <Core/SettingsFields.h>
 #include <Common/SettingsChanges.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/blank.hpp>
 #include <unordered_map>
 
diff --git a/src/Core/BlockInfo.cpp b/src/Core/BlockInfo.cpp
index 9f88513cd3c..e9aee871be1 100644
--- a/src/Core/BlockInfo.cpp
+++ b/src/Core/BlockInfo.cpp
@@ -1,4 +1,4 @@
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
diff --git a/src/Core/BlockInfo.h b/src/Core/BlockInfo.h
index 125c90b1b23..4e06edc65be 100644
--- a/src/Core/BlockInfo.h
+++ b/src/Core/BlockInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <unordered_map>
 #include <vector>
diff --git a/src/Core/DecimalComparison.h b/src/Core/DecimalComparison.h
index cf2c43d61bd..0398ec5cbac 100644
--- a/src/Core/DecimalComparison.h
+++ b/src/Core/DecimalComparison.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include <Core/Block.h>
 #include <Core/AccurateComparison.h>
 #include <Core/callOnTypeIndex.h>
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index 8f8e6b304cb..59d88785f1b 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -3,7 +3,7 @@
 #include <Core/Types.h>
 #include <Common/Exception.h>
 #include <Common/intExp.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 #include <limits>
 #include <type_traits>
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index ce5c9098399..f55931e4f8f 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #define DBMS_DEFAULT_HOST "localhost"
 #define DBMS_DEFAULT_PORT 9000
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index 0820846b982..91f940006bc 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -20,7 +20,7 @@
 #include <Core/ExternalTable.h>
 #include <Poco/Net/MessageHeader.h>
 #include <Formats/FormatFactory.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Core/Field.h b/src/Core/Field.h
index d66674805d1..a9fb73393cf 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -12,9 +12,9 @@
 #include <Core/Defines.h>
 #include <Core/DecimalFunctions.h>
 #include <Core/UUID.h>
-#include <common/DayNum.h>
-#include <common/strong_typedef.h>
-#include <common/EnumReflection.h>
+#include <base/DayNum.h>
+#include <base/strong_typedef.h>
+#include <base/EnumReflection.h>
 
 namespace DB
 {
diff --git a/src/Core/MySQL/Authentication.cpp b/src/Core/MySQL/Authentication.cpp
index aeb9a411082..9bb7782d268 100644
--- a/src/Core/MySQL/Authentication.cpp
+++ b/src/Core/MySQL/Authentication.cpp
@@ -4,10 +4,10 @@
 #include <Poco/SHA1Engine.h>
 #include <Interpreters/Session.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/OpenSSLHelpers.h>
 
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 namespace DB
 {
diff --git a/src/Core/MySQL/Authentication.h b/src/Core/MySQL/Authentication.h
index a60e769434e..c7d4a7d25a1 100644
--- a/src/Core/MySQL/Authentication.h
+++ b/src/Core/MySQL/Authentication.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Interpreters/Context.h>
 #include <Core/MySQL/PacketEndpoint.h>
 
diff --git a/src/Core/MySQL/MySQLClient.h b/src/Core/MySQL/MySQLClient.h
index 2c93fc888a3..5b33a8f852b 100644
--- a/src/Core/MySQL/MySQLClient.h
+++ b/src/Core/MySQL/MySQLClient.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MySQL/MySQLReplication.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Core/MySQL/MySQLReplication.cpp b/src/Core/MySQL/MySQLReplication.cpp
index 81015507d8d..9c90b2ff220 100644
--- a/src/Core/MySQL/MySQLReplication.cpp
+++ b/src/Core/MySQL/MySQLReplication.cpp
@@ -5,7 +5,7 @@
 #include <IO/MySQLBinlogEventReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <Common/FieldVisitorToString.h>
 #include <Core/MySQL/PacketsGeneric.h>
 #include <Core/MySQL/PacketsProtocolText.h>
diff --git a/src/Core/MySQL/MySQLReplication.h b/src/Core/MySQL/MySQLReplication.h
index cd24979caaa..a57cc246eaa 100644
--- a/src/Core/MySQL/MySQLReplication.h
+++ b/src/Core/MySQL/MySQLReplication.h
@@ -2,7 +2,7 @@
 #include <Core/Field.h>
 #include <Core/MySQL/PacketsReplication.h>
 #include <Core/MySQL/MySQLGtid.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
diff --git a/src/Core/MySQL/PacketEndpoint.h b/src/Core/MySQL/PacketEndpoint.h
index df81f49fefb..b1897958ced 100644
--- a/src/Core/MySQL/PacketEndpoint.h
+++ b/src/Core/MySQL/PacketEndpoint.h
@@ -5,7 +5,7 @@
 #include "IMySQLReadPacket.h"
 #include "IMySQLWritePacket.h"
 #include "IO/MySQLPacketPayloadReadBuffer.h"
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Core/PostgreSQL/Connection.cpp b/src/Core/PostgreSQL/Connection.cpp
index 8e127afb1db..75786a51d92 100644
--- a/src/Core/PostgreSQL/Connection.cpp
+++ b/src/Core/PostgreSQL/Connection.cpp
@@ -1,7 +1,7 @@
 #include "Connection.h"
 
 #if USE_LIBPQXX
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace postgres
diff --git a/src/Core/PostgreSQL/ConnectionHolder.h b/src/Core/PostgreSQL/ConnectionHolder.h
index cbdde7062b5..c2a1908774c 100644
--- a/src/Core/PostgreSQL/ConnectionHolder.h
+++ b/src/Core/PostgreSQL/ConnectionHolder.h
@@ -8,7 +8,7 @@
 
 #include <pqxx/pqxx> // Y_IGNORE
 #include <Core/Types.h>
-#include <common/BorrowedObjectPool.h>
+#include <base/BorrowedObjectPool.h>
 
 
 namespace postgres
diff --git a/src/Core/PostgreSQL/PoolWithFailover.h b/src/Core/PostgreSQL/PoolWithFailover.h
index 9d491625a0b..fbf2780daaf 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.h
+++ b/src/Core/PostgreSQL/PoolWithFailover.h
@@ -10,7 +10,7 @@
 #include "ConnectionHolder.h"
 #include <mutex>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
 
 
diff --git a/src/Core/PostgreSQLProtocol.h b/src/Core/PostgreSQLProtocol.h
index 2b92258394e..7d34e23eed2 100644
--- a/src/Core/PostgreSQLProtocol.h
+++ b/src/Core/PostgreSQLProtocol.h
@@ -6,7 +6,7 @@
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Session.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Format.h>
 #include <Poco/RegularExpression.h>
 #include <Poco/Net/StreamSocket.h>
diff --git a/src/Core/Protocol.h b/src/Core/Protocol.h
index 92e780104b5..d248df4c0fd 100644
--- a/src/Core/Protocol.h
+++ b/src/Core/Protocol.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Core/QueryProcessingStage.h b/src/Core/QueryProcessingStage.h
index 7ccaa17eaed..ce6949c0dea 100644
--- a/src/Core/QueryProcessingStage.h
+++ b/src/Core/QueryProcessingStage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Core/ServerUUID.cpp b/src/Core/ServerUUID.cpp
index 721c406ff5f..ffb69707f72 100644
--- a/src/Core/ServerUUID.cpp
+++ b/src/Core/ServerUUID.cpp
@@ -3,7 +3,7 @@
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index 379c65a913f..488e2f7d331 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -3,7 +3,7 @@
 #include <Core/Field.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/FieldVisitorConvertToNumber.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 3b84db04b1a..b27763ad0d6 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Timespan.h>
 #include <Poco/URI.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Field.h>
 #include <Core/MultiEnum.h>
 #include <boost/range/adaptor/map.hpp>
diff --git a/src/Core/SettingsQuirks.cpp b/src/Core/SettingsQuirks.cpp
index f969c42680c..94bd2e166b2 100644
--- a/src/Core/SettingsQuirks.cpp
+++ b/src/Core/SettingsQuirks.cpp
@@ -3,7 +3,7 @@
 #include <Poco/Environment.h>
 #include <Poco/Platform.h>
 #include <Common/VersionNumber.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <cstdlib>
 
 /// Detect does epoll_wait with nested epoll fds works correctly.
diff --git a/src/Core/Types.h b/src/Core/Types.h
index e3ff386fe53..c0a6a0c3189 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -3,9 +3,9 @@
 #include <cstdint>
 #include <string>
 #include <vector>
-#include <common/strong_typedef.h>
-#include <common/Decimal.h>
-#include <common/defines.h>
+#include <base/strong_typedef.h>
+#include <base/Decimal.h>
+#include <base/defines.h>
 
 
 namespace DB
diff --git a/src/Core/examples/string_pool.cpp b/src/Core/examples/string_pool.cpp
index 358381c4c0c..2296514134b 100644
--- a/src/Core/examples/string_pool.cpp
+++ b/src/Core/examples/string_pool.cpp
@@ -6,7 +6,7 @@
 
 #include <Common/Stopwatch.h>
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/Arena.h>
 
 #include <IO/ReadBufferFromFileDescriptor.h>
diff --git a/src/Core/examples/string_ref_hash.cpp b/src/Core/examples/string_ref_hash.cpp
index 9aea1e42bc8..07ba7def328 100644
--- a/src/Core/examples/string_ref_hash.cpp
+++ b/src/Core/examples/string_ref_hash.cpp
@@ -1,7 +1,7 @@
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/Operators.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 /** Calculates StringRefHash from stdin. For debugging.
diff --git a/src/Core/iostream_debug_helpers.h b/src/Core/iostream_debug_helpers.h
index f57788b63d8..8aafe0b6c9c 100644
--- a/src/Core/iostream_debug_helpers.h
+++ b/src/Core/iostream_debug_helpers.h
@@ -45,4 +45,4 @@ std::ostream & operator<<(std::ostream & stream, const TreeRewriterResult & what
 }
 
 /// some operator<< should be declared before operator<<(... std::shared_ptr<>)
-#include <common/iostream_debug_helpers.h>
+#include <base/iostream_debug_helpers.h>
diff --git a/src/Core/tests/gtest_multienum.cpp b/src/Core/tests/gtest_multienum.cpp
index 91cee6b316a..e935208f661 100644
--- a/src/Core/tests/gtest_multienum.cpp
+++ b/src/Core/tests/gtest_multienum.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <type_traits>
 #include <Core/MultiEnum.h>
 
diff --git a/src/DataStreams/BlockStreamProfileInfo.h b/src/DataStreams/BlockStreamProfileInfo.h
index d068db89641..688bdfc91fc 100644
--- a/src/DataStreams/BlockStreamProfileInfo.h
+++ b/src/DataStreams/BlockStreamProfileInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <DataStreams/IBlockStream_fwd.h>
 #include <Common/Stopwatch.h>
 
diff --git a/src/DataStreams/ColumnGathererStream.cpp b/src/DataStreams/ColumnGathererStream.cpp
index 683b8012efe..9018870f3a4 100644
--- a/src/DataStreams/ColumnGathererStream.cpp
+++ b/src/DataStreams/ColumnGathererStream.cpp
@@ -1,5 +1,5 @@
 #include <DataStreams/ColumnGathererStream.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/typeid_cast.h>
 #include <Common/formatReadable.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/DataStreams/ConnectionCollector.cpp b/src/DataStreams/ConnectionCollector.cpp
index 3a411fd2e33..8e700c0ab7f 100644
--- a/src/DataStreams/ConnectionCollector.cpp
+++ b/src/DataStreams/ConnectionCollector.cpp
@@ -3,7 +3,7 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Interpreters/Context.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace CurrentMetrics
 {
diff --git a/src/DataStreams/ExecutionSpeedLimits.cpp b/src/DataStreams/ExecutionSpeedLimits.cpp
index 81afd4fe984..e340ee71ab0 100644
--- a/src/DataStreams/ExecutionSpeedLimits.cpp
+++ b/src/DataStreams/ExecutionSpeedLimits.cpp
@@ -4,7 +4,7 @@
 #include <Common/CurrentThread.h>
 #include <IO/WriteHelpers.h>
 #include <Common/Stopwatch.h>
-#include <common/sleep.h>
+#include <base/sleep.h>
 
 namespace ProfileEvents
 {
diff --git a/src/DataStreams/ExecutionSpeedLimits.h b/src/DataStreams/ExecutionSpeedLimits.h
index 9c86ba2faf4..b8c320bb005 100644
--- a/src/DataStreams/ExecutionSpeedLimits.h
+++ b/src/DataStreams/ExecutionSpeedLimits.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Poco/Timespan.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataStreams/SizeLimits.h>
 
 class Stopwatch;
diff --git a/src/DataStreams/ITTLAlgorithm.h b/src/DataStreams/ITTLAlgorithm.h
index d87d43d8c0c..d219f9f7ad3 100644
--- a/src/DataStreams/ITTLAlgorithm.h
+++ b/src/DataStreams/ITTLAlgorithm.h
@@ -3,7 +3,7 @@
 #include <Storages/TTLDescription.h>
 #include <Storages/MergeTree/MergeTreeDataPartTTLInfo.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 namespace DB
 {
diff --git a/src/DataStreams/InternalTextLogsRowOutputStream.cpp b/src/DataStreams/InternalTextLogsRowOutputStream.cpp
index 96b36157cba..14247b8f2aa 100644
--- a/src/DataStreams/InternalTextLogsRowOutputStream.cpp
+++ b/src/DataStreams/InternalTextLogsRowOutputStream.cpp
@@ -7,7 +7,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
 #include <IO/WriteHelpers.h>
-#include <common/terminalColors.h>
+#include <base/terminalColors.h>
 
 
 namespace DB
diff --git a/src/DataStreams/MarkInCompressedFile.h b/src/DataStreams/MarkInCompressedFile.h
index 94ff5414762..ceefde43615 100644
--- a/src/DataStreams/MarkInCompressedFile.h
+++ b/src/DataStreams/MarkInCompressedFile.h
@@ -2,7 +2,7 @@
 
 #include <tuple>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Common/PODArray.h>
 
diff --git a/src/DataStreams/MongoDBSource.cpp b/src/DataStreams/MongoDBSource.cpp
index c00d214249a..30ad9746520 100644
--- a/src/DataStreams/MongoDBSource.cpp
+++ b/src/DataStreams/MongoDBSource.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/MongoDB/Connection.h>
 #include <Poco/MongoDB/Cursor.h>
 #include <Poco/MongoDB/Element.h>
@@ -16,7 +16,7 @@
 #include <IO/ReadHelpers.h>
 #include <Common/assert_cast.h>
 #include <Common/quoteString.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <Poco/URI.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Version.h>
diff --git a/src/DataStreams/NativeBlockInputStream.cpp b/src/DataStreams/NativeBlockInputStream.cpp
index 06da829751c..2fb661260f0 100644
--- a/src/DataStreams/NativeBlockInputStream.cpp
+++ b/src/DataStreams/NativeBlockInputStream.cpp
@@ -6,7 +6,7 @@
 
 #include <DataTypes/DataTypeFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <DataStreams/NativeBlockInputStream.h>
 #include <DataTypes/DataTypeLowCardinality.h>
diff --git a/src/DataStreams/NativeBlockOutputStream.h b/src/DataStreams/NativeBlockOutputStream.h
index c47d7b2f1c3..7ff6c8dfa33 100644
--- a/src/DataStreams/NativeBlockOutputStream.h
+++ b/src/DataStreams/NativeBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataStreams/IBlockOutputStream.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/IDataType.h>
 
 namespace DB
diff --git a/src/DataStreams/ParallelInputsProcessor.h b/src/DataStreams/ParallelInputsProcessor.h
index 65c7e741ec2..f9f0393e795 100644
--- a/src/DataStreams/ParallelInputsProcessor.h
+++ b/src/DataStreams/ParallelInputsProcessor.h
@@ -6,7 +6,7 @@
 #include <thread>
 #include <mutex>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/setThreadName.h>
 #include <Common/CurrentMetrics.h>
diff --git a/src/DataStreams/PostgreSQLSource.cpp b/src/DataStreams/PostgreSQLSource.cpp
index c3bde8c84ad..ac8408d8338 100644
--- a/src/DataStreams/PostgreSQLSource.cpp
+++ b/src/DataStreams/PostgreSQLSource.cpp
@@ -15,8 +15,8 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
-#include <common/logger_useful.h>
+#include <base/range.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.cpp b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
index 5cdf7d957d2..dac4c0620cb 100644
--- a/src/DataStreams/PushingToViewsBlockOutputStream.cpp
+++ b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
@@ -16,8 +16,8 @@
 #include <Common/ThreadProfileEvents.h>
 #include <Common/ThreadStatus.h>
 #include <Common/checkStackSize.h>
-#include <common/scope_guard.h>
-#include <common/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/logger_useful.h>
 
 #include <atomic>
 #include <chrono>
diff --git a/src/DataStreams/RemoteBlockInputStream.h b/src/DataStreams/RemoteBlockInputStream.h
index 1be6b031520..60bfa5d6990 100644
--- a/src/DataStreams/RemoteBlockInputStream.h
+++ b/src/DataStreams/RemoteBlockInputStream.h
@@ -2,7 +2,7 @@
 
 #include <optional>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <DataStreams/IBlockInputStream.h>
 #include <Common/Throttler.h>
diff --git a/src/DataStreams/RemoteBlockOutputStream.cpp b/src/DataStreams/RemoteBlockOutputStream.cpp
index 96a95227295..7642098ff0c 100644
--- a/src/DataStreams/RemoteBlockOutputStream.cpp
+++ b/src/DataStreams/RemoteBlockOutputStream.cpp
@@ -1,7 +1,7 @@
 #include <DataStreams/RemoteBlockOutputStream.h>
 
 #include <Client/Connection.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/NetException.h>
 #include <Common/CurrentThread.h>
diff --git a/src/DataStreams/SQLiteSource.cpp b/src/DataStreams/SQLiteSource.cpp
index d0d8724c2dd..7ebc2b93165 100644
--- a/src/DataStreams/SQLiteSource.cpp
+++ b/src/DataStreams/SQLiteSource.cpp
@@ -1,8 +1,8 @@
 #include "SQLiteSource.h"
 
 #if USE_SQLITE
-#include <common/range.h>
-#include <common/logger_useful.h>
+#include <base/range.h>
+#include <base/logger_useful.h>
 #include <Common/assert_cast.h>
 
 #include <Columns/ColumnArray.h>
diff --git a/src/DataStreams/ShellCommandSource.h b/src/DataStreams/ShellCommandSource.h
index 3f8f648f18a..6df233639a7 100644
--- a/src/DataStreams/ShellCommandSource.h
+++ b/src/DataStreams/ShellCommandSource.h
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include <common/logger_useful.h>
-#include <common/BorrowedObjectPool.h>
+#include <base/logger_useful.h>
+#include <base/BorrowedObjectPool.h>
 
 #include <Common/ShellCommand.h>
 #include <Common/ThreadPool.h>
diff --git a/src/DataStreams/SizeLimits.h b/src/DataStreams/SizeLimits.h
index 48fd2b9343f..ce7e1795475 100644
--- a/src/DataStreams/SizeLimits.h
+++ b/src/DataStreams/SizeLimits.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/DataStreams/TTLBlockInputStream.h b/src/DataStreams/TTLBlockInputStream.h
index da86b8d5710..bf854d9cc9c 100644
--- a/src/DataStreams/TTLBlockInputStream.h
+++ b/src/DataStreams/TTLBlockInputStream.h
@@ -7,7 +7,7 @@
 #include <DataStreams/ITTLAlgorithm.h>
 #include <DataStreams/TTLDeleteAlgorithm.h>
 
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 namespace DB
 {
diff --git a/src/DataStreams/TTLCalcInputStream.h b/src/DataStreams/TTLCalcInputStream.h
index d1b629c2ad5..20148eadfc2 100644
--- a/src/DataStreams/TTLCalcInputStream.h
+++ b/src/DataStreams/TTLCalcInputStream.h
@@ -6,7 +6,7 @@
 #include <Storages/MergeTree/MergeTreeDataPartTTLInfo.h>
 #include <DataStreams/ITTLAlgorithm.h>
 
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 namespace DB
 {
diff --git a/src/DataStreams/UnionBlockInputStream.h b/src/DataStreams/UnionBlockInputStream.h
index ab667ac2e36..e8746ea1229 100644
--- a/src/DataStreams/UnionBlockInputStream.h
+++ b/src/DataStreams/UnionBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/ConcurrentBoundedQueue.h>
 #include <DataStreams/IBlockInputStream.h>
diff --git a/src/DataTypes/DataTypeDate32.h b/src/DataTypes/DataTypeDate32.h
index e74e4553614..9b93e5feb16 100644
--- a/src/DataTypes/DataTypeDate32.h
+++ b/src/DataTypes/DataTypeDate32.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataTypes/DataTypeNumberBase.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 namespace DB
 {
diff --git a/src/DataTypes/DataTypeDateTime.cpp b/src/DataTypes/DataTypeDateTime.cpp
index 820bfd70766..4284c9ae4bd 100644
--- a/src/DataTypes/DataTypeDateTime.cpp
+++ b/src/DataTypes/DataTypeDateTime.cpp
@@ -3,7 +3,7 @@
 
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Formats/FormatSettings.h>
 #include <IO/Operators.h>
diff --git a/src/DataTypes/DataTypeDateTime64.cpp b/src/DataTypes/DataTypeDateTime64.cpp
index eaec585b6b4..bde7bebf455 100644
--- a/src/DataTypes/DataTypeDateTime64.cpp
+++ b/src/DataTypes/DataTypeDateTime64.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Formats/FormatSettings.h>
 #include <IO/Operators.h>
diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index b0bf459b4ca..5acf498c9fc 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -1,4 +1,4 @@
-#include <common/map.h>
+#include <base/map.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnArray.h>
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index ed00582fd29..aa0a57c636e 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -1,5 +1,5 @@
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Columns/ColumnTuple.h>
 #include <Core/Field.h>
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index 7352ba4d8a5..199f7796f02 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/arithmeticOverflow.h>
-#include <common/extended_types.h>
+#include <base/arithmeticOverflow.h>
+#include <base/extended_types.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypeDecimalBase.h>
diff --git a/src/DataTypes/Serializations/SerializationDateTime.cpp b/src/DataTypes/Serializations/SerializationDateTime.cpp
index 16e47601eeb..b93c69203cb 100644
--- a/src/DataTypes/Serializations/SerializationDateTime.cpp
+++ b/src/DataTypes/Serializations/SerializationDateTime.cpp
@@ -2,7 +2,7 @@
 
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/ProtobufReader.h>
 #include <Formats/ProtobufWriter.h>
diff --git a/src/DataTypes/Serializations/SerializationDateTime64.cpp b/src/DataTypes/Serializations/SerializationDateTime64.cpp
index 9f3958faa4d..8d446d3b9ad 100644
--- a/src/DataTypes/Serializations/SerializationDateTime64.cpp
+++ b/src/DataTypes/Serializations/SerializationDateTime64.cpp
@@ -3,7 +3,7 @@
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/ProtobufReader.h>
 #include <Formats/ProtobufWriter.h>
diff --git a/src/DataTypes/Serializations/SerializationMap.cpp b/src/DataTypes/Serializations/SerializationMap.cpp
index a76784695a9..e8446781f10 100644
--- a/src/DataTypes/Serializations/SerializationMap.cpp
+++ b/src/DataTypes/Serializations/SerializationMap.cpp
@@ -1,4 +1,4 @@
-#include <common/map.h>
+#include <base/map.h>
 
 #include <DataTypes/Serializations/SerializationMap.h>
 #include <DataTypes/Serializations/SerializationArray.h>
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index 6ce3761ff98..1324c6b2b1a 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -1,5 +1,5 @@
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 #include <DataTypes/Serializations/SerializationTuple.h>
 #include <Core/Field.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp
index bcccb58966a..5ad8c43d0cf 100644
--- a/src/DataTypes/convertMySQLDataType.cpp
+++ b/src/DataTypes/convertMySQLDataType.cpp
@@ -1,7 +1,7 @@
 #include "convertMySQLDataType.h"
 
 #include <Core/Field.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MultiEnum.h>
 #include <Core/SettingsEnums.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index ae5893647c2..405d321efc7 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -3,7 +3,7 @@
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <Storages/StorageDictionary.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Parsers/ParserCreateQuery.h>
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index e6f69f797cf..f4336fc7ef9 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -10,8 +10,8 @@
 #include <Storages/IStorage.h>
 #include <Common/escapeForFileName.h>
 
-#include <common/logger_useful.h>
-#include <common/scope_guard_safe.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard_safe.h>
 #include <iomanip>
 #include <filesystem>
 
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index 0ca1de09dd1..296d3dd5f86 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -1,4 +1,4 @@
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Databases/DatabaseMemory.h>
 #include <Databases/DatabasesCommon.h>
 #include <Interpreters/Context.h>
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 9d1bcb51dba..5509904f738 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -14,7 +14,7 @@
 #include <Storages/StorageFactory.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/escapeForFileName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabaseAtomic.h>
 #include <Common/assert_cast.h>
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index a122c5fc175..22b5430a08a 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -23,7 +23,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace fs = std::filesystem;
 
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index c2ff002ea36..5e9ad6c6a55 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -15,7 +15,7 @@
 #include <Interpreters/DDLTask.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/Cluster.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ParserCreateQuery.h>
diff --git a/src/Databases/DatabasesCommon.h b/src/Databases/DatabasesCommon.h
index 4e5ee710298..dfa99b632e3 100644
--- a/src/Databases/DatabasesCommon.h
+++ b/src/Databases/DatabasesCommon.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/IAST.h>
 #include <Storages/IStorage_fwd.h>
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index e1ba359bbfc..a575f458751 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Interpreters/Context_fwd.h>
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.h b/src/Databases/MySQL/FetchTablesColumnsList.h
index 4b49fea864e..f039ccdbd69 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.h
+++ b/src/Databases/MySQL/FetchTablesColumnsList.h
@@ -5,7 +5,7 @@
 
 #include <mysqlxx/PoolWithFailover.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MultiEnum.h>
 #include <Core/SettingsEnums.h>
 #include <Storages/ColumnsDescription.h>
diff --git a/src/Databases/MySQL/MaterializeMetadata.h b/src/Databases/MySQL/MaterializeMetadata.h
index 079786c261c..1b933fdd373 100644
--- a/src/Databases/MySQL/MaterializeMetadata.h
+++ b/src/Databases/MySQL/MaterializeMetadata.h
@@ -6,7 +6,7 @@
 
 #if USE_MYSQL
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MySQL/MySQLReplication.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/PoolWithFailover.h>
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index cd667903113..d7f62208c2f 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -25,8 +25,8 @@
 #    include <Storages/StorageMergeTree.h>
 #    include <Common/quoteString.h>
 #    include <Common/setThreadName.h>
-#    include <common/sleep.h>
-#    include <common/bit_cast.h>
+#    include <base/sleep.h>
+#    include <base/bit_cast.h>
 
 namespace DB
 {
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
index 8fb75473d15..d5032cf85a8 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
@@ -5,7 +5,7 @@
 #include <Storages/PostgreSQL/StorageMaterializedPostgreSQL.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Macros.h>
 #include <Core/UUID.h>
 #include <DataTypes/DataTypeNullable.h>
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index 9d6db555882..4fbbe4ac2f9 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -2,7 +2,7 @@
 
 #if USE_SQLITE
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Databases/SQLite/fetchSQLiteTableStructure.h>
diff --git a/src/Databases/SQLite/SQLiteUtils.cpp b/src/Databases/SQLite/SQLiteUtils.cpp
index 3046eea0b56..954576d9c05 100644
--- a/src/Databases/SQLite/SQLiteUtils.cpp
+++ b/src/Databases/SQLite/SQLiteUtils.cpp
@@ -1,7 +1,7 @@
 #include "SQLiteUtils.h"
 
 #if USE_SQLITE
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
diff --git a/src/Databases/TablesLoader.cpp b/src/Databases/TablesLoader.cpp
index 48d751b5795..cd0e0609c15 100644
--- a/src/Databases/TablesLoader.cpp
+++ b/src/Databases/TablesLoader.cpp
@@ -4,7 +4,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ThreadPool.h>
 #include <numeric>
 
diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index bbf596ba55a..7683f9d4244 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -1,7 +1,7 @@
 #include "CacheDictionary.h"
 
 #include <memory>
-#include <common/chrono_io.h>
+#include <base/chrono_io.h>
 
 #include <Core/Defines.h>
 #include <Common/CurrentMetrics.h>
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 0e2a2699c45..8b3b4dbd30f 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -10,7 +10,7 @@
 
 #include <pcg_random.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/randomSeed.h>
 #include <Common/ThreadPool.h>
diff --git a/src/Dictionaries/CassandraDictionarySource.cpp b/src/Dictionaries/CassandraDictionarySource.cpp
index d9a4dd0fd22..2ff349043ff 100644
--- a/src/Dictionaries/CassandraDictionarySource.cpp
+++ b/src/Dictionaries/CassandraDictionarySource.cpp
@@ -36,7 +36,7 @@ void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
 
 #if USE_CASSANDRA
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/SipHash.h>
 #include <IO/WriteHelpers.h>
 #include <Dictionaries/CassandraSource.h>
diff --git a/src/Dictionaries/CassandraHelpers.cpp b/src/Dictionaries/CassandraHelpers.cpp
index 81f7d6d9a63..a33ab288a34 100644
--- a/src/Dictionaries/CassandraHelpers.cpp
+++ b/src/Dictionaries/CassandraHelpers.cpp
@@ -2,7 +2,7 @@
 
 #if USE_CASSANDRA
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <mutex>
 
 namespace DB
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index 806511248a3..b563ac797c0 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -11,7 +11,7 @@
 #include <Interpreters/Session.h>
 #include <Interpreters/executeQuery.h>
 #include <Common/isLocalAddress.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "ExternalQueryBuilder.h"
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index 4cab42c9445..9b7fbbf7c68 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -5,7 +5,7 @@
 #include "DictionaryStructure.h"
 #include "getDictionaryConfigurationFromAST.h"
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Dictionaries/DictionarySourceFactory.cpp b/src/Dictionaries/DictionarySourceFactory.cpp
index 80b60f29e37..937f246a6da 100644
--- a/src/Dictionaries/DictionarySourceFactory.cpp
+++ b/src/Dictionaries/DictionarySourceFactory.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DictionaryStructure.h"
 
 namespace DB
diff --git a/src/Dictionaries/DictionarySourceHelpers.h b/src/Dictionaries/DictionarySourceHelpers.h
index 5470321745a..39c6e7b3c42 100644
--- a/src/Dictionaries/DictionarySourceHelpers.h
+++ b/src/Dictionaries/DictionarySourceHelpers.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Processors/ISimpleTransform.h>
 #include <Columns/IColumn.h>
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 6daba422e92..4de00ddd259 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -11,7 +11,7 @@
 #include <IO/ReadBufferFromString.h>
 #include <DataTypes/IDataType.h>
 #include <Interpreters/IExternalLoadable.h>
-#include <common/EnumReflection.h>
+#include <base/EnumReflection.h>
 #include <Core/TypeId.h>
 
 #if defined(__GNUC__)
diff --git a/src/Dictionaries/Embedded/GeodataProviders/Types.h b/src/Dictionaries/Embedded/GeodataProviders/Types.h
index 5f291ee7abd..e63f6bae716 100644
--- a/src/Dictionaries/Embedded/GeodataProviders/Types.h
+++ b/src/Dictionaries/Embedded/GeodataProviders/Types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 using RegionID = UInt32;
diff --git a/src/Dictionaries/Embedded/RegionsHierarchies.cpp b/src/Dictionaries/Embedded/RegionsHierarchies.cpp
index 15e14db4664..15a7017e5f4 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchies.cpp
+++ b/src/Dictionaries/Embedded/RegionsHierarchies.cpp
@@ -1,7 +1,7 @@
 #include "RegionsHierarchies.h"
 
 #include <Poco/DirectoryIterator.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 RegionsHierarchies::RegionsHierarchies(IRegionsHierarchiesDataProviderPtr data_provider)
diff --git a/src/Dictionaries/Embedded/RegionsHierarchy.cpp b/src/Dictionaries/Embedded/RegionsHierarchy.cpp
index 115ae30d93e..1b8ac126f69 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchy.cpp
+++ b/src/Dictionaries/Embedded/RegionsHierarchy.cpp
@@ -3,7 +3,7 @@
 #include <IO/WriteHelpers.h>
 #include <Poco/Exception.h>
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "GeodataProviders/IHierarchiesProvider.h"
 
 
diff --git a/src/Dictionaries/Embedded/RegionsHierarchy.h b/src/Dictionaries/Embedded/RegionsHierarchy.h
index 7f42a76ecc2..45d6c5246ca 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchy.h
+++ b/src/Dictionaries/Embedded/RegionsHierarchy.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <boost/noncopyable.hpp>
-#include <common/types.h>
+#include <base/types.h>
 #include "GeodataProviders/IHierarchiesProvider.h"
 #include <Core/Defines.h>
 
diff --git a/src/Dictionaries/Embedded/RegionsNames.cpp b/src/Dictionaries/Embedded/RegionsNames.cpp
index 30ba8259b3e..61cbd7d97e1 100644
--- a/src/Dictionaries/Embedded/RegionsNames.cpp
+++ b/src/Dictionaries/Embedded/RegionsNames.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Poco/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "GeodataProviders/INamesProvider.h"
 
 
diff --git a/src/Dictionaries/Embedded/RegionsNames.h b/src/Dictionaries/Embedded/RegionsNames.h
index 91830490325..ff60c274401 100644
--- a/src/Dictionaries/Embedded/RegionsNames.h
+++ b/src/Dictionaries/Embedded/RegionsNames.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 #include <Poco/Exception.h>
-#include <common/StringRef.h>
-#include <common/types.h>
+#include <base/StringRef.h>
+#include <base/types.h>
 #include "GeodataProviders/INamesProvider.h"
 
 
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index 0a6708416a3..58aab562cde 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -1,7 +1,7 @@
 #include "ExecutableDictionarySource.h"
 
-#include <common/logger_useful.h>
-#include <common/LocalDateTime.h>
+#include <base/logger_useful.h>
+#include <base/LocalDateTime.h>
 #include <Common/ShellCommand.h>
 
 #include <DataStreams/ShellCommandSource.h>
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index 5b20deceb28..a7ffc8bebcb 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Core/Block.h>
 #include <Interpreters/Context.h>
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index c5ae4803fd4..c7859aab9bd 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -1,7 +1,7 @@
 #include "ExecutablePoolDictionarySource.h"
 
-#include <common/logger_useful.h>
-#include <common/LocalDateTime.h>
+#include <base/logger_useful.h>
+#include <base/LocalDateTime.h>
 #include <Common/ShellCommand.h>
 
 #include <DataStreams/formatBlock.h>
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
index 2ccb4ce4b8d..b7e8468b815 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.h
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Core/Block.h>
 #include <Interpreters/Context.h>
diff --git a/src/Dictionaries/FileDictionarySource.cpp b/src/Dictionaries/FileDictionarySource.cpp
index 5a77dc02673..11c5760660b 100644
--- a/src/Dictionaries/FileDictionarySource.cpp
+++ b/src/Dictionaries/FileDictionarySource.cpp
@@ -1,5 +1,5 @@
 #include "FileDictionarySource.h"
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/filesystemHelpers.h>
 #include <DataStreams/OwningBlockInputStream.h>
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index b5cf59b4474..f73ebe028a7 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -12,7 +12,7 @@
 #include <Processors/Formats/IInputFormat.h>
 #include <Interpreters/Context.h>
 #include <Poco/Net/HTTPRequest.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionarySourceHelpers.h"
 #include "DictionaryStructure.h"
diff --git a/src/Dictionaries/HTTPDictionarySource.h b/src/Dictionaries/HTTPDictionarySource.h
index e4a76627d08..35fbabecf2a 100644
--- a/src/Dictionaries/HTTPDictionarySource.h
+++ b/src/Dictionaries/HTTPDictionarySource.h
@@ -4,7 +4,7 @@
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/URI.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 #include "DictionaryStructure.h"
 #include "IDictionarySource.h"
 #include <Interpreters/Context.h>
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.h b/src/Dictionaries/HierarchyDictionariesUtils.h
index 44382f4720f..f0c6b4b1a0f 100644
--- a/src/Dictionaries/HierarchyDictionariesUtils.h
+++ b/src/Dictionaries/HierarchyDictionariesUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/PODArray.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashSet.h>
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 6514ecd9e3e..c37f90c50c6 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -10,9 +10,9 @@
 #include <DataTypes/DataTypesDecimal.h>
 #include <Poco/ByteOrder.h>
 #include <Common/formatIPv6.h>
-#include <common/itoa.h>
-#include <common/map.h>
-#include <common/range.h>
+#include <base/itoa.h>
+#include <base/map.h>
+#include <base/range.h>
 #include <Dictionaries/DictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index 4aba70dd14f..2103c702493 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -10,8 +10,8 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnVector.h>
 #include <Poco/Net/IPAddress.h>
-#include <common/StringRef.h>
-#include <common/logger_useful.h>
+#include <base/StringRef.h>
+#include <base/logger_useful.h>
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
index 74da196bc73..551bb1ee2dd 100644
--- a/src/Dictionaries/LibraryDictionarySource.cpp
+++ b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -2,7 +2,7 @@
 
 #include <DataStreams/OneBlockInputStream.h>
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/filesystemHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Dictionaries/LibraryDictionarySource.h b/src/Dictionaries/LibraryDictionarySource.h
index caf907afc22..e1cb01c0a14 100644
--- a/src/Dictionaries/LibraryDictionarySource.h
+++ b/src/Dictionaries/LibraryDictionarySource.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Bridge/LibraryBridgeHelper.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 #include <Core/UUID.h>
 #include "DictionaryStructure.h"
 #include <Core/ExternalResultDescription.h>
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index b811a50121b..21c69b71b67 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -52,7 +52,7 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
 
 }
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/MongoDB/Array.h>
 #include <Poco/MongoDB/Connection.h>
 #include <Poco/MongoDB/Cursor.h>
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index 5779ddc7c88..5fabe9cf287 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -95,8 +95,8 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 #    include <DataTypes/DataTypeString.h>
 #    include <IO/WriteBufferFromString.h>
 #    include <IO/WriteHelpers.h>
-#    include <common/LocalDateTime.h>
-#    include <common/logger_useful.h>
+#    include <base/LocalDateTime.h>
+#    include <base/logger_useful.h>
 #    include "readInvalidateQuery.h"
 #    include <mysqlxx/Exception.h>
 #    include <Core/Settings.h>
diff --git a/src/Dictionaries/MySQLDictionarySource.h b/src/Dictionaries/MySQLDictionarySource.h
index 66c3f216e07..fa26c2b162a 100644
--- a/src/Dictionaries/MySQLDictionarySource.h
+++ b/src/Dictionaries/MySQLDictionarySource.h
@@ -7,7 +7,7 @@
 #endif
 
 #if USE_MYSQL
-#    include <common/LocalDateTime.h>
+#    include <base/LocalDateTime.h>
 #    include <mysqlxx/PoolWithFailover.h>
 #    include "DictionaryStructure.h"
 #    include "ExternalQueryBuilder.h"
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.cpp b/src/Dictionaries/PolygonDictionaryImplementations.cpp
index 72869ad57ba..bd09e9df073 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.cpp
+++ b/src/Dictionaries/PolygonDictionaryImplementations.cpp
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <numeric>
 
diff --git a/src/Dictionaries/PolygonDictionaryUtils.cpp b/src/Dictionaries/PolygonDictionaryUtils.cpp
index 2575affbb56..fced18a6f88 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.cpp
+++ b/src/Dictionaries/PolygonDictionaryUtils.cpp
@@ -2,7 +2,7 @@
 
 #include <Common/ThreadPool.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <algorithm>
 #include <thread>
diff --git a/src/Dictionaries/PolygonDictionaryUtils.h b/src/Dictionaries/PolygonDictionaryUtils.h
index 865d78a7cad..0aca7cd8af0 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.h
+++ b/src/Dictionaries/PolygonDictionaryUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ThreadPool.h>
 #include <Poco/Logger.h>
 
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.h b/src/Dictionaries/PostgreSQLDictionarySource.h
index c5ade4d259a..d5ae025ea80 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.h
+++ b/src/Dictionaries/PostgreSQLDictionarySource.h
@@ -9,8 +9,8 @@
 #if USE_LIBPQXX
 #include "ExternalQueryBuilder.h"
 #include <Core/Block.h>
-#include <common/LocalDateTime.h>
-#include <common/logger_useful.h>
+#include <base/LocalDateTime.h>
+#include <base/logger_useful.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
 
 
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
index e584b523376..ffe0694d8c4 100644
--- a/src/Dictionaries/SSDCacheDictionaryStorage.h
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -11,7 +11,7 @@
 #include <absl/container/flat_hash_map.h>
 #include <absl/container/flat_hash_set.h>
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Common/randomSeed.h>
 #include <Common/Arena.h>
 #include <Common/ArenaWithFreeLists.h>
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 3fffe82c9d5..12831b7a970 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -11,8 +11,8 @@
 #include <Interpreters/Context.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/LocalDateTime.h>
-#include <common/logger_useful.h>
+#include <base/LocalDateTime.h>
+#include <base/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "readInvalidateQuery.h"
diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index 2b16228b59e..8542a43e202 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -8,7 +8,7 @@
 #include <Parsers/parseQuery.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Common/tests/gtest_global_context.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/Disks/DiskCacheWrapper.h b/src/Disks/DiskCacheWrapper.h
index e2f88616bce..3c8a470d5ca 100644
--- a/src/Disks/DiskCacheWrapper.h
+++ b/src/Disks/DiskCacheWrapper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <unordered_map>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DiskDecorator.h"
 #include "DiskLocal.h"
 
diff --git a/src/Disks/DiskFactory.h b/src/Disks/DiskFactory.h
index 7fcac8928c8..998ef569ed5 100644
--- a/src/Disks/DiskFactory.h
+++ b/src/Disks/DiskFactory.h
@@ -2,7 +2,7 @@
 
 #include <Disks/IDisk.h>
 #include <Interpreters/Context_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <boost/noncopyable.hpp>
 #include <Poco/Util/AbstractConfiguration.h>
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index 145211a83e9..02550b3b79c 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
diff --git a/src/Disks/DiskRestartProxy.h b/src/Disks/DiskRestartProxy.h
index 6c21b738805..f42594a9239 100644
--- a/src/Disks/DiskRestartProxy.h
+++ b/src/Disks/DiskRestartProxy.h
@@ -2,7 +2,7 @@
 
 #include "DiskDecorator.h"
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <shared_mutex>
 
 namespace DB
diff --git a/src/Disks/DiskSelector.cpp b/src/Disks/DiskSelector.cpp
index bc7810479c5..5c117c1b69d 100644
--- a/src/Disks/DiskSelector.cpp
+++ b/src/Disks/DiskSelector.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteHelpers.h>
 #include <Common/escapeForFileName.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Interpreters/Context.h>
 
 #include <set>
diff --git a/src/Disks/DiskType.h b/src/Disks/DiskType.h
index b54d356f316..42d87b2381f 100644
--- a/src/Disks/DiskType.h
+++ b/src/Disks/DiskType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 9d7988ddfc3..347ece5a78d 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -1,6 +1,6 @@
 #include "DiskWebServer.h"
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/escapeForFileName.h>
 
 #include <Disks/IDiskRemote.h>
diff --git a/src/Disks/HDFS/DiskHDFS.cpp b/src/Disks/HDFS/DiskHDFS.cpp
index 5b15ee69cb8..e866361e8fe 100644
--- a/src/Disks/HDFS/DiskHDFS.cpp
+++ b/src/Disks/HDFS/DiskHDFS.cpp
@@ -5,7 +5,7 @@
 #include <IO/SeekAvoidingReadBuffer.h>
 #include <Disks/ReadIndirectBufferFromRemoteFS.h>
 #include <Disks/WriteIndirectBufferFromRemoteFS.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Disks/IDisk.cpp b/src/Disks/IDisk.cpp
index df0f921389f..42d5f5fce10 100644
--- a/src/Disks/IDisk.cpp
+++ b/src/Disks/IDisk.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/copyData.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/setThreadName.h>
 
 namespace DB
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index db07987572b..925a0316273 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -3,7 +3,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/Context.h>
 #include <Core/Defines.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Disks/Executor.h>
diff --git a/src/Disks/IDiskRemote.cpp b/src/Disks/IDiskRemote.cpp
index b9bce147cfd..1a6e4eb73a1 100644
--- a/src/Disks/IDiskRemote.cpp
+++ b/src/Disks/IDiskRemote.cpp
@@ -8,7 +8,7 @@
 #include <IO/WriteHelpers.h>
 #include <Common/createHardLink.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/checkStackSize.h>
 #include <boost/algorithm/string.hpp>
 #include <Common/filesystemHelpers.h>
diff --git a/src/Disks/IStoragePolicy.h b/src/Disks/IStoragePolicy.h
index f113cf5f120..8c6d56bdcfd 100644
--- a/src/Disks/IStoragePolicy.h
+++ b/src/Disks/IStoragePolicy.h
@@ -4,7 +4,7 @@
 
 #include <memory>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Disks/ReadIndirectBufferFromWebServer.cpp b/src/Disks/ReadIndirectBufferFromWebServer.cpp
index 809e6d67107..f4c01784542 100644
--- a/src/Disks/ReadIndirectBufferFromWebServer.cpp
+++ b/src/Disks/ReadIndirectBufferFromWebServer.cpp
@@ -1,7 +1,7 @@
 #include "ReadIndirectBufferFromWebServer.h"
 
-#include <common/logger_useful.h>
-#include <common/sleep.h>
+#include <base/logger_useful.h>
+#include <base/sleep.h>
 #include <Core/Types.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/ConnectionTimeoutsContext.h>
diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
index 30cd314702b..e30b4ce0c27 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <common/unit.h>
+#include <base/unit.h>
 
 #include <Common/checkStackSize.h>
 #include <Common/createHardLink.h>
diff --git a/src/Disks/S3/DiskS3.h b/src/Disks/S3/DiskS3.h
index e2141b6196e..3ef1db43742 100644
--- a/src/Disks/S3/DiskS3.h
+++ b/src/Disks/S3/DiskS3.h
@@ -8,7 +8,7 @@
 
 #include <atomic>
 #include <optional>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "Disks/DiskFactory.h"
 #include "Disks/Executor.h"
 
diff --git a/src/Disks/S3/ProxyConfiguration.h b/src/Disks/S3/ProxyConfiguration.h
index 793170e727c..2e4e5bec89a 100644
--- a/src/Disks/S3/ProxyConfiguration.h
+++ b/src/Disks/S3/ProxyConfiguration.h
@@ -7,7 +7,7 @@
 #if USE_AWS_S3
 
 #include <utility>
-#include <common/types.h>
+#include <base/types.h>
 #include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
 #include <Poco/URI.h>
 
diff --git a/src/Disks/S3/ProxyListConfiguration.cpp b/src/Disks/S3/ProxyListConfiguration.cpp
index 4e058f49fbf..4c7a42f8fb9 100644
--- a/src/Disks/S3/ProxyListConfiguration.cpp
+++ b/src/Disks/S3/ProxyListConfiguration.cpp
@@ -3,7 +3,7 @@
 #if USE_AWS_S3
 
 #include <utility>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB::S3
 {
diff --git a/src/Disks/S3/ProxyResolverConfiguration.cpp b/src/Disks/S3/ProxyResolverConfiguration.cpp
index 17dd19fe444..0fc7a9a1fa8 100644
--- a/src/Disks/S3/ProxyResolverConfiguration.cpp
+++ b/src/Disks/S3/ProxyResolverConfiguration.cpp
@@ -7,7 +7,7 @@
 #include "Poco/StreamCopier.h"
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB::ErrorCodes
 {
diff --git a/src/Disks/S3/registerDiskS3.cpp b/src/Disks/S3/registerDiskS3.cpp
index decf454d257..0946c8875d3 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/S3/registerDiskS3.cpp
@@ -2,7 +2,7 @@
     #include <Common/config.h>
 #endif
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
diff --git a/src/Disks/StoragePolicy.h b/src/Disks/StoragePolicy.h
index 6676ab19043..b09baf09bda 100644
--- a/src/Disks/StoragePolicy.h
+++ b/src/Disks/StoragePolicy.h
@@ -11,7 +11,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <memory>
 #include <mutex>
diff --git a/src/Disks/VolumeJBOD.cpp b/src/Disks/VolumeJBOD.cpp
index e5905f77db3..ff4975d63ef 100644
--- a/src/Disks/VolumeJBOD.cpp
+++ b/src/Disks/VolumeJBOD.cpp
@@ -3,7 +3,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/formatReadable.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 7ff72387509..0fcb8d042c7 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -5,7 +5,7 @@
 #include <Formats/FormatSettings.h>
 #include <Interpreters/Context_fwd.h>
 #include <IO/BufferWithOwnMemory.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/src/Formats/FormatSchemaInfo.h b/src/Formats/FormatSchemaInfo.h
index 67f1baca84b..cb041e02116 100644
--- a/src/Formats/FormatSchemaInfo.h
+++ b/src/Formats/FormatSchemaInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index 3a274f99a5c..8c894c77e82 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Formats/JSONEachRowUtils.cpp b/src/Formats/JSONEachRowUtils.cpp
index 5637d7eb6dd..b918825df79 100644
--- a/src/Formats/JSONEachRowUtils.cpp
+++ b/src/Formats/JSONEachRowUtils.cpp
@@ -1,5 +1,5 @@
 #include <IO/ReadHelpers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Formats/MySQLSource.cpp b/src/Formats/MySQLSource.cpp
index e6cb9f5ff11..069aa0cb56b 100644
--- a/src/Formats/MySQLSource.cpp
+++ b/src/Formats/MySQLSource.cpp
@@ -17,8 +17,8 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
-#include <common/logger_useful.h>
+#include <base/range.h>
+#include <base/logger_useful.h>
 #include "MySQLSource.h"
 
 
diff --git a/src/Formats/ParsedTemplateFormatString.h b/src/Formats/ParsedTemplateFormatString.h
index f2e801faeab..4021b71656f 100644
--- a/src/Formats/ParsedTemplateFormatString.h
+++ b/src/Formats/ParsedTemplateFormatString.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <functional>
 #include <optional>
 #include <vector>
diff --git a/src/Formats/ProtobufSchemas.h b/src/Formats/ProtobufSchemas.h
index 05778a85343..f911cb2ce4b 100644
--- a/src/Formats/ProtobufSchemas.h
+++ b/src/Formats/ProtobufSchemas.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <unordered_map>
-#include <common/types.h>
+#include <base/types.h>
 #include <boost/noncopyable.hpp>
 
 
diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp
index baeefa8f98e..ac89203c6e0 100644
--- a/src/Formats/ProtobufSerializer.cpp
+++ b/src/Formats/ProtobufSerializer.cpp
@@ -32,7 +32,7 @@
 #   include <IO/ReadHelpers.h>
 #   include <IO/WriteBufferFromString.h>
 #   include <IO/WriteHelpers.h>
-#   include <common/range.h>
+#   include <base/range.h>
 #   include <google/protobuf/descriptor.h>
 #   include <google/protobuf/descriptor.pb.h>
 #   include <boost/algorithm/string.hpp>
@@ -41,7 +41,7 @@
 #   include <boost/numeric/conversion/cast.hpp>
 #   include <boost/range/algorithm.hpp>
 #   include <boost/range/algorithm_ext/erase.hpp>
-#   include <common/logger_useful.h>
+#   include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index bb9856096a9..218dcd083eb 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -2,14 +2,14 @@
 
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsNumber.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/DecimalFunctions.h>
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Functions/IFunction.h>
 #include <Common/Exception.h>
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 
 /// The default mode value to use for the WEEK() function
 #define DEFAULT_WEEK_MODE 0
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 1891410a18e..15a08c4e76d 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/DecimalFunctions.h>
 #include <Common/Exception.h>
-#include <common/DateLUTImpl.h>
-#include <common/DateLUT.h>
+#include <base/DateLUTImpl.h>
+#include <base/DateLUT.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Functions/DummyJSONParser.h b/src/Functions/DummyJSONParser.h
index 01fdab1abb6..c14aacece86 100644
--- a/src/Functions/DummyJSONParser.h
+++ b/src/Functions/DummyJSONParser.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 4eef807c588..f3f1956c01c 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -5,7 +5,7 @@
 // sanitizer/asan_interface.h
 #include <memory>
 #include <type_traits>
-#include <common/wide_integer_to_string.h>
+#include <base/wide_integer_to_string.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -36,7 +36,7 @@
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/TypeList.h>
-#include <common/map.h>
+#include <base/map.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
diff --git a/src/Functions/FunctionBitTestMany.h b/src/Functions/FunctionBitTestMany.h
index 21ff1bc9846..808c3711631 100644
--- a/src/Functions/FunctionBitTestMany.h
+++ b/src/Functions/FunctionBitTestMany.h
@@ -5,7 +5,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index 2721a56fe8b..af34f27d6b8 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDate32.h>
diff --git a/src/Functions/FunctionFQDN.cpp b/src/Functions/FunctionFQDN.cpp
index 9024167f13c..7385de807a1 100644
--- a/src/Functions/FunctionFQDN.cpp
+++ b/src/Functions/FunctionFQDN.cpp
@@ -1,7 +1,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Core/Field.h>
 
 
diff --git a/src/Functions/FunctionNumericPredicate.h b/src/Functions/FunctionNumericPredicate.h
index 9613e97096b..9d98f0c929d 100644
--- a/src/Functions/FunctionNumericPredicate.h
+++ b/src/Functions/FunctionNumericPredicate.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 #include <Interpreters/Context_fwd.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionSQLJSON.h b/src/Functions/FunctionSQLJSON.h
index a9f030d1eee..d59ead2ebf5 100644
--- a/src/Functions/FunctionSQLJSON.h
+++ b/src/Functions/FunctionSQLJSON.h
@@ -18,7 +18,7 @@
 #include <Interpreters/Context.h>
 #include <Parsers/IParser.h>
 #include <Parsers/Lexer.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_functions.h"
diff --git a/src/Functions/FunctionSnowflake.h b/src/Functions/FunctionSnowflake.h
index 95d02de3a2b..1ba15433e94 100644
--- a/src/Functions/FunctionSnowflake.h
+++ b/src/Functions/FunctionSnowflake.h
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index 2e631ea22f0..8c507077acd 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index cccf42e470c..7697d86dc34 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -29,7 +29,7 @@
 
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <type_traits>
 
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 397e77d522b..0e9f54229a5 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -45,8 +45,8 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/TargetSpecific.h>
 #include <Functions/PerformanceAdaptors.h>
-#include <common/range.h>
-#include <common/bit_cast.h>
+#include <base/range.h>
+#include <base/bit_cast.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
index b3b34c9b352..ca44a229b71 100644
--- a/src/Functions/FunctionsJSON.h
+++ b/src/Functions/FunctionsJSON.h
@@ -32,7 +32,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <type_traits>
 #include <boost/tti/has_member_function.hpp>
 
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index 84b12fcb21d..3ddf7ea84eb 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Defines.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index 0bbb8ade939..e082cfbec2f 100644
--- a/src/Functions/FunctionsMultiStringFuzzySearch.h
+++ b/src/Functions/FunctionsMultiStringFuzzySearch.h
@@ -13,7 +13,7 @@
 #include <Functions/hyperscanRegexpChecker.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #include <optional>
 
diff --git a/src/Functions/FunctionsMultiStringPosition.h b/src/Functions/FunctionsMultiStringPosition.h
index 1961f98f70a..357606f4042 100644
--- a/src/Functions/FunctionsMultiStringPosition.h
+++ b/src/Functions/FunctionsMultiStringPosition.h
@@ -12,7 +12,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionsMultiStringSearch.h b/src/Functions/FunctionsMultiStringSearch.h
index 4576979681b..4bc8af3f214 100644
--- a/src/Functions/FunctionsMultiStringSearch.h
+++ b/src/Functions/FunctionsMultiStringSearch.h
@@ -13,7 +13,7 @@
 #include <Functions/hyperscanRegexpChecker.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionsRandom.cpp b/src/Functions/FunctionsRandom.cpp
index 9436ce0f5e2..96c41225242 100644
--- a/src/Functions/FunctionsRandom.cpp
+++ b/src/Functions/FunctionsRandom.cpp
@@ -3,7 +3,7 @@
 #include <Functions/VectorExtension.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/randomSeed.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #if USE_MULTITARGET_CODE
 #  include <x86intrin.h>
 #endif
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index 0f5fc020934..edba82a5b4e 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -16,7 +16,7 @@
 #include <cmath>
 #include <type_traits>
 #include <array>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <algorithm>
 
 #ifdef __SSE4_1__
diff --git a/src/Functions/FunctionsStringHash.cpp b/src/Functions/FunctionsStringHash.cpp
index e5ed5dc77c0..c9ad8285485 100644
--- a/src/Functions/FunctionsStringHash.cpp
+++ b/src/Functions/FunctionsStringHash.cpp
@@ -10,7 +10,7 @@
 #include <functional>
 #include <tuple>
 #include <vector>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <city.h>
 
diff --git a/src/Functions/FunctionsStringSearchToString.h b/src/Functions/FunctionsStringSearchToString.h
index b8fcac2206e..6d2d5efdb3d 100644
--- a/src/Functions/FunctionsStringSearchToString.h
+++ b/src/Functions/FunctionsStringSearchToString.h
@@ -12,7 +12,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionsStringSimilarity.cpp b/src/Functions/FunctionsStringSimilarity.cpp
index 10fcfc40ba8..a8cf6a5cf38 100644
--- a/src/Functions/FunctionsStringSimilarity.cpp
+++ b/src/Functions/FunctionsStringSimilarity.cpp
@@ -7,7 +7,7 @@
 
 #include <Core/Defines.h>
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <algorithm>
 #include <climits>
diff --git a/src/Functions/GCDLCMImpl.h b/src/Functions/GCDLCMImpl.h
index 722dacfe2f1..555a67fd462 100644
--- a/src/Functions/GCDLCMImpl.h
+++ b/src/Functions/GCDLCMImpl.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/NumberTraits.h>
 #include <Common/Exception.h>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 #include <limits>
 #include <type_traits>
 
diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index e452c8a5418..fc54eaf88ab 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/FieldVisitorConvertToNumber.h>
 #include "Sources.h"
 #include "Sinks.h"
 #include <Core/AccurateComparison.h>
-#include <common/range.h>
+#include <base/range.h>
 #include "GatherUtils.h"
 
 
diff --git a/src/Functions/GeoHash.h b/src/Functions/GeoHash.h
index f918602d473..d97eda31cef 100644
--- a/src/Functions/GeoHash.h
+++ b/src/Functions/GeoHash.h
@@ -2,7 +2,7 @@
 
 #include <map>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Functions/GregorianDate.h b/src/Functions/GregorianDate.h
index 765e8cc2aa3..b44b6c0dd13 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 #include <Common/Exception.h>
 #include <Core/Types.h>
 #include <IO/ReadBuffer.h>
diff --git a/src/Functions/LeastGreatestGeneric.h b/src/Functions/LeastGreatestGeneric.h
index df44ff87762..128243a2661 100644
--- a/src/Functions/LeastGreatestGeneric.h
+++ b/src/Functions/LeastGreatestGeneric.h
@@ -6,7 +6,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index 4c8db97aded..d71a5a1ffe3 100644
--- a/src/Functions/MatchImpl.h
+++ b/src/Functions/MatchImpl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <type_traits>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Volnitsky.h>
 #include <Columns/ColumnString.h>
 #include "Regexps.h"
diff --git a/src/Functions/MultiMatchAllIndicesImpl.h b/src/Functions/MultiMatchAllIndicesImpl.h
index 922ec7cf06b..6c652d32786 100644
--- a/src/Functions/MultiMatchAllIndicesImpl.h
+++ b/src/Functions/MultiMatchAllIndicesImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include "Regexps.h"
diff --git a/src/Functions/MultiMatchAnyImpl.h b/src/Functions/MultiMatchAnyImpl.h
index e2e54887a32..44a65024864 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include "Regexps.h"
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index a050de2edb6..6cf4a46ca58 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Defines.h>
 #include <Core/TypeListNumber.h>
 #include <Columns/IColumn.h>
@@ -8,7 +8,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
 #include <Common/SipHash.h>
-#include <common/range.h>
+#include <base/range.h>
 
 /// Warning in boost::geometry during template strategy substitution.
 #pragma GCC diagnostic push
diff --git a/src/Functions/RapidJSONParser.h b/src/Functions/RapidJSONParser.h
index 992480d64f7..f864c18ed2b 100644
--- a/src/Functions/RapidJSONParser.h
+++ b/src/Functions/RapidJSONParser.h
@@ -5,8 +5,8 @@
 #endif
 
 #if USE_RAPIDJSON
-#    include <common/types.h>
-#    include <common/defines.h>
+#    include <base/types.h>
+#    include <base/defines.h>
 #    include <rapidjson/document.h>
 
 
diff --git a/src/Functions/Regexps.h b/src/Functions/Regexps.h
index d95e29926e9..c18b00088e6 100644
--- a/src/Functions/Regexps.h
+++ b/src/Functions/Regexps.h
@@ -12,7 +12,7 @@
 #include <Common/ObjectPool.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/ProfileEvents.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_functions.h"
diff --git a/src/Functions/ReplaceRegexpImpl.h b/src/Functions/ReplaceRegexpImpl.h
index 3e80dd5b337..9ba7e822bfe 100644
--- a/src/Functions/ReplaceRegexpImpl.h
+++ b/src/Functions/ReplaceRegexpImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Volnitsky.h>
 #include <Columns/ColumnString.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Functions/ReplaceStringImpl.h b/src/Functions/ReplaceStringImpl.h
index a120350d4c7..ab0e53d3c45 100644
--- a/src/Functions/ReplaceStringImpl.h
+++ b/src/Functions/ReplaceStringImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Volnitsky.h>
 #include <Columns/ColumnString.h>
 
diff --git a/src/Functions/SimdJSONParser.h b/src/Functions/SimdJSONParser.h
index c5793088baf..1be9ab32ab2 100644
--- a/src/Functions/SimdJSONParser.h
+++ b/src/Functions/SimdJSONParser.h
@@ -5,9 +5,9 @@
 #endif
 
 #if USE_SIMDJSON
-#    include <common/types.h>
+#    include <base/types.h>
 #    include <Common/Exception.h>
-#    include <common/defines.h>
+#    include <base/defines.h>
 #    include <simdjson.h>
 
 
diff --git a/src/Functions/TargetSpecific.h b/src/Functions/TargetSpecific.h
index f8e850dc36d..fa230a56fb7 100644
--- a/src/Functions/TargetSpecific.h
+++ b/src/Functions/TargetSpecific.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 /* This file contains macros and helpers for writing platform-dependent code.
  *
diff --git a/src/Functions/URL/ExtractFirstSignificantSubdomain.h b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
index 974574058e9..4f9b1ec3c6c 100644
--- a/src/Functions/URL/ExtractFirstSignificantSubdomain.h
+++ b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include "domain.h"
 #include "tldLookup.h"
 
diff --git a/src/Functions/URL/basename.cpp b/src/Functions/URL/basename.cpp
index 1d7a3a3bc61..f97724020cb 100644
--- a/src/Functions/URL/basename.cpp
+++ b/src/Functions/URL/basename.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include "FunctionsURL.h"
 
 namespace DB
diff --git a/src/Functions/URL/cutURLParameter.cpp b/src/Functions/URL/cutURLParameter.cpp
index f0103f42acd..2ff7c3e33d9 100644
--- a/src/Functions/URL/cutURLParameter.cpp
+++ b/src/Functions/URL/cutURLParameter.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsStringSearchToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/cutWWW.cpp b/src/Functions/URL/cutWWW.cpp
index 87c26b830f1..9b55b0929b0 100644
--- a/src/Functions/URL/cutWWW.cpp
+++ b/src/Functions/URL/cutWWW.cpp
@@ -1,7 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include "protocol.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/decodeURLComponent.cpp b/src/Functions/URL/decodeURLComponent.cpp
index 96cdcb64537..b6abaab515e 100644
--- a/src/Functions/URL/decodeURLComponent.cpp
+++ b/src/Functions/URL/decodeURLComponent.cpp
@@ -1,7 +1,7 @@
 #include <Common/hex.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/domain.h b/src/Functions/URL/domain.h
index dacb740a87d..d43be198043 100644
--- a/src/Functions/URL/domain.h
+++ b/src/Functions/URL/domain.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "protocol.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <cstring>
 #include <Common/StringUtils/StringUtils.h>
 
diff --git a/src/Functions/URL/extractURLParameter.cpp b/src/Functions/URL/extractURLParameter.cpp
index c6234c66fc0..983426ef0fc 100644
--- a/src/Functions/URL/extractURLParameter.cpp
+++ b/src/Functions/URL/extractURLParameter.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsStringSearchToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/fragment.h b/src/Functions/URL/fragment.h
index e60263e9245..6c11d0fbb34 100644
--- a/src/Functions/URL/fragment.h
+++ b/src/Functions/URL/fragment.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FunctionsURL.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/path.cpp b/src/Functions/URL/path.cpp
index 2260604c1fc..c3037956118 100644
--- a/src/Functions/URL/path.cpp
+++ b/src/Functions/URL/path.cpp
@@ -2,7 +2,7 @@
 #include <Functions/FunctionStringToString.h>
 #include "FunctionsURL.h"
 #include "path.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/path.h b/src/Functions/URL/path.h
index f2c5d31a0b0..89244659088 100644
--- a/src/Functions/URL/path.h
+++ b/src/Functions/URL/path.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Functions/URL/FunctionsURL.h>
 
 
diff --git a/src/Functions/URL/pathFull.cpp b/src/Functions/URL/pathFull.cpp
index 661fb298c04..f37c42e3753 100644
--- a/src/Functions/URL/pathFull.cpp
+++ b/src/Functions/URL/pathFull.cpp
@@ -2,7 +2,7 @@
 #include <Functions/FunctionStringToString.h>
 #include "FunctionsURL.h"
 #include "path.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/queryString.h b/src/Functions/URL/queryString.h
index fc6ba6c26af..a0777a5c9a1 100644
--- a/src/Functions/URL/queryString.h
+++ b/src/Functions/URL/queryString.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FunctionsURL.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/queryStringAndFragment.h b/src/Functions/URL/queryStringAndFragment.h
index b1d7291f0e5..ed19cd14b74 100644
--- a/src/Functions/URL/queryStringAndFragment.h
+++ b/src/Functions/URL/queryStringAndFragment.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FunctionsURL.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/VectorExtension.h b/src/Functions/VectorExtension.h
index bffc04a6024..cb4347e3031 100644
--- a/src/Functions/VectorExtension.h
+++ b/src/Functions/VectorExtension.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 // Contains types declarations and wrappers for GCC vector extension.
 
 namespace DB::VectorExtension
diff --git a/src/Functions/abtesting.h b/src/Functions/abtesting.h
index 0be41db0538..b1f12e79437 100644
--- a/src/Functions/abtesting.h
+++ b/src/Functions/abtesting.h
@@ -4,7 +4,7 @@
 
 #if !defined(ARCADIA_BUILD) && USE_STATS
 
-#    include <common/types.h>
+#    include <base/types.h>
 #    include <Common/PODArray.h>
 
 #    include <algorithm>
diff --git a/src/Functions/appendTrailingCharIfAbsent.cpp b/src/Functions/appendTrailingCharIfAbsent.cpp
index 2824a008928..698eeeed5f6 100644
--- a/src/Functions/appendTrailingCharIfAbsent.cpp
+++ b/src/Functions/appendTrailingCharIfAbsent.cpp
@@ -4,7 +4,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index dec673af727..da2304e1bb6 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -5,7 +5,7 @@
 #include <Columns/ColumnDecimal.h>
 #include "FunctionArrayMapped.h"
 #include <Functions/FunctionFactory.h>
-#include <common/defines.h>
+#include <base/defines.h>
 
 
 namespace DB
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index 50d069aaf02..0a8f289ab3f 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -7,7 +7,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index 17eb2b33bb6..c18caf16ee3 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -22,7 +22,7 @@
 #include <Common/assert_cast.h>
 #include <Core/TypeListNumber.h>
 #include <Interpreters/castColumn.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index 7ac6d21b3a8..affa8b9e0fc 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -11,7 +11,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index 67286b8b175..cdafb56a4db 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -13,7 +13,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
diff --git a/src/Functions/array/hasAllAny.h b/src/Functions/array/hasAllAny.h
index 44b191b6b23..cd55fea3521 100644
--- a/src/Functions/array/hasAllAny.h
+++ b/src/Functions/array/hasAllAny.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/range.h>
-#include <common/map.h>
+#include <base/range.h>
+#include <base/map.h>
 
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 1a10d7281e6..a5913105146 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include "Columns/ColumnMap.h"
 #include "DataTypes/DataTypeMap.h"
 
diff --git a/src/Functions/bitCount.cpp b/src/Functions/bitCount.cpp
index de6e9917647..84743ae24ed 100644
--- a/src/Functions/bitCount.cpp
+++ b/src/Functions/bitCount.cpp
@@ -1,4 +1,4 @@
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionUnaryArithmetic.h>
 
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index 526033183ec..cd83223de3e 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -9,8 +9,8 @@
 #include <Functions/GatherUtils/Sources.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 
 #include "formatString.h"
 
diff --git a/src/Functions/convertCharset.cpp b/src/Functions/convertCharset.cpp
index 228df14f9d9..184cf5d1b0e 100644
--- a/src/Functions/convertCharset.cpp
+++ b/src/Functions/convertCharset.cpp
@@ -12,7 +12,7 @@
 #    include <IO/WriteHelpers.h>
 #    include <Common/ObjectPool.h>
 #    include <Common/typeid_cast.h>
-#    include <common/range.h>
+#    include <base/range.h>
 
 #    include <memory>
 #    include <string>
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index a430b905e34..b632627fea9 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -14,7 +14,7 @@
 
 #include <IO/WriteHelpers.h>
 
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 #include <type_traits>
 
diff --git a/src/Functions/dateName.cpp b/src/Functions/dateName.cpp
index 0eb269b65e6..c8c86060265 100644
--- a/src/Functions/dateName.cpp
+++ b/src/Functions/dateName.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 
 #include <Core/DecimalFunctions.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Functions/decodeXMLComponent.cpp b/src/Functions/decodeXMLComponent.cpp
index 9b9cf5a081d..79af3024c09 100644
--- a/src/Functions/decodeXMLComponent.cpp
+++ b/src/Functions/decodeXMLComponent.cpp
@@ -3,7 +3,7 @@
 #include <Functions/FunctionStringToString.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/hex.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/demange.cpp b/src/Functions/demange.cpp
index 75849860347..0f50eb5e141 100644
--- a/src/Functions/demange.cpp
+++ b/src/Functions/demange.cpp
@@ -1,4 +1,4 @@
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/IFunction.h>
diff --git a/src/Functions/encodeXMLComponent.cpp b/src/Functions/encodeXMLComponent.cpp
index d839a3a9264..380d0da69ac 100644
--- a/src/Functions/encodeXMLComponent.cpp
+++ b/src/Functions/encodeXMLComponent.cpp
@@ -1,7 +1,7 @@
 #include <Columns/ColumnString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/exp10.cpp b/src/Functions/exp10.cpp
index 4be7e15562e..abd0755c245 100644
--- a/src/Functions/exp10.cpp
+++ b/src/Functions/exp10.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionMathUnary.h>
 #include <Functions/FunctionFactory.h>
-#include <common/preciseExp10.h>
+#include <base/preciseExp10.h>
 
 namespace DB
 {
diff --git a/src/Functions/extractTextFromHTML.cpp b/src/Functions/extractTextFromHTML.cpp
index 2a0ff5fb7e7..b38ea74d6ce 100644
--- a/src/Functions/extractTextFromHTML.cpp
+++ b/src/Functions/extractTextFromHTML.cpp
@@ -2,7 +2,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/StringUtils/StringUtils.h>
 
 
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.cpp b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
index 19c02ed2390..b14bc6f559b 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.cpp
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Columns/ColumnString.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 
 namespace DB
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index fdd9a27ee45..9bb2abcb2c7 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -14,8 +14,8 @@
 
 #include <IO/WriteHelpers.h>
 
-#include <common/DateLUTImpl.h>
-#include <common/find_symbols.h>
+#include <base/DateLUTImpl.h>
+#include <base/find_symbols.h>
 #include <Core/DecimalFunctions.h>
 
 #include <type_traits>
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index e4389fa45f6..20341cbe1dc 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -9,7 +9,7 @@
 #include <IO/WriteBufferFromVector.h>
 #include <IO/WriteHelpers.h>
 #include <Processors/Formats/IOutputFormat.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
diff --git a/src/Functions/formatString.cpp b/src/Functions/formatString.cpp
index fb0abce2518..e138c072639 100644
--- a/src/Functions/formatString.cpp
+++ b/src/Functions/formatString.cpp
@@ -5,7 +5,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <memory>
 #include <string>
diff --git a/src/Functions/formatString.h b/src/Functions/formatString.h
index bea4fa2e1bc..c72e7db9579 100644
--- a/src/Functions/formatString.h
+++ b/src/Functions/formatString.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Columns/ColumnString.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/memcpySmall.h>
diff --git a/src/Functions/fuzzBits.cpp b/src/Functions/fuzzBits.cpp
index 12065546238..eb2af22d1ab 100644
--- a/src/Functions/fuzzBits.cpp
+++ b/src/Functions/fuzzBits.cpp
@@ -6,7 +6,7 @@
 #include <Functions/IFunction.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 #include <memory>
 
diff --git a/src/Functions/geoToH3.cpp b/src/Functions/geoToH3.cpp
index c8ff01f7862..6dab079b484 100644
--- a/src/Functions/geoToH3.cpp
+++ b/src/Functions/geoToH3.cpp
@@ -11,7 +11,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/geoToS2.cpp b/src/Functions/geoToS2.cpp
index 4a9f46d3d71..15e395b68c4 100644
--- a/src/Functions/geoToS2.cpp
+++ b/src/Functions/geoToS2.cpp
@@ -9,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/geometryConverters.h b/src/Functions/geometryConverters.h
index 3e912cb42d7..644ed1960d0 100644
--- a/src/Functions/geometryConverters.h
+++ b/src/Functions/geometryConverters.h
@@ -18,7 +18,7 @@
 #include <Interpreters/castColumn.h>
 
 #include <cmath>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index d1778a357b1..1f7be1a6374 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -8,7 +8,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/TargetSpecific.h>
 #include <Functions/PerformanceAdaptors.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <cmath>
 
 
diff --git a/src/Functions/h3EdgeAngle.cpp b/src/Functions/h3EdgeAngle.cpp
index 4d9276f3d1f..6c29982bab1 100644
--- a/src/Functions/h3EdgeAngle.cpp
+++ b/src/Functions/h3EdgeAngle.cpp
@@ -10,7 +10,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
diff --git a/src/Functions/h3EdgeLengthM.cpp b/src/Functions/h3EdgeLengthM.cpp
index 5d6e0b5093c..abdc6827122 100644
--- a/src/Functions/h3EdgeLengthM.cpp
+++ b/src/Functions/h3EdgeLengthM.cpp
@@ -10,7 +10,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
diff --git a/src/Functions/h3GetBaseCell.cpp b/src/Functions/h3GetBaseCell.cpp
index 381e459f32e..a4ef21dae79 100644
--- a/src/Functions/h3GetBaseCell.cpp
+++ b/src/Functions/h3GetBaseCell.cpp
@@ -9,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/h3GetFaces.cpp b/src/Functions/h3GetFaces.cpp
index 1a1b7dd06ae..4052326495d 100644
--- a/src/Functions/h3GetFaces.cpp
+++ b/src/Functions/h3GetFaces.cpp
@@ -11,7 +11,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/h3GetResolution.cpp b/src/Functions/h3GetResolution.cpp
index cbcd54b1eb3..a212eee169e 100644
--- a/src/Functions/h3GetResolution.cpp
+++ b/src/Functions/h3GetResolution.cpp
@@ -9,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/h3HexAreaM2.cpp b/src/Functions/h3HexAreaM2.cpp
index c42e5b6f421..c85670adf35 100644
--- a/src/Functions/h3HexAreaM2.cpp
+++ b/src/Functions/h3HexAreaM2.cpp
@@ -10,7 +10,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
diff --git a/src/Functions/h3IndexesAreNeighbors.cpp b/src/Functions/h3IndexesAreNeighbors.cpp
index c04668a860f..b31fb194bc9 100644
--- a/src/Functions/h3IndexesAreNeighbors.cpp
+++ b/src/Functions/h3IndexesAreNeighbors.cpp
@@ -9,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/h3IsPentagon.cpp b/src/Functions/h3IsPentagon.cpp
index 2a7950cd18e..da1dee66b53 100644
--- a/src/Functions/h3IsPentagon.cpp
+++ b/src/Functions/h3IsPentagon.cpp
@@ -9,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/h3IsResClassIII.cpp b/src/Functions/h3IsResClassIII.cpp
index 25a2fc1952f..330f147bd2c 100644
--- a/src/Functions/h3IsResClassIII.cpp
+++ b/src/Functions/h3IsResClassIII.cpp
@@ -9,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/h3IsValid.cpp b/src/Functions/h3IsValid.cpp
index cce75561349..ff0dfabd777 100644
--- a/src/Functions/h3IsValid.cpp
+++ b/src/Functions/h3IsValid.cpp
@@ -9,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/h3ToChildren.cpp b/src/Functions/h3ToChildren.cpp
index c83af0ab38a..381dce373bc 100644
--- a/src/Functions/h3ToChildren.cpp
+++ b/src/Functions/h3ToChildren.cpp
@@ -12,7 +12,7 @@
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
diff --git a/src/Functions/h3ToParent.cpp b/src/Functions/h3ToParent.cpp
index fca4dc28372..230f8b4796c 100644
--- a/src/Functions/h3ToParent.cpp
+++ b/src/Functions/h3ToParent.cpp
@@ -10,7 +10,7 @@
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
diff --git a/src/Functions/h3kRing.cpp b/src/Functions/h3kRing.cpp
index 3a340d3b37a..80227b5e4e0 100644
--- a/src/Functions/h3kRing.cpp
+++ b/src/Functions/h3kRing.cpp
@@ -13,7 +13,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
diff --git a/src/Functions/hyperscanRegexpChecker.h b/src/Functions/hyperscanRegexpChecker.h
index f2988120899..1eea53722c1 100644
--- a/src/Functions/hyperscanRegexpChecker.h
+++ b/src/Functions/hyperscanRegexpChecker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 namespace DB
 {
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index 2f35ef26b1a..e8bd136e704 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -9,7 +9,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
diff --git a/src/Functions/isFinite.cpp b/src/Functions/isFinite.cpp
index 85e84e55b3b..b1ff5f326e5 100644
--- a/src/Functions/isFinite.cpp
+++ b/src/Functions/isFinite.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionNumericPredicate.h>
 #include <Functions/FunctionFactory.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <type_traits>
 
 
diff --git a/src/Functions/isIPAddressContainedIn.cpp b/src/Functions/isIPAddressContainedIn.cpp
index 54789fadc74..048fa04adb1 100644
--- a/src/Functions/isIPAddressContainedIn.cpp
+++ b/src/Functions/isIPAddressContainedIn.cpp
@@ -12,7 +12,7 @@
 #include <charconv>
 
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 namespace DB::ErrorCodes
 {
     extern const int CANNOT_PARSE_TEXT;
diff --git a/src/Functions/isInfinite.cpp b/src/Functions/isInfinite.cpp
index b509d5e0765..1fbc134d0c9 100644
--- a/src/Functions/isInfinite.cpp
+++ b/src/Functions/isInfinite.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionNumericPredicate.h>
 #include <Functions/FunctionFactory.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <type_traits>
 
 
diff --git a/src/Functions/likePatternToRegexp.h b/src/Functions/likePatternToRegexp.h
index 0cdaba9a866..15e38e61ab4 100644
--- a/src/Functions/likePatternToRegexp.h
+++ b/src/Functions/likePatternToRegexp.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Functions/logTrace.cpp b/src/Functions/logTrace.cpp
index e60e83746ab..acf2a2041ec 100644
--- a/src/Functions/logTrace.cpp
+++ b/src/Functions/logTrace.cpp
@@ -6,7 +6,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Functions/minus.cpp b/src/Functions/minus.cpp
index a5853a22f34..76459545790 100644
--- a/src/Functions/minus.cpp
+++ b/src/Functions/minus.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 namespace DB
 {
diff --git a/src/Functions/modelEvaluate.cpp b/src/Functions/modelEvaluate.cpp
index 4a7eaeab197..53bb109728a 100644
--- a/src/Functions/modelEvaluate.cpp
+++ b/src/Functions/modelEvaluate.cpp
@@ -1,10 +1,10 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
 
+#include <base/range.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalModelsLoader.h>
 #include <Columns/ColumnString.h>
-#include <common/range.h>
 #include <string>
 #include <memory>
 #include <DataTypes/DataTypeNullable.h>
diff --git a/src/Functions/multiply.cpp b/src/Functions/multiply.cpp
index 68c12397b8d..7cbf806faa0 100644
--- a/src/Functions/multiply.cpp
+++ b/src/Functions/multiply.cpp
@@ -1,7 +1,7 @@
 #include <type_traits>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 namespace DB
 {
diff --git a/src/Functions/normalizeQuery.cpp b/src/Functions/normalizeQuery.cpp
index 0635dd6b7ed..dd36e931bc4 100644
--- a/src/Functions/normalizeQuery.cpp
+++ b/src/Functions/normalizeQuery.cpp
@@ -3,7 +3,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <Parsers/queryNormalization.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/StringUtils/StringUtils.h>
 
 
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index c1e75e1f788..1e2875ae3e3 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Parsers/queryNormalization.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/SipHash.h>
 
diff --git a/src/Functions/padString.cpp b/src/Functions/padString.cpp
index 14ca526d5b3..544911919fe 100644
--- a/src/Functions/padString.cpp
+++ b/src/Functions/padString.cpp
@@ -5,7 +5,7 @@
 #include <Functions/GatherUtils/Algorithms.h>
 #include <Functions/GatherUtils/Sinks.h>
 #include <Functions/GatherUtils/Sources.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 namespace DB
 {
diff --git a/src/Functions/plus.cpp b/src/Functions/plus.cpp
index 41e5a025cd5..997cae0dbed 100644
--- a/src/Functions/plus.cpp
+++ b/src/Functions/plus.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 namespace DB
 {
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index fada1a0a306..ea08b276670 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -6,7 +6,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index ebaba96a96e..03e46541cdf 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -13,7 +13,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Common/ObjectPool.h>
 #include <Common/ProfileEvents.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
diff --git a/src/Functions/polygonArea.cpp b/src/Functions/polygonArea.cpp
index 0275fbdb987..2e38d6c74b9 100644
--- a/src/Functions/polygonArea.cpp
+++ b/src/Functions/polygonArea.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonConvexHull.cpp b/src/Functions/polygonConvexHull.cpp
index 526dcf920be..887a12b8b6a 100644
--- a/src/Functions/polygonConvexHull.cpp
+++ b/src/Functions/polygonConvexHull.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonPerimeter.cpp b/src/Functions/polygonPerimeter.cpp
index cf9973c40c7..8291020197a 100644
--- a/src/Functions/polygonPerimeter.cpp
+++ b/src/Functions/polygonPerimeter.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonsDistance.cpp b/src/Functions/polygonsDistance.cpp
index 5a22f0b9112..8dd88e1c3bd 100644
--- a/src/Functions/polygonsDistance.cpp
+++ b/src/Functions/polygonsDistance.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonsEquals.cpp b/src/Functions/polygonsEquals.cpp
index c959e4fbfd6..da1db43229b 100644
--- a/src/Functions/polygonsEquals.cpp
+++ b/src/Functions/polygonsEquals.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonsIntersection.cpp b/src/Functions/polygonsIntersection.cpp
index a5aaee251b9..35e2a1d4ea8 100644
--- a/src/Functions/polygonsIntersection.cpp
+++ b/src/Functions/polygonsIntersection.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonsSymDifference.cpp b/src/Functions/polygonsSymDifference.cpp
index c5f7e024557..8ef0142072a 100644
--- a/src/Functions/polygonsSymDifference.cpp
+++ b/src/Functions/polygonsSymDifference.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonsUnion.cpp b/src/Functions/polygonsUnion.cpp
index 1ef450dae24..770aa14ac52 100644
--- a/src/Functions/polygonsUnion.cpp
+++ b/src/Functions/polygonsUnion.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/polygonsWithin.cpp b/src/Functions/polygonsWithin.cpp
index 649eb7feced..66e5b4e6e17 100644
--- a/src/Functions/polygonsWithin.cpp
+++ b/src/Functions/polygonsWithin.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
diff --git a/src/Functions/randomFixedString.cpp b/src/Functions/randomFixedString.cpp
index dacdd8df9a9..eb8214383a7 100644
--- a/src/Functions/randomFixedString.cpp
+++ b/src/Functions/randomFixedString.cpp
@@ -7,10 +7,10 @@
 #include <Functions/FunctionsRandom.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
-#include <common/arithmeticOverflow.h>
-#include <common/unaligned.h>
+#include <base/arithmeticOverflow.h>
+#include <base/unaligned.h>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 namespace DB
 {
diff --git a/src/Functions/randomString.cpp b/src/Functions/randomString.cpp
index 118822460e1..0e64892bbf4 100644
--- a/src/Functions/randomString.cpp
+++ b/src/Functions/randomString.cpp
@@ -7,7 +7,7 @@
 #include <Functions/PerformanceAdaptors.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 
 namespace DB
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index c6d05002d87..59fc45a574d 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -7,7 +7,7 @@
 #include <Common/UTF8Helpers.h>
 #include <Common/randomSeed.h>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 namespace DB
 {
diff --git a/src/Functions/regexpQuoteMeta.cpp b/src/Functions/regexpQuoteMeta.cpp
index e8a2d047103..0db0405323a 100644
--- a/src/Functions/regexpQuoteMeta.cpp
+++ b/src/Functions/regexpQuoteMeta.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index d5e3e8b7368..95bad41e384 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -22,7 +22,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/memcpySmall.h>
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 namespace DB
 {
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index 0750c21025a..9edd2927706 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnArray.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
diff --git a/src/Functions/roundToExp2.cpp b/src/Functions/roundToExp2.cpp
index 33cfdaf1349..37f0637c79a 100644
--- a/src/Functions/roundToExp2.cpp
+++ b/src/Functions/roundToExp2.cpp
@@ -1,5 +1,5 @@
 #include <type_traits>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionUnaryArithmetic.h>
 
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index 50a438c8a27..fb38c59531e 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/Arena.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
diff --git a/src/Functions/runningConcurrency.cpp b/src/Functions/runningConcurrency.cpp
index fca9fb0491e..4d190dd0f79 100644
--- a/src/Functions/runningConcurrency.cpp
+++ b/src/Functions/runningConcurrency.cpp
@@ -10,7 +10,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteBufferFromString.h>
-#include <common/defines.h>
+#include <base/defines.h>
 #include <set>
 
 namespace DB
diff --git a/src/Functions/s2CapContains.cpp b/src/Functions/s2CapContains.cpp
index b83c90a1af9..e3df7f2350e 100644
--- a/src/Functions/s2CapContains.cpp
+++ b/src/Functions/s2CapContains.cpp
@@ -11,7 +11,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2CapUnion.cpp b/src/Functions/s2CapUnion.cpp
index 4188e429efc..98080729a50 100644
--- a/src/Functions/s2CapUnion.cpp
+++ b/src/Functions/s2CapUnion.cpp
@@ -11,7 +11,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2CellsIntersect.cpp b/src/Functions/s2CellsIntersect.cpp
index 421276bb00d..2ceb13c043b 100644
--- a/src/Functions/s2CellsIntersect.cpp
+++ b/src/Functions/s2CellsIntersect.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2GetNeighbors.cpp b/src/Functions/s2GetNeighbors.cpp
index 601e09155ad..f4df8c5a53f 100644
--- a/src/Functions/s2GetNeighbors.cpp
+++ b/src/Functions/s2GetNeighbors.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2RectAdd.cpp b/src/Functions/s2RectAdd.cpp
index d9b12ce22a3..20ca7c3c940 100644
--- a/src/Functions/s2RectAdd.cpp
+++ b/src/Functions/s2RectAdd.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2RectContains.cpp b/src/Functions/s2RectContains.cpp
index 27fed9e2031..b5cf1ffc505 100644
--- a/src/Functions/s2RectContains.cpp
+++ b/src/Functions/s2RectContains.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2RectIntersection.cpp b/src/Functions/s2RectIntersection.cpp
index 0980c7c50b3..b2de333752a 100644
--- a/src/Functions/s2RectIntersection.cpp
+++ b/src/Functions/s2RectIntersection.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2RectUnion.cpp b/src/Functions/s2RectUnion.cpp
index bff419bdb47..d22e250f708 100644
--- a/src/Functions/s2RectUnion.cpp
+++ b/src/Functions/s2RectUnion.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/s2ToGeo.cpp b/src/Functions/s2ToGeo.cpp
index 59a647345bb..fe7c9c76d72 100644
--- a/src/Functions/s2ToGeo.cpp
+++ b/src/Functions/s2ToGeo.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
diff --git a/src/Functions/serverConstants.cpp b/src/Functions/serverConstants.cpp
index 6808e6607cf..9a53a5cf582 100644
--- a/src/Functions/serverConstants.cpp
+++ b/src/Functions/serverConstants.cpp
@@ -5,7 +5,7 @@
 #include <Core/ServerUUID.h>
 #include <Common/SymbolIndex.h>
 #include <Common/DNSResolver.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config_version.h>
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 92b68b8f2c7..6582f75b0e8 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -7,7 +7,7 @@
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/ProfileEvents.h>
 #include <Common/assert_cast.h>
-#include <common/sleep.h>
+#include <base/sleep.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context_fwd.h>
 
diff --git a/src/Functions/tid.cpp b/src/Functions/tid.cpp
index bf0f08e4777..ec767e8ec84 100644
--- a/src/Functions/tid.cpp
+++ b/src/Functions/tid.cpp
@@ -3,7 +3,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 namespace DB
 {
diff --git a/src/Functions/timezoneOf.cpp b/src/Functions/timezoneOf.cpp
index f70d35c4602..a6556bdb800 100644
--- a/src/Functions/timezoneOf.cpp
+++ b/src/Functions/timezoneOf.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 #include <Core/Field.h>
 
 
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index fe7b1188a47..ecc3b80f088 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDate32.h>
diff --git a/src/Functions/today.cpp b/src/Functions/today.cpp
index 083ead622f7..fb9fd945239 100644
--- a/src/Functions/today.cpp
+++ b/src/Functions/today.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 #include <Core/Field.h>
 
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index cb9f0dfea74..f9ab66b5243 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -1,5 +1,5 @@
 #include <mutex>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <DataTypes/DataTypeArray.h>
@@ -10,7 +10,7 @@
 #include <Common/Arena.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/typeid_cast.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
diff --git a/src/Functions/trap.cpp b/src/Functions/trap.cpp
index 96951c10115..4fa0770e61b 100644
--- a/src/Functions/trap.cpp
+++ b/src/Functions/trap.cpp
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnString.h>
 #include <Interpreters/Context.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <thread>
 #include <memory>
diff --git a/src/Functions/trim.cpp b/src/Functions/trim.cpp
index fdaf25b815e..a1737fc12a1 100644
--- a/src/Functions/trim.cpp
+++ b/src/Functions/trim.cpp
@@ -1,7 +1,7 @@
 #include <Columns/ColumnString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/yesterday.cpp b/src/Functions/yesterday.cpp
index 96941c5cf8c..f792f885472 100644
--- a/src/Functions/yesterday.cpp
+++ b/src/Functions/yesterday.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 #include <Core/Field.h>
 
diff --git a/src/IO/BitHelpers.h b/src/IO/BitHelpers.h
index 1cb62f5f367..bcc36305021 100644
--- a/src/IO/BitHelpers.h
+++ b/src/IO/BitHelpers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/BitHelpers.h>
 #include <Common/Exception.h>
 
diff --git a/src/IO/HTTPChunkedReadBuffer.cpp b/src/IO/HTTPChunkedReadBuffer.cpp
index 374e04031d0..75827679d0c 100644
--- a/src/IO/HTTPChunkedReadBuffer.cpp
+++ b/src/IO/HTTPChunkedReadBuffer.cpp
@@ -3,7 +3,7 @@
 #include <IO/ReadHelpers.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/hex.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 
 namespace DB
diff --git a/src/IO/LimitReadBuffer.h b/src/IO/LimitReadBuffer.h
index a5fa0f0d5cc..92e5fbb0aa6 100644
--- a/src/IO/LimitReadBuffer.h
+++ b/src/IO/LimitReadBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 
 
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.cpp b/src/IO/MMapReadBufferFromFileDescriptor.cpp
index c5adfc017ae..463252ca78d 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.cpp
+++ b/src/IO/MMapReadBufferFromFileDescriptor.cpp
@@ -6,7 +6,7 @@
 #include <Common/ProfileEvents.h>
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <IO/WriteHelpers.h>
 #include <IO/MMapReadBufferFromFileDescriptor.h>
 
diff --git a/src/IO/MMappedFileDescriptor.cpp b/src/IO/MMappedFileDescriptor.cpp
index db2752d14f9..205cede0993 100644
--- a/src/IO/MMappedFileDescriptor.cpp
+++ b/src/IO/MMappedFileDescriptor.cpp
@@ -7,7 +7,7 @@
 
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <IO/MMappedFileDescriptor.h>
 
 
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index 772131d8cb7..7118de844f2 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -3,7 +3,7 @@
 #include <atomic>
 #include <cstddef>
 #include <functional>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <Core/Defines.h>
 
diff --git a/src/IO/ReadBufferFromFileBase.h b/src/IO/ReadBufferFromFileBase.h
index fa8fa5b9f89..731fd373e24 100644
--- a/src/IO/ReadBufferFromFileBase.h
+++ b/src/IO/ReadBufferFromFileBase.h
@@ -2,7 +2,7 @@
 
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/SeekableReadBuffer.h>
-#include <common/time.h>
+#include <base/time.h>
 
 #include <functional>
 #include <string>
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index 9485bec5679..b1c4cdc3bb9 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -8,7 +8,7 @@
 
 #    include <aws/s3/S3Client.h>
 #    include <aws/s3/model/GetObjectRequest.h>
-#    include <common/logger_useful.h>
+#    include <base/logger_useful.h>
 
 #    include <utility>
 
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index f6ccfbd56bb..ffa050b71c8 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -8,7 +8,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/readFloatText.h>
 #include <IO/Operators.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <stdlib.h>
 
 #ifdef __SSE2__
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 08bc8b08ee9..ca6affbf907 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -8,12 +8,12 @@
 
 #include <type_traits>
 
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
-#include <common/StringRef.h>
-#include <common/arithmeticOverflow.h>
-#include <common/unit.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
+#include <base/StringRef.h>
+#include <base/arithmeticOverflow.h>
+#include <base/unit.h>
 
 #include <Core/Types.h>
 #include <Core/DecimalFunctions.h>
diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h
index 2f0d598cd6e..9e9b70859b8 100644
--- a/src/IO/ReadWriteBufferFromHTTP.h
+++ b/src/IO/ReadWriteBufferFromHTTP.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <functional>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/ReadBuffer.h>
@@ -15,7 +15,7 @@
 #include <Poco/Version.h>
 #include <Common/DNSResolver.h>
 #include <Common/RemoteHostFilter.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/URIStreamFactory.h>
 
 #if !defined(ARCADIA_BUILD)
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 78cb5300101..b23e8061291 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -16,7 +16,7 @@
 #include "Poco/StreamCopier.h"
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <re2/re2.h>
 
 #include <boost/algorithm/string.hpp>
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 51dbf44a765..89e1542d946 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -28,7 +28,7 @@
 #    include <Poco/URI.h>
 #    include <re2/re2.h>
 #    include <boost/algorithm/string/case_conv.hpp>
-#    include <common/logger_useful.h>
+#    include <base/logger_useful.h>
 
 namespace
 {
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 20ec982138a..12dde929d2c 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -6,7 +6,7 @@
 
 #if USE_AWS_S3
 
-#include <common/types.h>
+#include <base/types.h>
 #include <aws/core/Aws.h>  // Y_IGNORE
 #include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
 #include <IO/S3/PocoHTTPClient.h>
diff --git a/src/IO/SynchronousReader.cpp b/src/IO/SynchronousReader.cpp
index a9a9c5e0fe6..82f29da7d91 100644
--- a/src/IO/SynchronousReader.cpp
+++ b/src/IO/SynchronousReader.cpp
@@ -4,7 +4,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/ProfileEvents.h>
 #include <Common/Stopwatch.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 #include <unordered_map>
 #include <mutex>
 #include <unistd.h>
diff --git a/src/IO/ThreadPoolReader.cpp b/src/IO/ThreadPoolReader.cpp
index f6f1d35b8f1..514075569f6 100644
--- a/src/IO/ThreadPoolReader.cpp
+++ b/src/IO/ThreadPoolReader.cpp
@@ -5,7 +5,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/Stopwatch.h>
 #include <Common/setThreadName.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 #include <Poco/Event.h>
 #include <future>
 #include <unistd.h>
diff --git a/src/IO/TimeoutSetter.cpp b/src/IO/TimeoutSetter.cpp
index a82e526bf30..44e921c8ffa 100644
--- a/src/IO/TimeoutSetter.cpp
+++ b/src/IO/TimeoutSetter.cpp
@@ -1,6 +1,6 @@
 #include <IO/TimeoutSetter.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/IO/VarInt.h b/src/IO/VarInt.h
index 8c57395a250..50fc158ba76 100644
--- a/src/IO/VarInt.h
+++ b/src/IO/VarInt.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iostream>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
diff --git a/src/IO/WriteBufferFromArena.h b/src/IO/WriteBufferFromArena.h
index 0e8a11fb5d6..c667196ebcd 100644
--- a/src/IO/WriteBufferFromArena.h
+++ b/src/IO/WriteBufferFromArena.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Arena.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <IO/WriteBuffer.h>
 
 
diff --git a/src/IO/WriteBufferFromHTTP.cpp b/src/IO/WriteBufferFromHTTP.cpp
index 70cbd7484b4..dd69e85a7d4 100644
--- a/src/IO/WriteBufferFromHTTP.cpp
+++ b/src/IO/WriteBufferFromHTTP.cpp
@@ -1,6 +1,6 @@
 #include <IO/WriteBufferFromHTTP.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 1ae1b56933d..3a2ec9827de 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -11,7 +11,7 @@
 #    include <aws/s3/model/CompleteMultipartUploadRequest.h>
 #    include <aws/s3/model/PutObjectRequest.h>
 #    include <aws/s3/model/UploadPartRequest.h>
-#    include <common/logger_useful.h>
+#    include <base/logger_useful.h>
 
 #    include <utility>
 
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 48a0ba4ddfe..a8966f7afe1 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -8,8 +8,8 @@
 
 #    include <memory>
 #    include <vector>
-#    include <common/logger_useful.h>
-#    include <common/types.h>
+#    include <base/logger_useful.h>
+#    include <base/types.h>
 
 #    include <IO/BufferWithOwnMemory.h>
 #    include <IO/WriteBuffer.h>
diff --git a/src/IO/WriteBufferFromString.h b/src/IO/WriteBufferFromString.h
index 9bfb13dfe96..f4515254e6e 100644
--- a/src/IO/WriteBufferFromString.h
+++ b/src/IO/WriteBufferFromString.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <IO/WriteBufferFromVector.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp
index ecdf38eae34..62f871ee71d 100644
--- a/src/IO/WriteBufferValidUTF8.cpp
+++ b/src/IO/WriteBufferValidUTF8.cpp
@@ -1,7 +1,7 @@
 #include <Poco/UTF8Encoding.h>
 #include <IO/WriteBufferValidUTF8.h>
 #include <Common/MemoryTracker.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #ifdef __SSE2__
     #include <emmintrin.h>
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index e5395e33df1..9cdc77df957 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -9,13 +9,13 @@
 
 #include <pcg-random/pcg_random.hpp>
 
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
-#include <common/find_symbols.h>
-#include <common/StringRef.h>
-#include <common/DecomposedFloat.h>
-#include <common/EnumReflection.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
+#include <base/find_symbols.h>
+#include <base/StringRef.h>
+#include <base/DecomposedFloat.h>
+#include <base/EnumReflection.h>
 
 #include <Core/DecimalFunctions.h>
 #include <Core/Types.h>
diff --git a/src/IO/WriteIntText.h b/src/IO/WriteIntText.h
index 456aed350fc..b8d2acc7d5d 100644
--- a/src/IO/WriteIntText.h
+++ b/src/IO/WriteIntText.h
@@ -2,7 +2,7 @@
 
 #include <Core/Defines.h>
 #include <IO/WriteBuffer.h>
-#include <common/itoa.h>
+#include <base/itoa.h>
 
 
 namespace
diff --git a/src/IO/examples/o_direct_and_dirty_pages.cpp b/src/IO/examples/o_direct_and_dirty_pages.cpp
index c60141d286f..228b7ffe146 100644
--- a/src/IO/examples/o_direct_and_dirty_pages.cpp
+++ b/src/IO/examples/o_direct_and_dirty_pages.cpp
@@ -2,8 +2,8 @@
 
 #include <iostream>
 
-#include <common/types.h>
-#include <common/getPageSize.h>
+#include <base/types.h>
+#include <base/getPageSize.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
diff --git a/src/IO/examples/parse_int_perf.cpp b/src/IO/examples/parse_int_perf.cpp
index 5a8f8b01f50..f2a04dc1541 100644
--- a/src/IO/examples/parse_int_perf.cpp
+++ b/src/IO/examples/parse_int_perf.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/IO/examples/read_buffer.cpp b/src/IO/examples/read_buffer.cpp
index 647382e667b..ea3da690ca5 100644
--- a/src/IO/examples/read_buffer.cpp
+++ b/src/IO/examples/read_buffer.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 
diff --git a/src/IO/examples/read_buffer_perf.cpp b/src/IO/examples/read_buffer_perf.cpp
index a8198bce71f..fd9b3b6f7cb 100644
--- a/src/IO/examples/read_buffer_perf.cpp
+++ b/src/IO/examples/read_buffer_perf.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromFile.h>
 
diff --git a/src/IO/examples/read_float_perf.cpp b/src/IO/examples/read_float_perf.cpp
index 40742d17b1c..03e3810bdd0 100644
--- a/src/IO/examples/read_float_perf.cpp
+++ b/src/IO/examples/read_float_perf.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
 #include <IO/readFloatText.h>
diff --git a/src/IO/examples/read_write_int.cpp b/src/IO/examples/read_write_int.cpp
index c09db10cbe2..49374878790 100644
--- a/src/IO/examples/read_write_int.cpp
+++ b/src/IO/examples/read_write_int.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/IO/examples/write_buffer.cpp b/src/IO/examples/write_buffer.cpp
index 09b46f810bf..5587b8aa1a2 100644
--- a/src/IO/examples/write_buffer.cpp
+++ b/src/IO/examples/write_buffer.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromOStream.h>
 
diff --git a/src/IO/examples/write_buffer_perf.cpp b/src/IO/examples/write_buffer_perf.cpp
index 096b58cb7c4..0b3d0a61241 100644
--- a/src/IO/examples/write_buffer_perf.cpp
+++ b/src/IO/examples/write_buffer_perf.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromOStream.h>
 
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index a7a9eaaa4dd..274a4ecc2f2 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 #include <Common/StringUtils/StringUtils.h>
 
 #include <IO/ReadBuffer.h>
diff --git a/src/IO/readDecimalText.h b/src/IO/readDecimalText.h
index 81dcaa4d708..2e06acb2f3e 100644
--- a/src/IO/readDecimalText.h
+++ b/src/IO/readDecimalText.h
@@ -3,7 +3,7 @@
 #include <limits>
 #include <IO/ReadHelpers.h>
 #include <Common/intExp.h>
-#include <common/wide_integer_to_string.h>
+#include <base/wide_integer_to_string.h>
 
 
 namespace DB
diff --git a/src/IO/readFloatText.h b/src/IO/readFloatText.h
index 8fed7feeef3..eb1ff67ac99 100644
--- a/src/IO/readFloatText.h
+++ b/src/IO/readFloatText.h
@@ -2,7 +2,7 @@
 #include <type_traits>
 #include <IO/ReadHelpers.h>
 #include <Core/Defines.h>
-#include <common/shift10.h>
+#include <base/shift10.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <double-conversion/double-conversion.h>
 
diff --git a/src/IO/tests/gtest_DateTimeToString.cpp b/src/IO/tests/gtest_DateTimeToString.cpp
index 058e7c12fdd..c30c8943944 100644
--- a/src/IO/tests/gtest_DateTimeToString.cpp
+++ b/src/IO/tests/gtest_DateTimeToString.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
 
diff --git a/src/IO/tests/gtest_bit_io.cpp b/src/IO/tests/gtest_bit_io.cpp
index 53bc4c9ae82..c27525857f9 100644
--- a/src/IO/tests/gtest_bit_io.cpp
+++ b/src/IO/tests/gtest_bit_io.cpp
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <IO/BitHelpers.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <Common/BitHelpers.h>
diff --git a/src/IO/tests/gtest_manip.cpp b/src/IO/tests/gtest_manip.cpp
index c3989ca0d7a..afcffc7dfb9 100644
--- a/src/IO/tests/gtest_manip.cpp
+++ b/src/IO/tests/gtest_manip.cpp
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <type_traits>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <IO/Operators.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
diff --git a/src/IO/tests/gtest_peekable_read_buffer.cpp b/src/IO/tests/gtest_peekable_read_buffer.cpp
index 0ddc355f874..37c8a66668f 100644
--- a/src/IO/tests/gtest_peekable_read_buffer.cpp
+++ b/src/IO/tests/gtest_peekable_read_buffer.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ConcatReadBuffer.h>
diff --git a/src/Interpreters/ActionLocksManager.h b/src/Interpreters/ActionLocksManager.h
index f030afec891..be112e71950 100644
--- a/src/Interpreters/ActionLocksManager.h
+++ b/src/Interpreters/ActionLocksManager.h
@@ -4,7 +4,7 @@
 #include <Interpreters/StorageID.h>
 #include <Storages/IStorage_fwd.h>
 #include <Common/ActionLock.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <mutex>
 #include <unordered_map>
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index dc94c2981b3..00d2f76f043 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -8,7 +8,7 @@
 #include <Common/memcpySmall.h>
 #include <Common/assert_cast.h>
 #include <Core/Defines.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index e72fe4baea3..1524453ab34 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -4,9 +4,9 @@
 #include <memory>
 #include <functional>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/Arena.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Common/HashTable/HashMap.h>
diff --git a/src/Interpreters/Aliases.h b/src/Interpreters/Aliases.h
index 0bdffe27933..0eb8dbf9572 100644
--- a/src/Interpreters/Aliases.h
+++ b/src/Interpreters/Aliases.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 
 #include <unordered_map>
diff --git a/src/Interpreters/BloomFilter.h b/src/Interpreters/BloomFilter.h
index ccfb35bd68f..279ab6947ec 100644
--- a/src/Interpreters/BloomFilter.h
+++ b/src/Interpreters/BloomFilter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Field.h>
 #include <Common/PODArray.h>
 #include <Common/Allocator.h>
diff --git a/src/Interpreters/BloomFilterHash.h b/src/Interpreters/BloomFilterHash.h
index 8a891ff1dfe..31532cc888a 100644
--- a/src/Interpreters/BloomFilterHash.h
+++ b/src/Interpreters/BloomFilterHash.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Common/HashTable/Hash.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnArray.h>
diff --git a/src/Interpreters/ClientInfo.cpp b/src/Interpreters/ClientInfo.cpp
index c8b945ef9b5..a92f9f68636 100644
--- a/src/Interpreters/ClientInfo.cpp
+++ b/src/Interpreters/ClientInfo.cpp
@@ -4,7 +4,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Core/Defines.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <unistd.h>
 
 #if !defined(ARCADIA_BUILD)
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index 71570778645..661497c88f5 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -2,7 +2,7 @@
 
 #include <Core/UUID.h>
 #include <Poco/Net/SocketAddress.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/OpenTelemetryTraceContext.h>
 
 namespace DB
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index 1a7554a8c27..c5a664d6137 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -1,5 +1,5 @@
 #include <Interpreters/Cluster.h>
-#include <common/SimpleCache.h>
+#include <base/SimpleCache.h>
 #include <Common/DNSResolver.h>
 #include <Common/escapeForFileName.h>
 #include <Common/isLocalAddress.h>
@@ -11,7 +11,7 @@
 #include <IO/ReadHelpers.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/Application.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/erase.hpp>
 
 namespace DB
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index 961de45c491..b644f2936d9 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -9,7 +9,7 @@
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 149e9897375..1a95a642e18 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -76,8 +76,8 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ShellCommand.h>
 #include <Common/TraceCollector.h>
-#include <common/logger_useful.h>
-#include <common/EnumReflection.h>
+#include <base/logger_useful.h>
+#include <base/EnumReflection.h>
 #include <Common/RemoteHostFilter.h>
 #include <Interpreters/AsynchronousInsertQueue.h>
 #include <Interpreters/DatabaseCatalog.h>
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 5aeb0f883a7..f6cded2b1d1 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -14,7 +14,7 @@
 #include <Common/MultiVersion.h>
 #include <Common/OpenTelemetryTraceContext.h>
 #include <Common/RemoteHostFilter.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include "config_core.h"
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 0391e76e763..cfce6ac9463 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -6,7 +6,7 @@
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <Poco/Net/NetException.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 4c08ff06e87..d7984af30c7 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -24,12 +24,12 @@
 #include <Common/isLocalAddress.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Poco/Timestamp.h>
-#include <common/sleep.h>
-#include <common/getFQDNOrHostName.h>
-#include <common/logger_useful.h>
+#include <base/sleep.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/logger_useful.h>
 #include <random>
 #include <pcg_random.hpp>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 #include <Interpreters/ZooKeeperLog.h>
 
diff --git a/src/Interpreters/DatabaseAndTableWithAlias.h b/src/Interpreters/DatabaseAndTableWithAlias.h
index e43481025a0..237c56d3ce3 100644
--- a/src/Interpreters/DatabaseAndTableWithAlias.h
+++ b/src/Interpreters/DatabaseAndTableWithAlias.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IAST_fwd.h>
 
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index f273f8a165d..bff03be61a8 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -14,7 +14,7 @@
 #include <Poco/DirectoryIterator.h>
 #include <Common/renameat2.h>
 #include <Common/CurrentMetrics.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <filesystem>
 #include <Common/filesystemHelpers.h>
diff --git a/src/Interpreters/EmbeddedDictionaries.cpp b/src/Interpreters/EmbeddedDictionaries.cpp
index 947768ad3d7..afb41962dfe 100644
--- a/src/Interpreters/EmbeddedDictionaries.cpp
+++ b/src/Interpreters/EmbeddedDictionaries.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Common/setThreadName.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Util/Application.h>
 
 
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 58cec23fa87..571b4ba5e13 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -7,7 +7,7 @@
 #include <optional>
 #include <stack>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnVector.h>
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 09d0ea3a4b7..e4c8e46980d 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -9,8 +9,8 @@
 #include <Common/randomSeed.h>
 #include <Common/setThreadName.h>
 #include <Common/StatusInfo.h>
-#include <common/chrono_io.h>
-#include <common/scope_guard_safe.h>
+#include <base/chrono_io.h>
+#include <base/scope_guard_safe.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <unordered_set>
diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h
index 1fa11807eba..ed17138754a 100644
--- a/src/Interpreters/ExternalLoader.h
+++ b/src/Interpreters/ExternalLoader.h
@@ -3,11 +3,11 @@
 #include <chrono>
 #include <functional>
 #include <unordered_map>
-#include <common/types.h>
+#include <base/types.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Common/ExternalLoaderStatus.h>
 
 
diff --git a/src/Interpreters/ExternalLoaderTempConfigRepository.h b/src/Interpreters/ExternalLoaderTempConfigRepository.h
index d042f310ed1..92816dcb7f2 100644
--- a/src/Interpreters/ExternalLoaderTempConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderTempConfigRepository.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
 #include <Poco/Timestamp.h>
 
diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.h b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
index 99fe1aea1c4..25646d72db3 100644
--- a/src/Interpreters/ExternalLoaderXMLConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
@@ -1,9 +1,8 @@
 #pragma once
 
+#include <base/types.h>
 #include <unordered_set>
 #include <mutex>
-
-#include <common/types.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
 #include <Poco/Timestamp.h>
 
diff --git a/src/Interpreters/ExternalModelsLoader.h b/src/Interpreters/ExternalModelsLoader.h
index f0a7592f4d3..18e1f1123f6 100644
--- a/src/Interpreters/ExternalModelsLoader.h
+++ b/src/Interpreters/ExternalModelsLoader.h
@@ -3,7 +3,7 @@
 #include <Interpreters/CatBoostModel.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/ExternalLoader.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <memory>
 
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.cpp b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
index ec3866ba0c0..5840e694e07 100644
--- a/src/Interpreters/GatherFunctionQuantileVisitor.cpp
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include <Interpreters/GatherFunctionQuantileVisitor.h>
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 07872df8ce5..28dcd9051ae 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -3,7 +3,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnString.h>
diff --git a/src/Interpreters/IExternalLoadable.h b/src/Interpreters/IExternalLoadable.h
index 2d9a9abfa5f..f49e8e86b3a 100644
--- a/src/Interpreters/IExternalLoadable.h
+++ b/src/Interpreters/IExternalLoadable.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <pcg_random.hpp>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace Poco::Util
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.h b/src/Interpreters/InJoinSubqueriesPreprocessor.h
index 92a408e7ae3..d2166185d2b 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.h
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.h
@@ -3,7 +3,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <memory>
 #include <string>
diff --git a/src/Interpreters/InternalTextLogsQueue.cpp b/src/Interpreters/InternalTextLogsQueue.cpp
index a61b0d6dd9e..8329fc38ba7 100644
--- a/src/Interpreters/InternalTextLogsQueue.cpp
+++ b/src/Interpreters/InternalTextLogsQueue.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Message.h>
 
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index adac31e08e2..3965945b3ca 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -64,7 +64,7 @@
 #include <Interpreters/ApplyWithSubqueryVisitor.h>
 
 #include <TableFunctions/TableFunctionFactory.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Interpreters/InterpreterCreateQuotaQuery.cpp b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
index c6983c65cef..b4f61e43186 100644
--- a/src/Interpreters/InterpreterCreateQuotaQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Access/AccessControlManager.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/find_if.hpp>
 #include <boost/range/algorithm/upper_bound.hpp>
 #include <boost/range/algorithm/sort.hpp>
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 563e9ba8997..12922e45a55 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -75,14 +75,14 @@
 
 #include <Functions/IFunction.h>
 #include <Core/Field.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Columns/Collator.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
-#include <common/map.h>
-#include <common/scope_guard_safe.h>
+#include <base/map.h>
+#include <base/scope_guard_safe.h>
 #include <memory>
 
 
diff --git a/src/Interpreters/InterpreterShowAccessQuery.cpp b/src/Interpreters/InterpreterShowAccessQuery.cpp
index 137da9b7c5f..86ab409d82b 100644
--- a/src/Interpreters/InterpreterShowAccessQuery.cpp
+++ b/src/Interpreters/InterpreterShowAccessQuery.cpp
@@ -9,7 +9,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Access/AccessFlags.h>
 #include <Access/AccessControlManager.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/sort.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
diff --git a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
index 87ebd064ae5..7be7032f48a 100644
--- a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
@@ -24,7 +24,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Core/Defines.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/sort.hpp>
 
 
diff --git a/src/Interpreters/InterserverCredentials.cpp b/src/Interpreters/InterserverCredentials.cpp
index e60d397eb02..b0426976198 100644
--- a/src/Interpreters/InterserverCredentials.cpp
+++ b/src/Interpreters/InterserverCredentials.cpp
@@ -1,5 +1,5 @@
 #include <Interpreters/InterserverCredentials.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/StringUtils/StringUtils.h>
 
 namespace DB
diff --git a/src/Interpreters/InterserverCredentials.h b/src/Interpreters/InterserverCredentials.h
index ffe568868dd..341013ab73a 100644
--- a/src/Interpreters/InterserverCredentials.h
+++ b/src/Interpreters/InterserverCredentials.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <unordered_set>
 
 namespace DB
diff --git a/src/Interpreters/InterserverIOHandler.h b/src/Interpreters/InterserverIOHandler.h
index b0c95ed3835..7ad1c01cbf1 100644
--- a/src/Interpreters/InterserverIOHandler.h
+++ b/src/Interpreters/InterserverIOHandler.h
@@ -7,7 +7,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 #include <Common/ActionBlocker.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <atomic>
 #include <map>
diff --git a/src/Interpreters/JIT/CHJIT.cpp b/src/Interpreters/JIT/CHJIT.cpp
index 3f2a078f58e..83b0430a07d 100644
--- a/src/Interpreters/JIT/CHJIT.cpp
+++ b/src/Interpreters/JIT/CHJIT.cpp
@@ -26,7 +26,7 @@
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <llvm/Support/SmallVectorMemoryBuffer.h>
 
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
 
diff --git a/src/Interpreters/Lemmatizers.h b/src/Interpreters/Lemmatizers.h
index 6682afaa415..3712f76387b 100644
--- a/src/Interpreters/Lemmatizers.h
+++ b/src/Interpreters/Lemmatizers.h
@@ -6,7 +6,7 @@
 
 #if USE_NLP
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Util/Application.h>
 
 #include <mutex>
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 4fd022772f6..8576f4662ec 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -12,7 +12,7 @@
 #include <Common/CurrentThread.h>
 #include <IO/WriteHelpers.h>
 #include <DataStreams/IBlockInputStream.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <chrono>
 
 
diff --git a/src/Interpreters/QueryViewsLog.cpp b/src/Interpreters/QueryViewsLog.cpp
index fa6fcf66a87..2c0f1ecd878 100644
--- a/src/Interpreters/QueryViewsLog.cpp
+++ b/src/Interpreters/QueryViewsLog.cpp
@@ -12,8 +12,8 @@
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/ProfileEventsExt.h>
-#include <common/DateLUT.h>
-#include <common/types.h>
+#include <base/DateLUT.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/QueryViewsLog.h b/src/Interpreters/QueryViewsLog.h
index 34e7532d5d4..a84e9f9ba89 100644
--- a/src/Interpreters/QueryViewsLog.h
+++ b/src/Interpreters/QueryViewsLog.h
@@ -10,7 +10,7 @@
 #include <Core/Types.h>
 #include <Core/UUID.h>
 #include <Interpreters/SystemLog.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace ProfileEvents
 {
diff --git a/src/Interpreters/RequiredSourceColumnsData.h b/src/Interpreters/RequiredSourceColumnsData.h
index d425989393e..501f6961efa 100644
--- a/src/Interpreters/RequiredSourceColumnsData.h
+++ b/src/Interpreters/RequiredSourceColumnsData.h
@@ -4,7 +4,7 @@
 #include <optional>
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 
 namespace DB
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 956ecc94b96..e67e16b9b64 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -1,7 +1,7 @@
 #include <Interpreters/RowRefs.h>
 
 #include <Core/Block.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/typeid_cast.h>
 #include <Common/ColumnsHashing.h>
 #include <Columns/IColumn.h>
diff --git a/src/Interpreters/Set.cpp b/src/Interpreters/Set.cpp
index 5304859aeea..90fc0f6c0d0 100644
--- a/src/Interpreters/Set.cpp
+++ b/src/Interpreters/Set.cpp
@@ -24,7 +24,7 @@
 
 #include <Storages/MergeTree/KeyCondition.h>
 
-#include <common/range.h>
+#include <base/range.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
diff --git a/src/Interpreters/Set.h b/src/Interpreters/Set.h
index 578913dd0d2..118779f1935 100644
--- a/src/Interpreters/Set.h
+++ b/src/Interpreters/Set.h
@@ -8,7 +8,7 @@
 #include <Parsers/IAST.h>
 #include <Storages/MergeTree/BoolMask.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Interpreters/StorageID.h b/src/Interpreters/StorageID.h
index fb94501bb94..623f481fbc5 100644
--- a/src/Interpreters/StorageID.h
+++ b/src/Interpreters/StorageID.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/UUID.h>
 #include <tuple>
 #include <Parsers/IAST_fwd.h>
diff --git a/src/Interpreters/SynonymsExtensions.h b/src/Interpreters/SynonymsExtensions.h
index fd2bf03e162..d1f3548ce64 100644
--- a/src/Interpreters/SynonymsExtensions.h
+++ b/src/Interpreters/SynonymsExtensions.h
@@ -6,7 +6,7 @@
 
 #if USE_NLP
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Util/Application.h>
 
 #include <memory>
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index 2ccb84e1ffa..71155760aea 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -12,7 +12,7 @@
 #include <Interpreters/ZooKeeperLog.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index 7212597becc..615180d27dd 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -7,9 +7,9 @@
 
 #include <condition_variable>
 #include <boost/noncopyable.hpp>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
-#include <common/types.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/types.h>
 #include <Core/Defines.h>
 #include <Storages/IStorage.h>
 #include <Parsers/ASTCreateQuery.h>
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index db65e074eba..9fd6a54586d 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -1,7 +1,7 @@
 #include <Interpreters/TableJoin.h>
 
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/StringUtils/StringUtils.h>
 
 #include <Core/Block.h>
@@ -23,7 +23,7 @@
 #include <Storages/StorageDictionary.h>
 #include <Storages/StorageJoin.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <algorithm>
 
 
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index a207c519439..22cd958f4f8 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -19,8 +19,8 @@
 
 #include <utility>
 #include <memory>
-#include <common/types.h>
-#include <common/logger_useful.h>
+#include <base/types.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/TablesStatus.h b/src/Interpreters/TablesStatus.h
index 85290f69c87..2323e751fc9 100644
--- a/src/Interpreters/TablesStatus.h
+++ b/src/Interpreters/TablesStatus.h
@@ -3,7 +3,7 @@
 #include <unordered_set>
 #include <unordered_map>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/QualifiedTableName.h>
 
 namespace DB
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index d3ebd5ee0b7..ddfb832f6b2 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -14,7 +14,7 @@
 #include <Common/SensitiveDataMasker.h>
 #include <Common/ThreadProfileEvents.h>
 #include <Common/TraceCollector.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 
 #if defined(OS_LINUX)
 #   include <Common/hasLinuxCapability.h>
diff --git a/src/Interpreters/UserDefinedSQLObjectsLoader.cpp b/src/Interpreters/UserDefinedSQLObjectsLoader.cpp
index f8379edd9e7..455c73bf685 100644
--- a/src/Interpreters/UserDefinedSQLObjectsLoader.cpp
+++ b/src/Interpreters/UserDefinedSQLObjectsLoader.cpp
@@ -21,7 +21,7 @@
 
 #include <Poco/DirectoryIterator.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Interpreters/addTypeConversionToAST.h b/src/Interpreters/addTypeConversionToAST.h
index eb391b2c749..36167a6b0c3 100644
--- a/src/Interpreters/addTypeConversionToAST.h
+++ b/src/Interpreters/addTypeConversionToAST.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index 83db4c65bbe..57bb4aa4905 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -22,7 +22,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
 
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 
 
diff --git a/src/Interpreters/examples/hash_map.cpp b/src/Interpreters/examples/hash_map.cpp
index b678f334f84..fe2cbda019d 100644
--- a/src/Interpreters/examples/hash_map.cpp
+++ b/src/Interpreters/examples/hash_map.cpp
@@ -11,7 +11,7 @@
 /*
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 */
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
diff --git a/src/Interpreters/examples/hash_map3.cpp b/src/Interpreters/examples/hash_map3.cpp
index 132e6fe9e87..a8673e06e9b 100644
--- a/src/Interpreters/examples/hash_map3.cpp
+++ b/src/Interpreters/examples/hash_map3.cpp
@@ -10,12 +10,12 @@
 
 #include <utility>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 
 #include <IO/ReadHelpers.h>
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #include <Common/HashTable/HashMap.h>
 
diff --git a/src/Interpreters/examples/hash_map_lookup.cpp b/src/Interpreters/examples/hash_map_lookup.cpp
index 39c43023b20..fd6b231cf73 100644
--- a/src/Interpreters/examples/hash_map_lookup.cpp
+++ b/src/Interpreters/examples/hash_map_lookup.cpp
@@ -8,7 +8,7 @@
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
 #include <Compression/CompressedReadBuffer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/AggregationCommon.h>
diff --git a/src/Interpreters/examples/hash_map_string.cpp b/src/Interpreters/examples/hash_map_string.cpp
index c51d1a6db01..54915ee7c10 100644
--- a/src/Interpreters/examples/hash_map_string.cpp
+++ b/src/Interpreters/examples/hash_map_string.cpp
@@ -12,11 +12,11 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
diff --git a/src/Interpreters/examples/hash_map_string_2.cpp b/src/Interpreters/examples/hash_map_string_2.cpp
index 9b104ffa8a1..67a1b5c5e75 100644
--- a/src/Interpreters/examples/hash_map_string_2.cpp
+++ b/src/Interpreters/examples/hash_map_string_2.cpp
@@ -7,11 +7,11 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
diff --git a/src/Interpreters/examples/hash_map_string_3.cpp b/src/Interpreters/examples/hash_map_string_3.cpp
index d0bf9093374..447be2dc51b 100644
--- a/src/Interpreters/examples/hash_map_string_3.cpp
+++ b/src/Interpreters/examples/hash_map_string_3.cpp
@@ -10,11 +10,11 @@
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
diff --git a/src/Interpreters/examples/hash_map_string_small.cpp b/src/Interpreters/examples/hash_map_string_small.cpp
index fe81c120d90..4a96f717bf7 100644
--- a/src/Interpreters/examples/hash_map_string_small.cpp
+++ b/src/Interpreters/examples/hash_map_string_small.cpp
@@ -12,11 +12,11 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
diff --git a/src/Interpreters/examples/string_hash_map.cpp b/src/Interpreters/examples/string_hash_map.cpp
index 3420918887c..15df8c399de 100644
--- a/src/Interpreters/examples/string_hash_map.cpp
+++ b/src/Interpreters/examples/string_hash_map.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <vector>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/AggregationCommon.h>
@@ -10,7 +10,7 @@
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Common/HashTable/StringHashMap.h>
 #include <Common/Stopwatch.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 /**
 
diff --git a/src/Interpreters/examples/string_hash_set.cpp b/src/Interpreters/examples/string_hash_set.cpp
index d9d6453da34..355789e97ec 100644
--- a/src/Interpreters/examples/string_hash_set.cpp
+++ b/src/Interpreters/examples/string_hash_set.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <vector>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/AggregationCommon.h>
@@ -10,7 +10,7 @@
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Common/HashTable/StringHashSet.h>
 #include <Common/Stopwatch.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 /// NOTE: see string_hash_map.cpp for usage example
 
diff --git a/src/Interpreters/examples/two_level_hash_map.cpp b/src/Interpreters/examples/two_level_hash_map.cpp
index 33fd5ee8305..530c5b8263a 100644
--- a/src/Interpreters/examples/two_level_hash_map.cpp
+++ b/src/Interpreters/examples/two_level_hash_map.cpp
@@ -12,7 +12,7 @@
 #include <Common/Stopwatch.h>
 #include <AggregateFunctions/UniquesHashSet.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/TwoLevelHashTable.h>
diff --git a/src/Interpreters/joinDispatch.h b/src/Interpreters/joinDispatch.h
index 59b12536e16..a9de8206b65 100644
--- a/src/Interpreters/joinDispatch.h
+++ b/src/Interpreters/joinDispatch.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <array>
-#include <common/constexpr_helpers.h>
+#include <base/constexpr_helpers.h>
 
 #include <Interpreters/HashJoin.h>
 
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.h b/src/Interpreters/replaceAliasColumnsInQuery.h
index 7f5fee3b14b..3c072c1300b 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.h
+++ b/src/Interpreters/replaceAliasColumnsInQuery.h
@@ -3,7 +3,7 @@
 #include <Core/Names.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Parsers/ASTCreateQuotaQuery.cpp b/src/Parsers/ASTCreateQuotaQuery.cpp
index d967498e573..135b25c5bdb 100644
--- a/src/Parsers/ASTCreateQuotaQuery.cpp
+++ b/src/Parsers/ASTCreateQuotaQuery.cpp
@@ -2,7 +2,7 @@
 #include <Parsers/ASTRolesOrUsersSet.h>
 #include <Common/quoteString.h>
 #include <Common/IntervalKind.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <IO/Operators.h>
 
 
diff --git a/src/Parsers/ASTCreateRowPolicyQuery.cpp b/src/Parsers/ASTCreateRowPolicyQuery.cpp
index 2f3d96dbf69..6aac008e0be 100644
--- a/src/Parsers/ASTCreateRowPolicyQuery.cpp
+++ b/src/Parsers/ASTCreateRowPolicyQuery.cpp
@@ -3,7 +3,7 @@
 #include <Parsers/ASTRolesOrUsersSet.h>
 #include <Parsers/formatAST.h>
 #include <Common/quoteString.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/transform.hpp>
 #include <IO/Operators.h>
 
diff --git a/src/Parsers/ASTFunctionWithKeyValueArguments.h b/src/Parsers/ASTFunctionWithKeyValueArguments.h
index f5eaa33bfc7..5820e8564ac 100644
--- a/src/Parsers/ASTFunctionWithKeyValueArguments.h
+++ b/src/Parsers/ASTFunctionWithKeyValueArguments.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Parsers/ASTPartition.h b/src/Parsers/ASTPartition.h
index 8a837a10451..c513eb7328e 100644
--- a/src/Parsers/ASTPartition.h
+++ b/src/Parsers/ASTPartition.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/Parsers/ASTTablesInSelectQuery.h b/src/Parsers/ASTTablesInSelectQuery.h
index 9d31ca6f653..dcc1cbe3557 100644
--- a/src/Parsers/ASTTablesInSelectQuery.h
+++ b/src/Parsers/ASTTablesInSelectQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
-#include <common/EnumReflection.h>
+#include <base/EnumReflection.h>
 
 
 namespace DB
diff --git a/src/Parsers/CommonParsers.cpp b/src/Parsers/CommonParsers.cpp
index f1aa8c5fde2..bffba4aa773 100644
--- a/src/Parsers/CommonParsers.cpp
+++ b/src/Parsers/CommonParsers.cpp
@@ -1,5 +1,5 @@
 #include <Parsers/CommonParsers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Parsers/DumpASTNode.h b/src/Parsers/DumpASTNode.h
index 27ea3b50d62..e1071f02dd3 100644
--- a/src/Parsers/DumpASTNode.h
+++ b/src/Parsers/DumpASTNode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Util/Application.h>
 #include <IO/Operators.h>
 
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index 88736e8137e..1c9c81ad378 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Common/Exception.h>
diff --git a/src/Parsers/IParser.h b/src/Parsers/IParser.h
index bf9fcb407ee..08c3f86538d 100644
--- a/src/Parsers/IParser.h
+++ b/src/Parsers/IParser.h
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include <Core/Defines.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/IAST.h>
 #include <Parsers/TokenIterator.h>
diff --git a/src/Parsers/Lexer.cpp b/src/Parsers/Lexer.cpp
index 24390773d18..3ac9d417b46 100644
--- a/src/Parsers/Lexer.cpp
+++ b/src/Parsers/Lexer.cpp
@@ -1,6 +1,6 @@
 #include <Parsers/Lexer.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Parsers/ParserCreateQuotaQuery.cpp b/src/Parsers/ParserCreateQuotaQuery.cpp
index 084c9f32690..682b345b937 100644
--- a/src/Parsers/ParserCreateQuotaQuery.cpp
+++ b/src/Parsers/ParserCreateQuotaQuery.cpp
@@ -10,7 +10,7 @@
 #include <Parsers/ASTRolesOrUsersSet.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Common/FieldVisitorConvertToNumber.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/algorithm/string/predicate.hpp>
 
 
diff --git a/src/Parsers/ParserCreateRowPolicyQuery.cpp b/src/Parsers/ParserCreateRowPolicyQuery.cpp
index 37c2aed7830..d4d3db3f846 100644
--- a/src/Parsers/ParserCreateRowPolicyQuery.cpp
+++ b/src/Parsers/ParserCreateRowPolicyQuery.cpp
@@ -10,7 +10,7 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ASTLiteral.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
 
diff --git a/src/Parsers/ParserCreateUserQuery.cpp b/src/Parsers/ParserCreateUserQuery.cpp
index 72246a27f80..7cada4b8ee8 100644
--- a/src/Parsers/ParserCreateUserQuery.cpp
+++ b/src/Parsers/ParserCreateUserQuery.cpp
@@ -13,7 +13,7 @@
 #include <Parsers/ASTSettingsProfileElement.h>
 #include <Parsers/ParserSettingsProfileElement.h>
 #include <Parsers/ParserDatabaseOrNone.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
diff --git a/src/Parsers/ParserDropAccessEntityQuery.cpp b/src/Parsers/ParserDropAccessEntityQuery.cpp
index d59b68ba5ad..14ef35e232c 100644
--- a/src/Parsers/ParserDropAccessEntityQuery.cpp
+++ b/src/Parsers/ParserDropAccessEntityQuery.cpp
@@ -5,7 +5,7 @@
 #include <Parsers/ASTRowPolicyName.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <Parsers/parseUserName.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Parsers/ParserShowAccessEntitiesQuery.cpp b/src/Parsers/ParserShowAccessEntitiesQuery.cpp
index 4e934327a14..96a275902fb 100644
--- a/src/Parsers/ParserShowAccessEntitiesQuery.cpp
+++ b/src/Parsers/ParserShowAccessEntitiesQuery.cpp
@@ -3,7 +3,7 @@
 #include <Parsers/CommonParsers.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Parsers/ParserShowCreateAccessEntityQuery.cpp b/src/Parsers/ParserShowCreateAccessEntityQuery.cpp
index 05b6b333d6a..86ee64ab778 100644
--- a/src/Parsers/ParserShowCreateAccessEntityQuery.cpp
+++ b/src/Parsers/ParserShowCreateAccessEntityQuery.cpp
@@ -6,7 +6,7 @@
 #include <Parsers/ASTRowPolicyName.h>
 #include <Parsers/parseUserName.h>
 #include <Parsers/parseDatabaseAndTableName.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <assert.h>
 
 
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 81afdad9a6e..b861cbd2a5a 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -7,7 +7,7 @@
 #include <Parsers/parseDatabaseAndTableName.h>
 
 #include <magic_enum.hpp>
-#include <common/EnumReflection.h>
+#include <base/EnumReflection.h>
 
 namespace ErrorCodes
 {
diff --git a/src/Parsers/StringRange.h b/src/Parsers/StringRange.h
index 1fc285a562e..3c5959fd0a3 100644
--- a/src/Parsers/StringRange.h
+++ b/src/Parsers/StringRange.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/TokenIterator.h>
 #include <map>
 #include <memory>
diff --git a/src/Parsers/examples/lexer.cpp b/src/Parsers/examples/lexer.cpp
index d54267c135e..9de2ad2eb72 100644
--- a/src/Parsers/examples/lexer.cpp
+++ b/src/Parsers/examples/lexer.cpp
@@ -1,6 +1,6 @@
 #include <map>
 #include <Parsers/Lexer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Parsers/formatSettingName.cpp b/src/Parsers/formatSettingName.cpp
index 351a1eb8ade..efbfffddd7b 100644
--- a/src/Parsers/formatSettingName.cpp
+++ b/src/Parsers/formatSettingName.cpp
@@ -1,7 +1,7 @@
 #include <Parsers/formatSettingName.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/quoteString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/Operators.h>
 
 
diff --git a/src/Parsers/formatSettingName.h b/src/Parsers/formatSettingName.h
index ba819ee2b4c..ac7610bfe8d 100644
--- a/src/Parsers/formatSettingName.h
+++ b/src/Parsers/formatSettingName.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iosfwd>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Parsers/fuzzers/lexer_fuzzer.cpp b/src/Parsers/fuzzers/lexer_fuzzer.cpp
index 8b0a7da238b..d7dd2cfe970 100644
--- a/src/Parsers/fuzzers/lexer_fuzzer.cpp
+++ b/src/Parsers/fuzzers/lexer_fuzzer.cpp
@@ -1,6 +1,6 @@
 #include <map>
 #include <Parsers/Lexer.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index fd65fc5bd33..ed09d648477 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -8,7 +8,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/typeid_cast.h>
 #include <Common/UTF8Helpers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
diff --git a/src/Parsers/queryNormalization.h b/src/Parsers/queryNormalization.h
index e5b1724ccfa..23bd79c0313 100644
--- a/src/Parsers/queryNormalization.h
+++ b/src/Parsers/queryNormalization.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <Core/Defines.h>
 #include <Parsers/Lexer.h>
diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp
index b051cedfb23..967f6848404 100644
--- a/src/Parsers/tests/gtest_dictionary_parser.cpp
+++ b/src/Parsers/tests/gtest_dictionary_parser.cpp
@@ -1,4 +1,4 @@
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ParserCreateQuery.h>
diff --git a/src/Processors/Executors/CompletedPipelineExecutor.cpp b/src/Processors/Executors/CompletedPipelineExecutor.cpp
index 7dc9e50c24b..be388386e9d 100644
--- a/src/Processors/Executors/CompletedPipelineExecutor.cpp
+++ b/src/Processors/Executors/CompletedPipelineExecutor.cpp
@@ -2,7 +2,7 @@
 #include <Processors/Executors/PipelineExecutor.h>
 #include <Processors/QueryPipeline.h>
 #include <Common/setThreadName.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 #include <iostream>
 
 namespace DB
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index d19eefeb53c..0616a392027 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -9,7 +9,7 @@
 #include <Processors/ISource.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 #ifndef NDEBUG
     #include <Common/Stopwatch.h>
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index 0652d81addc..a68d56bf499 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -7,7 +7,7 @@
 #include <Processors/Executors/ExecutingGraph.h>
 #include <Common/ThreadPool.h>
 #include <Common/EventCounter.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <queue>
 #include <stack>
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
index e1c5293302e..819344e4225 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
@@ -6,7 +6,7 @@
 #include <Processors/QueryPipeline.h>
 
 #include <Common/setThreadName.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 namespace DB
 {
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
index c2b68719202..a1a0755f952 100644
--- a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 
 #include <Common/setThreadName.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 namespace DB
 {
diff --git a/src/Processors/Formats/IRowInputFormat.cpp b/src/Processors/Formats/IRowInputFormat.cpp
index 52e64a9d90d..92f313d110d 100644
--- a/src/Processors/Formats/IRowInputFormat.cpp
+++ b/src/Processors/Formats/IRowInputFormat.cpp
@@ -1,6 +1,6 @@
 #include <Processors/Formats/IRowInputFormat.h>
 #include <IO/WriteHelpers.h>    // toString
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 0536e034fbf..feb826d5aa0 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -14,8 +14,8 @@
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/NestedUtils.h>
-#include <common/DateLUTImpl.h>
-#include <common/types.h>
+#include <base/DateLUTImpl.h>
+#include <base/types.h>
 #include <Processors/Chunk.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnNullable.h>
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
index 2e02d08ed0b..85397b7f6b7 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
@@ -9,8 +9,8 @@
 #include <capnp/serialize.h>
 #include <capnp/dynamic.h>
 #include <capnp/common.h>
-#include <common/logger_useful.h>
-#include <common/find_symbols.h>
+#include <base/logger_useful.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
index 8694c27d8f8..10fcd55bf8c 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
@@ -2,7 +2,7 @@
 #include <Formats/JSONEachRowUtils.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
diff --git a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
index 37a2ab473fc..a062d331a13 100644
--- a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
@@ -1,6 +1,6 @@
 #include <Processors/Formats/Impl/LineAsStringRowInputFormat.h>
 #include <Formats/JSONEachRowUtils.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
index e7a6435981b..65f4a329505 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
@@ -4,7 +4,7 @@
 
 #include <Common/Arena.h>
 #include <Common/ThreadPool.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 #include "IO/WriteBufferFromString.h"
 #include <Formats/FormatFactory.h>
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index 03c5b7de9bc..4be91299bdb 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -2,7 +2,7 @@
 #include <IO/ReadHelpers.h>
 #include <Common/CurrentThread.h>
 #include <Common/setThreadName.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 namespace DB
 {
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index 5cf83bd3bb3..3355b7334dc 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -9,7 +9,7 @@
 #include <IO/ReadBuffer.h>
 #include <Processors/Formats/IRowInputFormat.h>
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Event.h>
 
 
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index 44f115799ef..5137318c6e1 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -13,7 +13,7 @@
 #include "ArrowColumnToCHColumn.h"
 #include <DataTypes/NestedUtils.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp b/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
index 978dcb268b4..f7b8c144e0d 100644
--- a/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
@@ -8,7 +8,7 @@
 #   include <Formats/ProtobufSchemas.h>
 #   include <Formats/ProtobufSerializer.h>
 #   include <Interpreters/Context.h>
-#   include <common/range.h>
+#   include <base/range.h>
 
 
 namespace DB
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index 555c79f8064..c44dd912562 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Processors/Formats/Impl/RegexpRowInputFormat.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 1eb64682fae..6584c99aac7 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -7,7 +7,7 @@
 #include <Processors/Formats/Impl/ValuesBlockInputFormat.h>
 #include <Formats/FormatFactory.h>
 #include <Core/Block.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <Parsers/ASTLiteral.h>
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
index 2d873aa6bc6..592562c47b9 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
@@ -6,7 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 /// Maximum number of messages about incorrect data in the log.
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
index eaffe394ee4..f488ee61cc3 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
@@ -2,7 +2,7 @@
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <Core/SortCursor.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 namespace DB
 {
diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
index 7795292f922..328c34823a0 100644
--- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
@@ -1,7 +1,7 @@
 #include <Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h>
 #include <AggregateFunctions/IAggregateFunction.h>
-#include <common/DateLUTImpl.h>
-#include <common/DateLUT.h>
+#include <base/DateLUTImpl.h>
+#include <base/DateLUT.h>
 #include <DataTypes/DataTypeDateTime.h>
 
 
diff --git a/src/Processors/Merges/Algorithms/RowRef.h b/src/Processors/Merges/Algorithms/RowRef.h
index e4610c88581..88a69f5e9e9 100644
--- a/src/Processors/Merges/Algorithms/RowRef.h
+++ b/src/Processors/Merges/Algorithms/RowRef.h
@@ -4,7 +4,7 @@
 #include <Columns/IColumn.h>
 #include <Core/SortCursor.h>
 #include <Common/StackTrace.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
diff --git a/src/Processors/Merges/MergingSortedTransform.cpp b/src/Processors/Merges/MergingSortedTransform.cpp
index 92fafa4242c..62c7f4f762f 100644
--- a/src/Processors/Merges/MergingSortedTransform.cpp
+++ b/src/Processors/Merges/MergingSortedTransform.cpp
@@ -2,7 +2,7 @@
 #include <DataStreams/ColumnGathererStream.h>
 #include <IO/WriteBuffer.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index dac9e5798b8..bc44c43372f 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -21,7 +21,7 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/JSONBuilder.h>
 
 namespace ProfileEvents
diff --git a/src/Processors/QueryPlan/UnionStep.cpp b/src/Processors/QueryPlan/UnionStep.cpp
index 6d4036b1272..85705595479 100644
--- a/src/Processors/QueryPlan/UnionStep.cpp
+++ b/src/Processors/QueryPlan/UnionStep.cpp
@@ -3,7 +3,7 @@
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Interpreters/ExpressionActions.h>
-#include <common/defines.h>
+#include <base/defines.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
index 243b20edb1f..33bc5280422 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
@@ -1,7 +1,7 @@
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Core/SortCursor.h>
-#include <common/range.h>
+#include <base/range.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/ExceptionKeepingTransform.cpp b/src/Processors/Transforms/ExceptionKeepingTransform.cpp
index 41fc2b7d17c..5c968471e1b 100644
--- a/src/Processors/Transforms/ExceptionKeepingTransform.cpp
+++ b/src/Processors/Transforms/ExceptionKeepingTransform.cpp
@@ -1,7 +1,7 @@
 #include <Processors/Transforms/ExceptionKeepingTransform.h>
 #include <Common/ThreadStatus.h>
 #include <Common/Stopwatch.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <iostream>
 
 namespace DB
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index 08f70f28a7f..29ef4509359 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -2,7 +2,7 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/join_common.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/MergeSortingTransform.h b/src/Processors/Transforms/MergeSortingTransform.h
index c9ab804cdc8..f16bebc2f46 100644
--- a/src/Processors/Transforms/MergeSortingTransform.h
+++ b/src/Processors/Transforms/MergeSortingTransform.h
@@ -3,7 +3,7 @@
 #include <Processors/Transforms/SortingTransform.h>
 #include <Core/SortDescription.h>
 #include <Common/filesystemHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index ff62df8d939..5616d6cb088 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -3,7 +3,7 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Common/Arena.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include <Columns/ColumnConst.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index 0fb9d82aca6..3c7b35c2a7d 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -35,7 +35,7 @@
 #include <Poco/FileStream.h>
 #include <Poco/StreamCopier.h>
 #include <Poco/Util/LayeredConfiguration.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <grpc++/security/server_credentials.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
diff --git a/src/Server/HTTP/HTTPServer.h b/src/Server/HTTP/HTTPServer.h
index d95bdff0baa..3518fd66d20 100644
--- a/src/Server/HTTP/HTTPServer.h
+++ b/src/Server/HTTP/HTTPServer.h
@@ -5,7 +5,7 @@
 #include <Poco/Net/HTTPServerParams.h>
 #include <Poco/Net/TCPServer.h>
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 1d3ac4bfffc..aefa1fe68e1 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -29,8 +29,8 @@
 #include <Common/escapeForFileName.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
-#include <common/getFQDNOrHostName.h>
-#include <common/scope_guard.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/scope_guard.h>
 
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
diff --git a/src/Server/HTTPHandlerFactory.h b/src/Server/HTTPHandlerFactory.h
index 6297f988eaa..23176b79796 100644
--- a/src/Server/HTTPHandlerFactory.h
+++ b/src/Server/HTTPHandlerFactory.h
@@ -5,7 +5,7 @@
 #include <Server/HTTP/HTTPRequestHandlerFactory.h>
 #include <Server/HTTPHandlerRequestFilter.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Util/LayeredConfiguration.h>
 
diff --git a/src/Server/HTTPHandlerRequestFilter.h b/src/Server/HTTPHandlerRequestFilter.h
index f0474e8b953..078dcb04595 100644
--- a/src/Server/HTTPHandlerRequestFilter.h
+++ b/src/Server/HTTPHandlerRequestFilter.h
@@ -3,8 +3,8 @@
 #include <Server/HTTP/HTTPServerRequest.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/StringRef.h>
-#include <common/find_symbols.h>
+#include <base/StringRef.h>
+#include <base/find_symbols.h>
 
 #include <re2/re2.h>
 #include <re2/stringpiece.h>
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index d76361e856e..082f7cc2e33 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -9,7 +9,7 @@
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <Common/setThreadName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/Util/LayeredConfiguration.h>
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index 689884598f2..7ebbda9dfe6 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -11,7 +11,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/NetException.h>
 #include <Common/setThreadName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <chrono>
 #include <Common/PipeFDs.h>
 #include <Poco/Util/AbstractConfiguration.h>
diff --git a/src/Server/KeeperTCPHandlerFactory.h b/src/Server/KeeperTCPHandlerFactory.h
index 132a8b96c23..82ce56804d8 100644
--- a/src/Server/KeeperTCPHandlerFactory.h
+++ b/src/Server/KeeperTCPHandlerFactory.h
@@ -3,7 +3,7 @@
 #include <Server/KeeperTCPHandler.h>
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Net/NetException.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Server/IServer.h>
 #include <string>
 
diff --git a/src/Server/MySQLHandler.h b/src/Server/MySQLHandler.h
index 5258862cf23..12be8c12921 100644
--- a/src/Server/MySQLHandler.h
+++ b/src/Server/MySQLHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Poco/Net/TCPServerConnection.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/CurrentMetrics.h>
 #include <Core/MySQL/Authentication.h>
 #include <Core/MySQL/PacketsGeneric.h>
diff --git a/src/Server/MySQLHandlerFactory.cpp b/src/Server/MySQLHandlerFactory.cpp
index 46db9c8c328..7a0bfd8ab09 100644
--- a/src/Server/MySQLHandlerFactory.cpp
+++ b/src/Server/MySQLHandlerFactory.cpp
@@ -2,8 +2,8 @@
 #include <Common/OpenSSLHelpers.h>
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Server/MySQLHandler.h>
 
 #if USE_SSL
diff --git a/src/Server/PostgreSQLHandler.cpp b/src/Server/PostgreSQLHandler.cpp
index 226f1fea324..472bf421ce7 100644
--- a/src/Server/PostgreSQLHandler.cpp
+++ b/src/Server/PostgreSQLHandler.cpp
@@ -7,7 +7,7 @@
 #include "PostgreSQLHandler.h"
 #include <Parsers/parseQuery.h>
 #include <Common/setThreadName.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <random>
 
 #if !defined(ARCADIA_BUILD)
diff --git a/src/Server/PostgreSQLHandler.h b/src/Server/PostgreSQLHandler.h
index 36dd62d3dec..ca74b78a109 100644
--- a/src/Server/PostgreSQLHandler.h
+++ b/src/Server/PostgreSQLHandler.h
@@ -3,7 +3,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Core/PostgreSQLProtocol.h>
 #include <Poco/Net/TCPServerConnection.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "IServer.h"
 
 #if USE_SSL
diff --git a/src/Server/StaticRequestHandler.h b/src/Server/StaticRequestHandler.h
index 56c7f5a6d44..df9374d4409 100644
--- a/src/Server/StaticRequestHandler.h
+++ b/src/Server/StaticRequestHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Server/HTTP/HTTPRequestHandler.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index 3d1a3100a1a..c01dfa6c535 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -1,5 +1,5 @@
 #include <iomanip>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Common/CurrentThread.h>
@@ -32,7 +32,7 @@
 #include <Storages/ColumnDefault.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Compression/CompressionFactory.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <fmt/format.h>
 
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index f8860c16b2d..624031b60b7 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Net/TCPServerConnection.h>
 
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Stopwatch.h>
 #include <Core/Protocol.h>
diff --git a/src/Server/TCPHandlerFactory.h b/src/Server/TCPHandlerFactory.h
index fb50333193c..e610bea330c 100644
--- a/src/Server/TCPHandlerFactory.h
+++ b/src/Server/TCPHandlerFactory.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Net/NetException.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Server/IServer.h>
 #include <Server/TCPHandler.h>
 
diff --git a/src/Server/WebUIRequestHandler.cpp b/src/Server/WebUIRequestHandler.cpp
index fb8ff71611e..1dcad049f49 100644
--- a/src/Server/WebUIRequestHandler.cpp
+++ b/src/Server/WebUIRequestHandler.cpp
@@ -6,7 +6,7 @@
 #include <Poco/Util/LayeredConfiguration.h>
 
 #include <IO/HTTPCommon.h>
-#include <common/getResource.h>
+#include <base/getResource.h>
 
 
 namespace DB
diff --git a/src/Storages/CheckResults.h b/src/Storages/CheckResults.h
index 8fa0bb910d3..b342b014fa4 100644
--- a/src/Storages/CheckResults.h
+++ b/src/Storages/CheckResults.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <vector>
 
 namespace DB
diff --git a/src/Storages/ColumnDependency.h b/src/Storages/ColumnDependency.h
index 79bdaa06efa..6c3c96ec62a 100644
--- a/src/Storages/ColumnDependency.h
+++ b/src/Storages/ColumnDependency.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/SipHash.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <unordered_set>
 
 namespace DB
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index 935db1c912f..3e43ebb6eba 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -12,7 +12,7 @@
 #include <Common/ActionBlocker.h>
 #include <Common/formatReadable.h>
 #include <Common/Stopwatch.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Cluster.h>
 #include <Storages/Distributed/DirectoryMonitor.h>
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index 6596598476d..46dd6841616 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -30,9 +30,9 @@
 #include <Common/escapeForFileName.h>
 #include <Common/CurrentThread.h>
 #include <Common/createHardLink.h>
-#include <common/logger_useful.h>
-#include <common/range.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
+#include <base/scope_guard.h>
 
 #include <future>
 #include <condition_variable>
diff --git a/src/Storages/HDFS/HDFSCommon.cpp b/src/Storages/HDFS/HDFSCommon.cpp
index da56dafbdc3..25c454e7500 100644
--- a/src/Storages/HDFS/HDFSCommon.cpp
+++ b/src/Storages/HDFS/HDFSCommon.cpp
@@ -7,7 +7,7 @@
 #include <Common/Exception.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/HDFS/HDFSCommon.h b/src/Storages/HDFS/HDFSCommon.h
index 5c70a8997c3..0c007afdcfe 100644
--- a/src/Storages/HDFS/HDFSCommon.h
+++ b/src/Storages/HDFS/HDFSCommon.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include <hdfs/hdfs.h> // Y_IGNORE
-#include <common/types.h>
+#include <base/types.h>
 #include <mutex>
 
 #include <Interpreters/Context.h>
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.h b/src/Storages/HDFS/ReadBufferFromHDFS.h
index ad529ef01db..035a55bd0fa 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.h
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <memory>
 #include <hdfs/hdfs.h> // Y_IGNORE
-#include <common/types.h>
+#include <base/types.h>
 #include <Interpreters/Context.h>
 #include <IO/SeekableReadBuffer.h>
 
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index 268f2205b97..6ff8bb3f13f 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -8,8 +8,8 @@
 
 #include <Storages/IStorage.h>
 #include <Poco/URI.h>
-#include <common/logger_useful.h>
-#include <common/shared_ptr_helper.h>
+#include <base/logger_useful.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/IStorage_fwd.h b/src/Storages/IStorage_fwd.h
index 98ae9bea7c2..b9243b029b0 100644
--- a/src/Storages/IStorage_fwd.h
+++ b/src/Storages/IStorage_fwd.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <map>
 #include <memory>
diff --git a/src/Storages/IndicesDescription.h b/src/Storages/IndicesDescription.h
index d9c7efdb75c..7071ec89890 100644
--- a/src/Storages/IndicesDescription.h
+++ b/src/Storages/IndicesDescription.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.cpp b/src/Storages/Kafka/KafkaBlockInputStream.cpp
index d073155d55c..fd8fd86d334 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockInputStream.cpp
@@ -6,7 +6,7 @@
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
 #include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Processors/Executors/StreamingFormatExecutor.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Interpreters/Context.h>
 
 namespace DB
diff --git a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp
index 86037276166..a72d7b12a4f 100644
--- a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp
+++ b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp
@@ -1,6 +1,6 @@
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <cppkafka/cppkafka.h>
 #include <boost/algorithm/string/join.hpp>
diff --git a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
index ef829b86a24..4e9bf2e55c2 100644
--- a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
+++ b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 
 #include <cppkafka/cppkafka.h>
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index 8ab9127bf13..fdf653fb432 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -31,14 +31,14 @@
 #include <Common/config_version.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/quoteString.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Interpreters/Context.h>
 #include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <librdkafka/rdkafka.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 
 
 namespace DB
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index 2d3abca6059..f056a8aebfc 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -7,7 +7,7 @@
 #include <Common/SettingsChanges.h>
 
 #include <Poco/Semaphore.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <mutex>
 #include <list>
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index 335765405dd..4641a1631f2 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -22,7 +22,7 @@ limitations under the License. */
 #include <Processors/Transforms/SquashingChunksTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <DataStreams/copyData.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/typeid_cast.h>
 #include <Common/SipHash.h>
 #include <Common/hex.h>
diff --git a/src/Storages/LiveView/StorageLiveView.h b/src/Storages/LiveView/StorageLiveView.h
index b08b034ec3f..265f5d60ec4 100644
--- a/src/Storages/LiveView/StorageLiveView.h
+++ b/src/Storages/LiveView/StorageLiveView.h
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <Core/BackgroundSchedulePool.h>
 
diff --git a/src/Storages/MergeTree/ActiveDataPartSet.cpp b/src/Storages/MergeTree/ActiveDataPartSet.cpp
index 77fc2c2f0b9..f1c5134e800 100644
--- a/src/Storages/MergeTree/ActiveDataPartSet.cpp
+++ b/src/Storages/MergeTree/ActiveDataPartSet.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/ActiveDataPartSet.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <algorithm>
 #include <cassert>
 
diff --git a/src/Storages/MergeTree/ActiveDataPartSet.h b/src/Storages/MergeTree/ActiveDataPartSet.h
index 3d0ac8f949d..0b747ab83b9 100644
--- a/src/Storages/MergeTree/ActiveDataPartSet.h
+++ b/src/Storages/MergeTree/ActiveDataPartSet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/MergeTree/MergeTreePartInfo.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <map>
 #include <vector>
 
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 2683b5a6042..5f981b2ab1a 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -14,7 +14,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/NetException.h>
 #include <IO/createReadBufferFromFileBase.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <iterator>
 #include <regex>
diff --git a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
index 1f194092f5f..7f7e0e6295e 100644
--- a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
+++ b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
@@ -1,7 +1,7 @@
 #include <Storages/MergeTree/EphemeralLockInZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
-#include <common/logger_useful.h>
-#include <common/types.h>
+#include <base/logger_useful.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/FutureMergedMutatedPart.h b/src/Storages/MergeTree/FutureMergedMutatedPart.h
index 895f5209e74..9ff39b44c8c 100644
--- a/src/Storages/MergeTree/FutureMergedMutatedPart.h
+++ b/src/Storages/MergeTree/FutureMergedMutatedPart.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "common/types.h"
-#include "Storages/MergeTree/MergeTreeData.h"
-#include "Storages/MergeTree/MergeTreeDataPartType.h"
-#include "Storages/MergeTree/MergeTreePartInfo.h"
-#include "Storages/MergeTree/MergeType.h"
-#include "Storages/MergeTree/IMergeTreeDataPart.h"
+#include <base/types.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeDataPartType.h>
+#include <Storages/MergeTree/MergeTreePartInfo.h>
+#include <Storages/MergeTree/MergeType.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/IExecutableTask.h b/src/Storages/MergeTree/IExecutableTask.h
index 1430a96829b..00ae60ffe17 100644
--- a/src/Storages/MergeTree/IExecutableTask.h
+++ b/src/Storages/MergeTree/IExecutableTask.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <functional>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Interpreters/StorageID.h>
 
 namespace DB
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index af807fed471..dc2c5f8185d 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -15,8 +15,8 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <common/JSON.h>
-#include <common/logger_useful.h>
+#include <base/JSON.h>
+#include <base/logger_useful.h>
 #include <Compression/getCompressionCodecForFile.h>
 #include <Parsers/queryToString.h>
 #include <DataTypes/NestedUtils.h>
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index b88e19585e6..be48aed5c8b 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
diff --git a/src/Storages/MergeTree/LeaderElection.h b/src/Storages/MergeTree/LeaderElection.h
index 2810385e9e5..ccc5fada537 100644
--- a/src/Storages/MergeTree/LeaderElection.h
+++ b/src/Storages/MergeTree/LeaderElection.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 #include <memory>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
diff --git a/src/Storages/MergeTree/MergeAlgorithm.h b/src/Storages/MergeTree/MergeAlgorithm.h
index 23d6fc7137e..5f52b5be0fd 100644
--- a/src/Storages/MergeTree/MergeAlgorithm.h
+++ b/src/Storages/MergeTree/MergeAlgorithm.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
index 996999ac92d..653055d6d0b 100644
--- a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/MergeFromLogEntryTask.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 
diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp
index 23851825b92..cc1b411f01c 100644
--- a/src/Storages/MergeTree/MergeList.cpp
+++ b/src/Storages/MergeTree/MergeList.cpp
@@ -2,7 +2,7 @@
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Storages/MergeTree/FutureMergedMutatedPart.h>
 #include <Common/CurrentMetrics.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 #include <Common/CurrentThread.h>
 
 
diff --git a/src/Storages/MergeTree/MergeProgress.h b/src/Storages/MergeTree/MergeProgress.h
index d21edac76df..dd4922051b5 100644
--- a/src/Storages/MergeTree/MergeProgress.h
+++ b/src/Storages/MergeTree/MergeProgress.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "common/types.h"
-#include "Common/ProfileEvents.h"
-#include "IO/Progress.h"
-#include "Storages/MergeTree/MergeList.h"
+#include <base/types.h>
+#include <Common/ProfileEvents.h>
+#include <IO/Progress.h>
+#include <Storages/MergeTree/MergeList.h>
+
 
 namespace ProfileEvents
 {
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index e6b37d0657c..1e78689556a 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -3,7 +3,7 @@
 #include <memory>
 #include <fmt/format.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "Common/ActionBlocker.h"
 
 #include "Storages/MergeTree/MergeTreeData.h"
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
index 6f8ca074cdb..c59e53fb20e 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
@@ -11,8 +11,8 @@
 
 #include <boost/circular_buffer.hpp>
 
-#include <common/shared_ptr_helper.h>
-#include <common/logger_useful.h>
+#include <base/shared_ptr_helper.h>
+#include <base/logger_useful.h>
 #include <Common/ThreadPool.h>
 #include <Common/Stopwatch.h>
 #include <Storages/MergeTree/IExecutableTask.h>
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 30d5c94fc92..c04e0d2e38f 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -62,8 +62,8 @@
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/algorithm/string/join.hpp>
 
-#include <common/insertAtEnd.h>
-#include <common/scope_guard_safe.h>
+#include <base/insertAtEnd.h>
+#include <base/scope_guard_safe.h>
 
 #include <algorithm>
 #include <iomanip>
diff --git a/src/Storages/MergeTree/MergeTreeDataFormatVersion.h b/src/Storages/MergeTree/MergeTreeDataFormatVersion.h
index 7b21ac31609..1e21070dd6b 100644
--- a/src/Storages/MergeTree/MergeTreeDataFormatVersion.h
+++ b/src/Storages/MergeTree/MergeTreeDataFormatVersion.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/strong_typedef.h>
+#include <base/types.h>
+#include <base/strong_typedef.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
index 759e6a79ee4..06f1fb06f25 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
@@ -2,7 +2,7 @@
 #include <map>
 #include <optional>
 #include <city.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index 635da7e2ede..f80c2a67cc6 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/NestedUtils.h>
 #include <Interpreters/Context.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp b/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp
index f1beb09c482..98af2aada10 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp
@@ -4,7 +4,7 @@
 #include <Common/quoteString.h>
 #include <algorithm>
 
-#include <common/JSON.h>
+#include <base/JSON.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataPartType.h b/src/Storages/MergeTree/MergeTreeDataPartType.h
index d658fafc510..fecd9d00cdc 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartType.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index d65873e419d..03d76a7f79b 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -1,5 +1,5 @@
 #include <boost/rational.hpp>   /// For calculations related to sampling coefficients.
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 #include <optional>
 #include <unordered_set>
 
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
index 281a76050a2..eda217798b2 100644
--- a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Core/Types.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <IO/WriteBufferFromFile.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <map>
diff --git a/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
index 90178ec38b9..b19080b5097 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.h>
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
index cec09f53cdf..950765ed2b9 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -2,8 +2,8 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/ExpressionAnalyzer.h>
-#include <common/types.h>
-#include <common/bit_cast.h>
+#include <base/types.h>
+#include <base/bit_cast.h>
 #include <Parsers/ASTLiteral.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
index 21a86f9bcea..92e889ec762 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
 #include <Disks/IDisk.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
index 6a027b8cb8e..9bc00274740 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
@@ -5,7 +5,7 @@
 #include <Columns/ColumnFixedString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Common/HashTable/Hash.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Interpreters/BloomFilterHash.h>
 #include <IO/WriteHelpers.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.h b/src/Storages/MergeTree/MergeTreeMutationEntry.h
index 278babb67b9..e01ce4320b3 100644
--- a/src/Storages/MergeTree/MergeTreeMutationEntry.h
+++ b/src/Storages/MergeTree/MergeTreeMutationEntry.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MutationCommands.h>
diff --git a/src/Storages/MergeTree/MergeTreeMutationStatus.h b/src/Storages/MergeTree/MergeTreeMutationStatus.h
index 94d9294624f..acda43b9254 100644
--- a/src/Storages/MergeTree/MergeTreeMutationStatus.h
+++ b/src/Storages/MergeTree/MergeTreeMutationStatus.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Names.h>
 #include <optional>
 #include <map>
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 73761048035..df3d9cb9237 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -5,8 +5,8 @@
 #include <tuple>
 #include <vector>
 #include <array>
-#include <common/types.h>
-#include <common/DayNum.h>
+#include <base/types.h>
+#include <base/DayNum.h>
 #include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
 
 
diff --git a/src/Storages/MergeTree/MergeTreePartition.h b/src/Storages/MergeTree/MergeTreePartition.h
index 67e7a246c30..acc565e2ce9 100644
--- a/src/Storages/MergeTree/MergeTreePartition.h
+++ b/src/Storages/MergeTree/MergeTreePartition.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 #include <IO/WriteBuffer.h>
 #include <Storages/KeyDescription.h>
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
index 7517908feb3..2f6bc10e472 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -1,7 +1,7 @@
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Columns/FilterDescription.h>
 #include <Columns/ColumnsCommon.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <Interpreters/castColumn.h>
 #include <DataTypes/DataTypeNothing.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.h b/src/Storages/MergeTree/MergeTreeRangeReader.h
index 8cdf485ff1e..d099d2475d2 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.h
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Core/Block.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Storages/MergeTree/MarkRange.h>
 
 namespace DB
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.cpp b/src/Storages/MergeTree/MergeTreeReadPool.cpp
index b18f22c3ab1..d08cec24184 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPool.cpp
@@ -1,7 +1,7 @@
 #include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <Storages/MergeTree/MergeTreeBaseSelectProcessor.h>
 #include <Common/formatReadable.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace ProfileEvents
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index 1f33f3eb092..7fd2b7f0608 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -12,7 +12,7 @@
 #include <Interpreters/misc.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/NestedUtils.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/MergeType.h b/src/Storages/MergeTree/MergeType.h
index 9c6d4759cd0..53d55dc68a7 100644
--- a/src/Storages/MergeTree/MergeType.h
+++ b/src/Storages/MergeTree/MergeType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
index 94875311c9c..112d49b6258 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/MutateFromLogEntryTask.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.h b/src/Storages/MergeTree/MutateFromLogEntryTask.h
index 11486dc92a2..75368be30da 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.h
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/MergeTree/IExecutableTask.h>
 #include <Storages/MergeTree/MutateTask.h>
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index e1800ce0e55..acb86dfef2d 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/MutateTask.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/escapeForFileName.h>
 #include <DataStreams/TTLBlockInputStream.h>
 #include <DataStreams/TTLCalcInputStream.h>
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
index 9e54ae8a8ed..a8d29d9866e 100644
--- a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <vector>
-#include <common/logger_useful.h>
-#include <common/types.h>
+#include <base/logger_useful.h>
+#include <base/types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Core/UUID.h>
 #include <Core/BackgroundSchedulePool.h>
diff --git a/src/Storages/MergeTree/ReplicatedFetchList.cpp b/src/Storages/MergeTree/ReplicatedFetchList.cpp
index 6d4451ad3e0..7c33e11f9a8 100644
--- a/src/Storages/MergeTree/ReplicatedFetchList.cpp
+++ b/src/Storages/MergeTree/ReplicatedFetchList.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/ReplicatedFetchList.h>
 #include <Common/CurrentMetrics.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
index d56cd7bea15..ed529c43a7d 100644
--- a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Storages/MergeTree/IExecutableTask.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h b/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
index 8e7ab0c69fe..5382b572b81 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
index 939a40db8c8..509b52ec07f 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/randomSeed.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <thread>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index 3752c9deb8f..128b927fa99 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -2,7 +2,7 @@
 
 #include <Common/Exception.h>
 #include <Common/ZooKeeper/Types.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
 #include <Storages/MergeTree/MergeType.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
index 4d8261da2ee..db931e771cf 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
@@ -3,7 +3,7 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 
 
-#include <common/types.h>
+#include <base/types.h>
 #include <optional>
 #include <mutex>
 #include <city.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
index e157985964f..ca5ec601a99 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <optional>
 #include <mutex>
 #include <vector>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
index 6229b13c47f..e1c7bcb9042 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Storages/MutationCommands.h>
 #include <map>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
index 8257898fe3f..e9366d7fb12 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
@@ -8,8 +8,8 @@
 #include <atomic>
 #include <boost/noncopyable.hpp>
 #include <Poco/Event.h>
-#include <common/types.h>
-#include <common/logger_useful.h>
+#include <base/types.h>
+#include <base/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Storages/CheckResults.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h b/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h
index 7bc2b72d2d5..e3df020a54c 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/MergeTree/MergeTreeDataPartChecksum.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteBuffer.h>
 #include <IO/ReadBuffer.h>
 #include <IO/Operators.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
index ee12cabb5aa..f560850a6c6 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <set>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBuffer.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index cb10d628349..bdade4e0bb2 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <Poco/Event.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <thread>
 #include <atomic>
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
index 75f002c6b42..7df82fd397e 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
@@ -2,7 +2,7 @@
 
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace Poco { class Logger; }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
index d7cd215c2db..2f9a9d58834 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
@@ -2,7 +2,7 @@
 
 #include <Parsers/IAST.h>
 #include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Storages/StorageInMemoryMetadata.h>
 
 namespace DB
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index 88e27cef7bf..23ea280e88c 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -9,7 +9,7 @@
 #include <Processors/QueryPipelineBuilder.h>
 #include <Core/Defines.h>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/TTLMergeSelector.h b/src/Storages/MergeTree/TTLMergeSelector.h
index 710b85b3474..d41ba6f519d 100644
--- a/src/Storages/MergeTree/TTLMergeSelector.h
+++ b/src/Storages/MergeTree/TTLMergeSelector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Storages/MergeTree/MergeSelector.h>
 #include <Storages/TTLDescription.h>
 
diff --git a/src/Storages/MergeTree/localBackup.h b/src/Storages/MergeTree/localBackup.h
index 630767c9ec6..066ba8f7489 100644
--- a/src/Storages/MergeTree/localBackup.h
+++ b/src/Storages/MergeTree/localBackup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 
 namespace DB
diff --git a/src/Storages/MutationCommands.cpp b/src/Storages/MutationCommands.cpp
index e7295e829e3..2c678574eb6 100644
--- a/src/Storages/MutationCommands.cpp
+++ b/src/Storages/MutationCommands.cpp
@@ -15,7 +15,7 @@
 #include <Core/Defines.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Parsers/queryToString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/MutationCommands.h b/src/Storages/MutationCommands.h
index 41d3dbfee27..cf1116f547a 100644
--- a/src/Storages/MutationCommands.h
+++ b/src/Storages/MutationCommands.h
@@ -5,7 +5,7 @@
 #include <memory>
 #include <unordered_map>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Storages/IStorage_fwd.h>
 #include <DataTypes/IDataType.h>
diff --git a/src/Storages/PartitionCommands.h b/src/Storages/PartitionCommands.h
index 554b86f4e76..9807c90bc23 100644
--- a/src/Storages/PartitionCommands.h
+++ b/src/Storages/PartitionCommands.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Field.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST.h>
 #include <Storages/IStorage_fwd.h>
 
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
index 88f4ff4b4da..5a99be7f38c 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
@@ -5,7 +5,7 @@
 
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Names.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Storages/IStorage.h>
 #include <DataStreams/OneBlockInputStream.h>
 #include <Parsers/ASTExpressionList.h>
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index 1b17e6c0c6e..b9aff828a5f 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -1,7 +1,7 @@
 #include "StorageMaterializedPostgreSQL.h"
 
 #if USE_LIBPQXX
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Macros.h>
 #include <Common/parseAddress.h>
 #include <Common/assert_cast.h>
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
index 62bc6ed713f..4b1fa1d5b04 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
@@ -17,7 +17,7 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/ExpressionAnalyzer.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <memory>
 
 
diff --git a/src/Storages/RabbitMQ/RabbitMQConnection.cpp b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
index 1fec7aec08a..a29518c8cfe 100644
--- a/src/Storages/RabbitMQ/RabbitMQConnection.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
@@ -1,6 +1,6 @@
 #include "RabbitMQConnection.h"
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/WriteHelpers.h>
 
 
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.cpp b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
index 85d8063a73f..c7548b80c26 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
@@ -1,4 +1,4 @@
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
 
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.h b/src/Storages/RabbitMQ/RabbitMQHandler.h
index 52db4a1a8f9..8f355c4a0dc 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.h
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.h
@@ -5,7 +5,7 @@
 #include <mutex>
 #include <amqpcpp.h>
 #include <amqpcpp/linux_tcp.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <amqpcpp/libuv.h>
 
 namespace DB
diff --git a/src/Storages/RabbitMQ/RabbitMQSink.cpp b/src/Storages/RabbitMQ/RabbitMQSink.cpp
index b71f3ce86b7..bece0d028ec 100644
--- a/src/Storages/RabbitMQ/RabbitMQSink.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQSink.cpp
@@ -2,7 +2,7 @@
 #include <Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h>
 #include <Storages/RabbitMQ/StorageRabbitMQ.h>
 #include <Formats/FormatFactory.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
index 96ea5217c56..2e2807d8297 100644
--- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
+++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
@@ -7,7 +7,7 @@
 #include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
 #include <boost/algorithm/string/split.hpp>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "Poco/Timer.h"
 #include <amqpcpp.h>
 
diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
index 4725f92d65c..55d129856b8 100644
--- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
+++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <amqpcpp.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index ba851b2f92c..5efc7f13526 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -28,7 +28,7 @@
 #include <Common/config_version.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/quoteString.h>
 #include <Common/parseAddress.h>
 #include <Processors/Sources/SourceFromInputStream.h>
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index 64a78b235e3..e9351058e95 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -3,7 +3,7 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Storages/IStorage.h>
 #include <Poco/Semaphore.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <mutex>
 #include <atomic>
 #include <Storages/RabbitMQ/Buffer_fwd.h>
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
index 65dd1a6ab72..1929a103414 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <amqpcpp.h>
 #include <uv.h>
 #include <chrono>
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 820b7c94ebd..1ab168f772f 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -28,7 +28,7 @@
 
 #include <Poco/Logger.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <rocksdb/db.h>
 #include <rocksdb/table.h>
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index ade4bd58bf4..d45d3dd320c 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 #include <shared_mutex>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <rocksdb/status.h>
 
diff --git a/src/Storages/RocksDB/StorageSystemRocksDB.h b/src/Storages/RocksDB/StorageSystemRocksDB.h
index e94bdb06aee..8394fc3dd3a 100644
--- a/src/Storages/RocksDB/StorageSystemRocksDB.h
+++ b/src/Storages/RocksDB/StorageSystemRocksDB.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index c71335f8478..9747ea2dbf6 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -18,9 +18,9 @@
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
 #include <Common/ProfileEvents.h>
-#include <common/logger_useful.h>
-#include <common/getThreadId.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/getThreadId.h>
+#include <base/range.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index 8749cf47eb9..59f250d67b8 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -4,7 +4,7 @@
 #include <Core/NamesAndTypes.h>
 #include <DataStreams/IBlockOutputStream.h>
 #include <Storages/IStorage.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Poco/Event.h>
 
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index c7693bdae9a..7d0af8c0ee3 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <atomic>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index 3f785d54422..50e9c935a17 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/Distributed/DirectoryMonitor.h>
@@ -9,7 +9,7 @@
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
 #include <Parsers/ASTFunction.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ActionBlocker.h>
 #include <Interpreters/Cluster.h>
 
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
index c67891d876f..0d17e003ce4 100644
--- a/src/Storages/StorageExecutable.h
+++ b/src/Storages/StorageExecutable.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/logger_useful.h>
-#include <common/shared_ptr_helper.h>
+#include <base/logger_useful.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <DataStreams/ShellCommandSource.h>
 #include <Storages/ExecutableSettings.h>
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
index 52f8262398c..ce76ab4a723 100644
--- a/src/Storages/StorageExternalDistributed.cpp
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -16,7 +16,7 @@
 #include <Storages/StoragePostgreSQL.h>
 #include <Storages/StorageURL.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
index 9f04133d63d..c29bfcd891f 100644
--- a/src/Storages/StorageExternalDistributed.h
+++ b/src/Storages/StorageExternalDistributed.h
@@ -4,7 +4,7 @@
 #include "config_core.h"
 #endif
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index b80333e7ba8..09ea44d1405 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <Storages/IStorage.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <atomic>
 #include <shared_mutex>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index abe288bd999..cfec328bbfc 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -24,7 +24,7 @@
 
 #include <Common/SipHash.h>
 #include <Common/randomSeed.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <Functions/FunctionFactory.h>
 
diff --git a/src/Storages/StorageGenerateRandom.h b/src/Storages/StorageGenerateRandom.h
index 61fd68cb80c..d11a43b1dd6 100644
--- a/src/Storages/StorageGenerateRandom.h
+++ b/src/Storages/StorageGenerateRandom.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/StorageInput.h b/src/Storages/StorageInput.h
index c3c40cab7a5..bfb634c6bba 100644
--- a/src/Storages/StorageInput.h
+++ b/src/Storages/StorageInput.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/IStorage.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Processors/Pipe.h>
 
 namespace DB
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index 6a08773ecc8..04d734944a6 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/StorageSet.h>
 #include <Storages/JoinSettings.h>
diff --git a/src/Storages/StorageLog.h b/src/Storages/StorageLog.h
index b4cd15ef258..e06f884bdd1 100644
--- a/src/Storages/StorageLog.h
+++ b/src/Storages/StorageLog.h
@@ -2,7 +2,7 @@
 
 #include <map>
 #include <shared_mutex>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Disks/IDisk.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageLogSettings.h b/src/Storages/StorageLogSettings.h
index 0918c50aa19..0903c034ec6 100644
--- a/src/Storages/StorageLogSettings.h
+++ b/src/Storages/StorageLogSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index d282ece7f56..b6f677e84bb 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index 88539d0e731..846fd4af5fd 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -4,7 +4,7 @@
 #include <optional>
 #include <mutex>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index b5958e234d1..ea42b48cace 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -22,7 +22,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <Databases/IDatabase.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <algorithm>
 #include <Parsers/queryToString.h>
 #include <Processors/Transforms/MaterializingTransform.h>
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index b6001815f85..b9a127515f8 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Common/OptimizedRegularExpression.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index 08cce514d71..dd5ac26c3eb 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/Names.h>
 #include <Storages/AlterCommands.h>
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index c925418c888..00c6863ab63 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/ExternalDataSourceConfiguration.h>
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index 12ffc549fea..f2907c0d707 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -21,7 +21,7 @@
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Processors/Pipe.h>
 #include <Common/parseRemoteDescription.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index 8c377891065..134c9939e3e 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -6,7 +6,7 @@
 
 #if USE_MYSQL
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/MySQL/MySQLSettings.h>
diff --git a/src/Storages/StorageNull.h b/src/Storages/StorageNull.h
index fda6faffb1e..1c2d5418ef7 100644
--- a/src/Storages/StorageNull.h
+++ b/src/Storages/StorageNull.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index cfc9d292fa7..47a3e4091f5 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -7,7 +7,7 @@
 #include <Common/assert_cast.h>
 #include <Common/parseRemoteDescription.h>
 #include <Core/Settings.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeArray.h>
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index 43af1aab0c1..b4bb5400930 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -5,7 +5,7 @@
 #endif
 
 #if USE_LIBPQXX
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
 #include <DataStreams/IBlockOutputStream.h>
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 457361b214f..e5d59f2a950 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -65,9 +65,9 @@
 
 #include <Poco/DirectoryIterator.h>
 
-#include <common/range.h>
-#include <common/scope_guard.h>
-#include <common/scope_guard_safe.h>
+#include <base/range.h>
+#include <base/scope_guard.h>
+#include <base/scope_guard_safe.h>
 
 #include <algorithm>
 #include <ctime>
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index e76a54ac5ec..65e07fa6144 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <atomic>
 #include <pcg_random.hpp>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index d51581be74b..89bbdda87f9 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -13,8 +13,8 @@
 
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Poco/URI.h>
-#include <common/logger_useful.h>
-#include <common/shared_ptr_helper.h>
+#include <base/logger_useful.h>
+#include <base/shared_ptr_helper.h>
 #include <IO/S3Common.h>
 #include <IO/CompressionMethod.h>
 #include <Interpreters/Context.h>
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index a278b9d3dec..e4ae27e43bf 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -36,7 +36,7 @@
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <aws/core/auth/AWSCredentials.h>
 #include <aws/s3/S3Client.h>
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index 81d82052d4d..b9ce0a15dfa 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <optional>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include "Client/Connection.h"
 #include <Interpreters/Cluster.h>
diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h
index 63f758c816e..ed0fae49d4e 100644
--- a/src/Storages/StorageS3Settings.h
+++ b/src/Storages/StorageS3Settings.h
@@ -5,7 +5,7 @@
 #include <mutex>
 #include <optional>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace Poco::Util
 {
diff --git a/src/Storages/StorageSQLite.cpp b/src/Storages/StorageSQLite.cpp
index 6a8a3846ae7..9a37696bb1c 100644
--- a/src/Storages/StorageSQLite.cpp
+++ b/src/Storages/StorageSQLite.cpp
@@ -1,8 +1,8 @@
 #include "StorageSQLite.h"
 
 #if USE_SQLITE
-#include <common/range.h>
-#include <common/logger_useful.h>
+#include <base/range.h>
+#include <base/logger_useful.h>
 #include <DataStreams/SQLiteSource.h>
 #include <Databases/SQLite/SQLiteUtils.h>
 #include <DataTypes/DataTypeString.h>
diff --git a/src/Storages/StorageSQLite.h b/src/Storages/StorageSQLite.h
index 26ec9fb911a..47ed40bef75 100644
--- a/src/Storages/StorageSQLite.h
+++ b/src/Storages/StorageSQLite.h
@@ -5,7 +5,7 @@
 #endif
 
 #if USE_SQLITE
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 #include <sqlite3.h> // Y_IGNORE
diff --git a/src/Storages/StorageSet.h b/src/Storages/StorageSet.h
index 1166557ec8e..77e0165e310 100644
--- a/src/Storages/StorageSet.h
+++ b/src/Storages/StorageSet.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageStripeLog.h b/src/Storages/StorageStripeLog.h
index 73d46b1e617..6ca9552cd11 100644
--- a/src/Storages/StorageStripeLog.h
+++ b/src/Storages/StorageStripeLog.h
@@ -3,7 +3,7 @@
 #include <map>
 #include <shared_mutex>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/Defines.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageTinyLog.h b/src/Storages/StorageTinyLog.h
index ef45e9fb74d..b25b79afe1f 100644
--- a/src/Storages/StorageTinyLog.h
+++ b/src/Storages/StorageTinyLog.h
@@ -2,7 +2,7 @@
 
 #include <map>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/Defines.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index fe89ad967d7..5fb0ec13a9a 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -21,7 +21,7 @@
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/QueryPipelineBuilder.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <algorithm>
 
 
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 930272ab1aa..fdff2cff077 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -2,7 +2,7 @@
 
 #include <Storages/IStorage.h>
 #include <Poco/URI.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Formats/FormatSettings.h>
 #include <IO/CompressionMethod.h>
diff --git a/src/Storages/StorageValues.h b/src/Storages/StorageValues.h
index 4d6d168441c..69b2f757046 100644
--- a/src/Storages/StorageValues.h
+++ b/src/Storages/StorageValues.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/StorageView.h b/src/Storages/StorageView.h
index a59328cd471..5ca23434356 100644
--- a/src/Storages/StorageView.h
+++ b/src/Storages/StorageView.h
@@ -4,7 +4,7 @@
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index 7c5aa2fa176..a1254e2aaeb 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -12,7 +12,7 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageURL.h>
 #include <Storages/transformQueryForExternalDatabase.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/escapeForFileName.h>
 
 
diff --git a/src/Storages/System/IStorageSystemOneBlock.h b/src/Storages/System/IStorageSystemOneBlock.h
index 37089ac8e3d..c074659af2b 100644
--- a/src/Storages/System/IStorageSystemOneBlock.h
+++ b/src/Storages/System/IStorageSystemOneBlock.h
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/IStorage.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Pipe.h>
 
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
index 0528dc76ff5..97b84a49cde 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemAsynchronousInserts.h b/src/Storages/System/StorageSystemAsynchronousInserts.h
index 0d7cbbe4eaf..79f19ec3d97 100644
--- a/src/Storages/System/StorageSystemAsynchronousInserts.h
+++ b/src/Storages/System/StorageSystemAsynchronousInserts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.h b/src/Storages/System/StorageSystemAsynchronousMetrics.h
index d28ddc545d9..de8b9b93378 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.h
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemBuildOptions.h b/src/Storages/System/StorageSystemBuildOptions.h
index e0792b64ef6..4ecc1b21426 100644
--- a/src/Storages/System/StorageSystemBuildOptions.h
+++ b/src/Storages/System/StorageSystemBuildOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index c2eb6a5e02d..1e6bfff8a85 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemCollations.h b/src/Storages/System/StorageSystemCollations.h
index 51e0e456586..1a58deba989 100644
--- a/src/Storages/System/StorageSystemCollations.h
+++ b/src/Storages/System/StorageSystemCollations.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemColumns.h b/src/Storages/System/StorageSystemColumns.h
index 015b8627c4b..adcbf384ca7 100644
--- a/src/Storages/System/StorageSystemColumns.h
+++ b/src/Storages/System/StorageSystemColumns.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemContributors.h b/src/Storages/System/StorageSystemContributors.h
index d25fa7aa933..04a70a840f8 100644
--- a/src/Storages/System/StorageSystemContributors.h
+++ b/src/Storages/System/StorageSystemContributors.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemCurrentRoles.h b/src/Storages/System/StorageSystemCurrentRoles.h
index d3e21290290..4b0547b7f0c 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.h
+++ b/src/Storages/System/StorageSystemCurrentRoles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.h b/src/Storages/System/StorageSystemDDLWorkerQueue.h
index 9c29172f0f5..50eb2e10c7c 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.h
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Interpreters/DDLWorker.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <future>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.h b/src/Storages/System/StorageSystemDataSkippingIndices.h
index 8497f16606f..72f66b025cf 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.h
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.h b/src/Storages/System/StorageSystemDataTypeFamilies.h
index 0cc347467c2..2ff04039471 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.h
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemDatabases.h b/src/Storages/System/StorageSystemDatabases.h
index 3d0ff9da6cd..4aaae1bfd7f 100644
--- a/src/Storages/System/StorageSystemDatabases.h
+++ b/src/Storages/System/StorageSystemDatabases.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index 1a9418485e5..068347afa92 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
diff --git a/src/Storages/System/StorageSystemDictionaries.cpp b/src/Storages/System/StorageSystemDictionaries.cpp
index 5a4e54a9e7f..0826bb58473 100644
--- a/src/Storages/System/StorageSystemDictionaries.cpp
+++ b/src/Storages/System/StorageSystemDictionaries.cpp
@@ -15,7 +15,7 @@
 #include <Columns/ColumnString.h>
 #include <Core/Names.h>
 
-#include <common/map.h>
+#include <base/map.h>
 #include <mutex>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemDictionaries.h b/src/Storages/System/StorageSystemDictionaries.h
index b144445a3b4..f862748789a 100644
--- a/src/Storages/System/StorageSystemDictionaries.h
+++ b/src/Storages/System/StorageSystemDictionaries.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemDisks.h b/src/Storages/System/StorageSystemDisks.h
index 1274903ff00..d6908a295d4 100644
--- a/src/Storages/System/StorageSystemDisks.h
+++ b/src/Storages/System/StorageSystemDisks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
diff --git a/src/Storages/System/StorageSystemDistributionQueue.h b/src/Storages/System/StorageSystemDistributionQueue.h
index cb2812a5aab..97c327827dc 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.h
+++ b/src/Storages/System/StorageSystemDistributionQueue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemEnabledRoles.h b/src/Storages/System/StorageSystemEnabledRoles.h
index 2c385d40c85..9d78b20109b 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.h
+++ b/src/Storages/System/StorageSystemEnabledRoles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemErrors.h b/src/Storages/System/StorageSystemErrors.h
index 114a138e907..f0ef0f7228a 100644
--- a/src/Storages/System/StorageSystemErrors.h
+++ b/src/Storages/System/StorageSystemErrors.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemEvents.h b/src/Storages/System/StorageSystemEvents.h
index b94833d09e2..e765c60b6fa 100644
--- a/src/Storages/System/StorageSystemEvents.h
+++ b/src/Storages/System/StorageSystemEvents.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemFormats.h b/src/Storages/System/StorageSystemFormats.h
index 0db47496107..5e0dfeeefb9 100644
--- a/src/Storages/System/StorageSystemFormats.h
+++ b/src/Storages/System/StorageSystemFormats.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemFunctions.h b/src/Storages/System/StorageSystemFunctions.h
index 9781d5a7f12..bdb2c9ca274 100644
--- a/src/Storages/System/StorageSystemFunctions.h
+++ b/src/Storages/System/StorageSystemFunctions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemGrants.h b/src/Storages/System/StorageSystemGrants.h
index b511b4b77cf..0cc6cff3e84 100644
--- a/src/Storages/System/StorageSystemGrants.h
+++ b/src/Storages/System/StorageSystemGrants.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemGraphite.h b/src/Storages/System/StorageSystemGraphite.h
index 80325b0e2cb..6c529558471 100644
--- a/src/Storages/System/StorageSystemGraphite.h
+++ b/src/Storages/System/StorageSystemGraphite.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemLicenses.h b/src/Storages/System/StorageSystemLicenses.h
index 1dd30fd7cff..0876d01c311 100644
--- a/src/Storages/System/StorageSystemLicenses.h
+++ b/src/Storages/System/StorageSystemLicenses.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemMacros.h b/src/Storages/System/StorageSystemMacros.h
index fec0995b827..90032957c57 100644
--- a/src/Storages/System/StorageSystemMacros.h
+++ b/src/Storages/System/StorageSystemMacros.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataTypes/DataTypeString.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.h b/src/Storages/System/StorageSystemMergeTreeSettings.h
index 64aec4634b2..0c9e857b8e6 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.h
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
diff --git a/src/Storages/System/StorageSystemMerges.h b/src/Storages/System/StorageSystemMerges.h
index f88925cda67..48a07620d19 100644
--- a/src/Storages/System/StorageSystemMerges.h
+++ b/src/Storages/System/StorageSystemMerges.h
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemMetrics.h b/src/Storages/System/StorageSystemMetrics.h
index b1a8cb52231..107f2c05fb1 100644
--- a/src/Storages/System/StorageSystemMetrics.h
+++ b/src/Storages/System/StorageSystemMetrics.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemModels.h b/src/Storages/System/StorageSystemModels.h
index 3ec279f7f44..491fa63ca5a 100644
--- a/src/Storages/System/StorageSystemModels.h
+++ b/src/Storages/System/StorageSystemModels.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemMutations.h b/src/Storages/System/StorageSystemMutations.h
index 350998c9d9e..f3c77e349b0 100644
--- a/src/Storages/System/StorageSystemMutations.h
+++ b/src/Storages/System/StorageSystemMutations.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemNumbers.h b/src/Storages/System/StorageSystemNumbers.h
index 960c354fda2..da16dc73ca8 100644
--- a/src/Storages/System/StorageSystemNumbers.h
+++ b/src/Storages/System/StorageSystemNumbers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <optional>
 #include <Storages/IStorage.h>
 
diff --git a/src/Storages/System/StorageSystemOne.h b/src/Storages/System/StorageSystemOne.h
index 71a29847919..3fe0c91113c 100644
--- a/src/Storages/System/StorageSystemOne.h
+++ b/src/Storages/System/StorageSystemOne.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.h b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
index 64344a7a8a1..a73b594f1c8 100644
--- a/src/Storages/System/StorageSystemPartMovesBetweenShards.h
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemParts.h b/src/Storages/System/StorageSystemParts.h
index df436f8f972..69e957c5a1e 100644
--- a/src/Storages/System/StorageSystemParts.h
+++ b/src/Storages/System/StorageSystemParts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index 86f62e37fad..aec52e6b410 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
diff --git a/src/Storages/System/StorageSystemPartsColumns.h b/src/Storages/System/StorageSystemPartsColumns.h
index 842b3834561..c3e3eaefcf7 100644
--- a/src/Storages/System/StorageSystemPartsColumns.h
+++ b/src/Storages/System/StorageSystemPartsColumns.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemPrivileges.h b/src/Storages/System/StorageSystemPrivileges.h
index a10e768e041..dad12d14ac0 100644
--- a/src/Storages/System/StorageSystemPrivileges.h
+++ b/src/Storages/System/StorageSystemPrivileges.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemProcesses.h b/src/Storages/System/StorageSystemProcesses.h
index 9daf079800f..c22b83df6d0 100644
--- a/src/Storages/System/StorageSystemProcesses.h
+++ b/src/Storages/System/StorageSystemProcesses.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemProjectionParts.h b/src/Storages/System/StorageSystemProjectionParts.h
index a4197769b0d..a8db87fbba4 100644
--- a/src/Storages/System/StorageSystemProjectionParts.h
+++ b/src/Storages/System/StorageSystemProjectionParts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemProjectionPartsColumns.h b/src/Storages/System/StorageSystemProjectionPartsColumns.h
index 64ef1e2c286..10e80877285 100644
--- a/src/Storages/System/StorageSystemProjectionPartsColumns.h
+++ b/src/Storages/System/StorageSystemProjectionPartsColumns.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotaLimits.cpp b/src/Storages/System/StorageSystemQuotaLimits.cpp
index 82fdecfdf5b..3b64f72d621 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.cpp
+++ b/src/Storages/System/StorageSystemQuotaLimits.cpp
@@ -9,7 +9,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/Quota.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
 
diff --git a/src/Storages/System/StorageSystemQuotaLimits.h b/src/Storages/System/StorageSystemQuotaLimits.h
index 7f089fd3945..0fae259f4fc 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.h
+++ b/src/Storages/System/StorageSystemQuotaLimits.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotaUsage.cpp b/src/Storages/System/StorageSystemQuotaUsage.cpp
index 835936036ed..6723037cf3b 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotaUsage.cpp
@@ -10,7 +10,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/QuotaUsage.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemQuotaUsage.h b/src/Storages/System/StorageSystemQuotaUsage.h
index e3c076a0b4c..98fa6692628 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.h
+++ b/src/Storages/System/StorageSystemQuotaUsage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotas.cpp b/src/Storages/System/StorageSystemQuotas.cpp
index dcde4b70179..f5f57b48232 100644
--- a/src/Storages/System/StorageSystemQuotas.cpp
+++ b/src/Storages/System/StorageSystemQuotas.cpp
@@ -12,7 +12,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/Quota.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemQuotas.h b/src/Storages/System/StorageSystemQuotas.h
index 3eac1aaa784..9dac02ccf56 100644
--- a/src/Storages/System/StorageSystemQuotas.h
+++ b/src/Storages/System/StorageSystemQuotas.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotasUsage.h b/src/Storages/System/StorageSystemQuotasUsage.h
index 72a1e9e4233..3f7aa237fe0 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.h
+++ b/src/Storages/System/StorageSystemQuotasUsage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemReplicas.h b/src/Storages/System/StorageSystemReplicas.h
index 1454628f363..ca36eef28c1 100644
--- a/src/Storages/System/StorageSystemReplicas.h
+++ b/src/Storages/System/StorageSystemReplicas.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.h b/src/Storages/System/StorageSystemReplicatedFetches.h
index 1e17ac4941c..ccdf99b9ce1 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.h
+++ b/src/Storages/System/StorageSystemReplicatedFetches.h
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemReplicationQueue.h b/src/Storages/System/StorageSystemReplicationQueue.h
index c6403eb07a1..64466d4c3e0 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.h
+++ b/src/Storages/System/StorageSystemReplicationQueue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemRoleGrants.h b/src/Storages/System/StorageSystemRoleGrants.h
index 4507a8520b0..bd9c1086013 100644
--- a/src/Storages/System/StorageSystemRoleGrants.h
+++ b/src/Storages/System/StorageSystemRoleGrants.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemRoles.h b/src/Storages/System/StorageSystemRoles.h
index e2eda32bf71..ef5a5381ec3 100644
--- a/src/Storages/System/StorageSystemRoles.h
+++ b/src/Storages/System/StorageSystemRoles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemRowPolicies.cpp b/src/Storages/System/StorageSystemRowPolicies.cpp
index a60e26d6f85..3fa62bc784b 100644
--- a/src/Storages/System/StorageSystemRowPolicies.cpp
+++ b/src/Storages/System/StorageSystemRowPolicies.cpp
@@ -13,7 +13,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/RowPolicy.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
 
diff --git a/src/Storages/System/StorageSystemRowPolicies.h b/src/Storages/System/StorageSystemRowPolicies.h
index 637c91d5ded..f310dfe0927 100644
--- a/src/Storages/System/StorageSystemRowPolicies.h
+++ b/src/Storages/System/StorageSystemRowPolicies.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemSettings.h b/src/Storages/System/StorageSystemSettings.h
index c76e1609fc2..d323908b7cf 100644
--- a/src/Storages/System/StorageSystemSettings.h
+++ b/src/Storages/System/StorageSystemSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.h b/src/Storages/System/StorageSystemSettingsProfileElements.h
index ffeda5b7bf3..752cdfbf5dc 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.h
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.h b/src/Storages/System/StorageSystemSettingsProfiles.h
index edbb4084a66..f1fdbe34321 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.h
+++ b/src/Storages/System/StorageSystemSettingsProfiles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index 7a8ee75803f..26af6488b81 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -6,7 +6,7 @@
 #include <mutex>
 #include <filesystem>
 
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Storages/System/StorageSystemStackTrace.h>
 #include <DataTypes/DataTypeString.h>
@@ -16,8 +16,8 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Common/PipeFDs.h>
 #include <Common/CurrentThread.h>
-#include <common/getThreadId.h>
-#include <common/logger_useful.h>
+#include <base/getThreadId.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemStackTrace.h b/src/Storages/System/StorageSystemStackTrace.h
index bf3de40424c..a5827e32e6f 100644
--- a/src/Storages/System/StorageSystemStackTrace.h
+++ b/src/Storages/System/StorageSystemStackTrace.h
@@ -3,7 +3,7 @@
 #ifdef OS_LINUX /// Because of 'sigqueue' functions and RT signals.
 
 #include <mutex>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace Poco
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 26caed55961..036e4748e65 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Interpreters/Context.h>
-#include <common/EnumReflection.h>
+#include <base/EnumReflection.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemStoragePolicies.h b/src/Storages/System/StorageSystemStoragePolicies.h
index 25afd4166c8..ad8b507b7c0 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.h
+++ b/src/Storages/System/StorageSystemStoragePolicies.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
diff --git a/src/Storages/System/StorageSystemTableEngines.h b/src/Storages/System/StorageSystemTableEngines.h
index 153032fdd51..ac3be81c019 100644
--- a/src/Storages/System/StorageSystemTableEngines.h
+++ b/src/Storages/System/StorageSystemTableEngines.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypeString.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemTableFunctions.h b/src/Storages/System/StorageSystemTableFunctions.h
index de114654a92..882a1254ee0 100644
--- a/src/Storages/System/StorageSystemTableFunctions.h
+++ b/src/Storages/System/StorageSystemTableFunctions.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypeString.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 namespace DB
 {
 
diff --git a/src/Storages/System/StorageSystemTables.h b/src/Storages/System/StorageSystemTables.h
index b196a87b093..6424d623830 100644
--- a/src/Storages/System/StorageSystemTables.h
+++ b/src/Storages/System/StorageSystemTables.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemTimeZones.h b/src/Storages/System/StorageSystemTimeZones.h
index 7cc56bbe643..adfae5d760b 100644
--- a/src/Storages/System/StorageSystemTimeZones.h
+++ b/src/Storages/System/StorageSystemTimeZones.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemUserDirectories.h b/src/Storages/System/StorageSystemUserDirectories.h
index 38d2ddd9147..905eae7a7b9 100644
--- a/src/Storages/System/StorageSystemUserDirectories.h
+++ b/src/Storages/System/StorageSystemUserDirectories.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemUsers.h b/src/Storages/System/StorageSystemUsers.h
index 886b91d04e9..b72ad612c65 100644
--- a/src/Storages/System/StorageSystemUsers.h
+++ b/src/Storages/System/StorageSystemUsers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemZeros.h b/src/Storages/System/StorageSystemZeros.h
index d33d9b4b099..e40b9c3993a 100644
--- a/src/Storages/System/StorageSystemZeros.h
+++ b/src/Storages/System/StorageSystemZeros.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <optional>
 #include <Storages/IStorage.h>
 
diff --git a/src/Storages/System/StorageSystemZooKeeper.h b/src/Storages/System/StorageSystemZooKeeper.h
index a74fdac12e9..26bcaccba6a 100644
--- a/src/Storages/System/StorageSystemZooKeeper.h
+++ b/src/Storages/System/StorageSystemZooKeeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/attachInformationSchemaTables.cpp b/src/Storages/System/attachInformationSchemaTables.cpp
index a94b15ba3b4..cfe5de1dc41 100644
--- a/src/Storages/System/attachInformationSchemaTables.cpp
+++ b/src/Storages/System/attachInformationSchemaTables.cpp
@@ -3,7 +3,7 @@
 #include <Storages/System/attachSystemTablesImpl.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
-#include <common/getResource.h>
+#include <base/getResource.h>
 
 namespace DB
 {
diff --git a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
index 0c20d2ed4c8..e2145f5afb0 100644
--- a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
+++ b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
@@ -4,7 +4,7 @@
 #include <Common/Stopwatch.h>
 #include <Storages/MergeTree/EphemeralLockInZooKeeper.h>
 
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <iostream>
 
diff --git a/src/Storages/examples/get_current_inserts_in_replicated.cpp b/src/Storages/examples/get_current_inserts_in_replicated.cpp
index 94e63e49b19..d7dedbcab9c 100644
--- a/src/Storages/examples/get_current_inserts_in_replicated.cpp
+++ b/src/Storages/examples/get_current_inserts_in_replicated.cpp
@@ -4,7 +4,7 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/Exception.h>
 #include <Common/Stopwatch.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <filesystem>
 #include <iostream>
diff --git a/src/Storages/transformQueryForExternalDatabase.h b/src/Storages/transformQueryForExternalDatabase.h
index 6f7d6af5319..3756dd97feb 100644
--- a/src/Storages/transformQueryForExternalDatabase.h
+++ b/src/Storages/transformQueryForExternalDatabase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Storages/SelectQueryInfo.h>
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index 58d71229b04..d5ad2b73552 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -1,5 +1,5 @@
 #include <type_traits>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Core/Defines.h>
 #include <DataTypes/DataTypeFactory.h>
diff --git a/src/TableFunctions/TableFunctionNumbers.h b/src/TableFunctions/TableFunctionNumbers.h
index 6cee752390e..0a2f3eb863e 100644
--- a/src/TableFunctions/TableFunctionNumbers.h
+++ b/src/TableFunctions/TableFunctionNumbers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <TableFunctions/ITableFunction.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 3c39e3f2ec0..296076344a4 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -15,7 +15,7 @@
 #include <Common/Macros.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Core/Defines.h>
-#include <common/range.h>
+#include <base/range.h>
 #include "registerTableFunctions.h"
 
 
diff --git a/src/TableFunctions/TableFunctionView.h b/src/TableFunctions/TableFunctionView.h
index 9ef634746eb..c20b45e7546 100644
--- a/src/TableFunctions/TableFunctionView.h
+++ b/src/TableFunctions/TableFunctionView.h
@@ -2,7 +2,7 @@
 
 #include <TableFunctions/ITableFunction.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/TableFunctions/TableFunctionZeros.h b/src/TableFunctions/TableFunctionZeros.h
index 0407eff2f78..eef1577673e 100644
--- a/src/TableFunctions/TableFunctionZeros.h
+++ b/src/TableFunctions/TableFunctionZeros.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <TableFunctions/ITableFunction.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/utils/compressor/decompress_perf.cpp b/utils/compressor/decompress_perf.cpp
index 1c5f29359fc..20f974aab7f 100644
--- a/utils/compressor/decompress_perf.cpp
+++ b/utils/compressor/decompress_perf.cpp
@@ -1,7 +1,7 @@
 #include <lz4.h>
 #include <string.h>
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/ReadBuffer.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
@@ -17,7 +17,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
 #include <Common/memcpySmall.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 
 /** for i in *.bin; do ./decompress_perf < $i > /dev/null; done
diff --git a/utils/iotest/iotest.cpp b/utils/iotest/iotest.cpp
index 5b28dbc95f9..b327355d07b 100644
--- a/utils/iotest/iotest.cpp
+++ b/utils/iotest/iotest.cpp
@@ -6,7 +6,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
 #include <Common/randomSeed.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 
 #include <cstdlib>
 #include <iomanip>
diff --git a/utils/iotest/iotest_aio.cpp b/utils/iotest/iotest_aio.cpp
index 66de4713893..4db76b1eb2d 100644
--- a/utils/iotest/iotest_aio.cpp
+++ b/utils/iotest/iotest_aio.cpp
@@ -14,7 +14,7 @@ int main(int, char **) { return 0; }
 #include <Common/ThreadPool.h>
 #include <Common/Stopwatch.h>
 #include <Common/randomSeed.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <pcg_random.hpp>
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadHelpers.h>
diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
index 842e6b09775..b238c2ef569 100644
--- a/utils/keeper-data-dumper/main.cpp
+++ b/utils/keeper-data-dumper/main.cpp
@@ -7,7 +7,7 @@
 #include <libnuraft/nuraft.hxx> // Y_IGNORE
 #include <Coordination/KeeperLogStore.h>
 #include <Coordination/Changelog.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 using namespace Coordination;
 using namespace DB;
diff --git a/utils/memcpy-bench/memcpy-bench.cpp b/utils/memcpy-bench/memcpy-bench.cpp
index 3cd2323672a..d2721acb149 100644
--- a/utils/memcpy-bench/memcpy-bench.cpp
+++ b/utils/memcpy-bench/memcpy-bench.cpp
@@ -15,7 +15,7 @@
 
 #include <pcg_random.hpp>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #include <Common/Stopwatch.h>
 
diff --git a/utils/zookeeper-cli/zookeeper-cli.cpp b/utils/zookeeper-cli/zookeeper-cli.cpp
index 47423dcd202..690a9d6b097 100644
--- a/utils/zookeeper-cli/zookeeper-cli.cpp
+++ b/utils/zookeeper-cli/zookeeper-cli.cpp
@@ -3,8 +3,8 @@
 #include <Poco/ConsoleChannel.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/LineReader.h>
-#include <common/logger_useful.h>
+#include <base/LineReader.h>
+#include <base/logger_useful.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/utils/zookeeper-test/main.cpp b/utils/zookeeper-test/main.cpp
index 39a282ce258..b60c45c9df6 100644
--- a/utils/zookeeper-test/main.cpp
+++ b/utils/zookeeper-test/main.cpp
@@ -3,8 +3,8 @@
 #include <Poco/ConsoleChannel.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/LineReader.h>
-#include <common/logger_useful.h>
+#include <base/LineReader.h>
+#include <base/logger_useful.h>
 #include <fmt/format.h>
 #include <random>
 #include <iterator>