Moved headers and sources to same place [#CLICKHOUSE-3].

dbms/CMakeLists.txt

@@ -1,13 +1,13 @@
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_vectorclass.cmake)
 
-set (CONFIG_VERSION ${CMAKE_CURRENT_BINARY_DIR}/include/DB/Common/config_version.h)
-set (CONFIG_COMMON ${CMAKE_CURRENT_BINARY_DIR}/include/DB/Common/config.h)
+set (CONFIG_VERSION ${CMAKE_CURRENT_BINARY_DIR}/src/Common/config_version.h)
+set (CONFIG_COMMON ${CMAKE_CURRENT_BINARY_DIR}/src/Common/config.h)
 set (CONFIG_BUILD ${CMAKE_CURRENT_BINARY_DIR}/src/Common/config_build.cpp)
 
 include (cmake/version.cmake)
 message (STATUS "Will build ${VERSION_FULL}")
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/DB/Common/config.h.in ${CONFIG_COMMON})
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/DB/Common/config_version.h.in ${CONFIG_VERSION})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/Common/config.h.in ${CONFIG_COMMON})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/Common/config_version.h.in ${CONFIG_VERSION})
 
 get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
 get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
@@ -23,7 +23,7 @@ include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libfarmhash)
 include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libmetrohash/src)
 include_directories (${ClickHouse_SOURCE_DIR}/libs/libdaemon/include)
 include_directories (${ODBC_INCLUDE_DIRECTORIES})
-include_directories (${ClickHouse_BINARY_DIR}/dbms/include)
+include_directories (${ClickHouse_BINARY_DIR}/dbms/src)
 
 if (NOT NO_WERROR)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
@@ -35,7 +35,7 @@ find_package (Threads)
 add_subdirectory (src)
 
 add_library(string_utils
-    include/DB/Common/StringUtils.h
+    src/Common/StringUtils.h
     src/Common/StringUtils.cpp)
 
 set(dbms_headers)
@@ -80,9 +80,9 @@ list(REMOVE_ITEM dbms_sources
 
 if (APPLE OR CMAKE_SYSTEM MATCHES "FreeBSD")
     list(REMOVE_ITEM dbms_headers
-        include/DB/Common/AIO.h
-        include/DB/IO/WriteBufferAIO.h
-        include/DB/IO/ReadBufferAIO.h)
+        src/Common/AIO.h
+        src/IO/WriteBufferAIO.h
+        src/IO/ReadBufferAIO.h)
     list(REMOVE_ITEM dbms_sources
         src/IO/ReadBufferAIO.cpp
         src/IO/WriteBufferAIO.cpp)

dbms/src/AggregateFunctions/AggregateFunctionArray.cpp

@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionArray.h>
+#include <AggregateFunctions/AggregateFunctionArray.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionArray.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Columns/ColumnArray.h>
+#include <DataTypes/DataTypeArray.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionAvg.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionAvg.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionAvg.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionAvg.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionCount.cpp

@@ -1,5 +1,5 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionCount.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionCount.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionCount.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DB/IO/VarInt.h>
+#include <IO/VarInt.h>
 
 #include <array>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/AggregateFunctions/INullaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <AggregateFunctions/INullaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <Columns/ColumnNullable.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionDebug.cpp

@@ -1,9 +1,9 @@
-#include <DB/AggregateFunctions/INullaryAggregateFunction.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <AggregateFunctions/INullaryAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp

@@ -1,10 +1,10 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Common/StringUtils.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Common/StringUtils.h>
 #include <Poco/String.h>
 
 

dbms/src/AggregateFunctions/AggregateFunctionFactory.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <unordered_map>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionGroupArray.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionGroupArray.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionGroupArray.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionGroupArray.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 #define AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE 0xFFFFFF
 

dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionGroupUniqArray.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionGroupUniqArray.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h

@@ -1,17 +1,17 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
-#include <DB/Common/HashTable/HashSet.h>
+#include <Common/HashTable/HashSet.h>
 
-#include <DB/AggregateFunctions/AggregateFunctionGroupArray.h>
+#include <AggregateFunctions/AggregateFunctionGroupArray.h>
 
 #define AGGREGATE_FUNCTION_GROUP_ARRAY_UNIQ_MAX_SIZE 0xFFFFFF
 

dbms/src/AggregateFunctions/AggregateFunctionIf.cpp

@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionIf.h>
+#include <AggregateFunctions/AggregateFunctionIf.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionIf.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionMerge.cpp

@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionMerge.h>
+#include <AggregateFunctions/AggregateFunctionMerge.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionMerge.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionNull.cpp

@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionNull.h>
+#include <AggregateFunctions/AggregateFunctionNull.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionNull.h

@@ -1,12 +1,12 @@
 #pragma once
 
 #include <array>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionQuantile.h

@@ -1,19 +1,19 @@
 #pragma once
 
-#include <DB/AggregateFunctions/ReservoirSampler.h>
+#include <AggregateFunctions/ReservoirSampler.h>
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.h

@@ -1,19 +1,19 @@
 #pragma once
 
-#include <DB/AggregateFunctions/ReservoirSamplerDeterministic.h>
+#include <AggregateFunctions/ReservoirSamplerDeterministic.h>
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileExact.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileExact.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.h

@@ -1,17 +1,17 @@
 #pragma once
 
-#include <DB/Common/PODArray.h>
+#include <Common/PODArray.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileExactWeighted.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <DB/Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashMap.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionQuantileTDigest.h

@@ -7,15 +7,15 @@
 #include <vector>
 #include <algorithm>
 
-#include <DB/Common/RadixSort.h>
-#include <DB/Common/PODArray.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <Common/RadixSort.h>
+#include <Common/PODArray.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h

@@ -2,21 +2,21 @@
 
 #include <limits>
 
-#include <DB/Common/MemoryTracker.h>
-#include <DB/Common/HashTable/Hash.h>
+#include <Common/MemoryTracker.h>
+#include <Common/HashTable/Hash.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
 
 #include <ext/range.hpp>
 

dbms/src/AggregateFunctions/AggregateFunctionSequenceMatch.h

@@ -1,17 +1,17 @@
 #pragma once
 
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Parsers/CommonParsers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Parsers/CommonParsers.h>
 #include <ext/range.hpp>
 #include <boost/range/iterator_range_core.hpp>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Common/PODArray.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTLiteral.h>
+#include <Common/PODArray.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 #include <bitset>
 #include <stack>
 

dbms/src/AggregateFunctions/AggregateFunctionState.cpp

@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionState.h>
+#include <AggregateFunctions/AggregateFunctionState.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionState.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionSum.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionSum.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSum.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionSum.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnVector.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnVector.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionUniq.h

@@ -3,26 +3,26 @@
 #include <city.h>
 #include <type_traits>
 
-#include <DB/AggregateFunctions/UniquesHashSet.h>
+#include <AggregateFunctions/UniquesHashSet.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeTuple.h>
 
-#include <DB/Interpreters/AggregationCommon.h>
-#include <DB/Common/HashTable/HashSet.h>
-#include <DB/Common/HyperLogLogWithSmallSetOptimization.h>
-#include <DB/Common/CombinedCardinalityEstimator.h>
+#include <Interpreters/AggregationCommon.h>
+#include <Common/HashTable/HashSet.h>
+#include <Common/HyperLogLogWithSmallSetOptimization.h>
+#include <Common/CombinedCardinalityEstimator.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnTuple.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/UniqCombinedBiasData.h>
-#include <DB/AggregateFunctions/UniqVariadicHash.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/UniqCombinedBiasData.h>
+#include <AggregateFunctions/UniqVariadicHash.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionUniqUpTo.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionUniqUpTo.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/Core/FieldVisitors.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/UniqVariadicHash.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Core/FieldVisitors.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/UniqVariadicHash.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionsArgMinMax.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/AggregateFunctions/AggregateFunctionsMinMaxAny.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionsMinMaxAny.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.cpp

@@ -1,5 +1,5 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/HelpersMinMaxAny.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/HelpersMinMaxAny.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.h

@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/AggregateFunctionsQuantile.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantile.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionsQuantileDeterministic.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileDeterministic.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileDeterministic.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionsQuantileTDigest.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileTDigest.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionsQuantileTiming.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileTiming.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileTiming.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionsSequenceMatch.cpp

@@ -1,5 +1,5 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionSequenceMatch.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSequenceMatch.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionsStatistics.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionsStatistics.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionsStatistics.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/AggregateFunctionsStatistics.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <Columns/ColumnsNumber.h>
 
 #include <cmath>
 

dbms/src/AggregateFunctions/AggregateFunctionsUniq.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionUniq.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionUniq.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/Helpers.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/HelpersMinMaxAny.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/AggregateFunctions/AggregateFunctionsArgMinMax.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <AggregateFunctions/AggregateFunctionsArgMinMax.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypesNumber.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/IAggregateFunction.h

@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include <DB/Core/Row.h>
-#include <DB/DataTypes/IDataType.h>
-#include <DB/Common/typeid_cast.h>
-#include <DB/Common/Arena.h>
+#include <Core/Row.h>
+#include <DataTypes/IDataType.h>
+#include <Common/typeid_cast.h>
+#include <Common/Arena.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/IBinaryAggregateFunction.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/INullaryAggregateFunction.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/IUnaryAggregateFunction.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/QuantilesCommon.h

@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/ReservoirSampler.h

@@ -5,10 +5,10 @@
 #include <climits>
 #include <sstream>
 #include <common/Common.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/PODArray.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/PODArray.h>
 #include <Poco/Exception.h>
 #include <boost/random.hpp>
 

dbms/src/AggregateFunctions/ReservoirSamplerDeterministic.h

@@ -4,13 +4,13 @@
 #include <algorithm>
 #include <climits>
 #include <sstream>
-#include <DB/AggregateFunctions/ReservoirSampler.h>
+#include <AggregateFunctions/ReservoirSampler.h>
 #include <common/Common.h>
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/PODArray.h>
+#include <Common/HashTable/Hash.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/PODArray.h>
 #include <Poco/Exception.h>
 #include <boost/random.hpp>
 

dbms/src/AggregateFunctions/UniqCombinedBiasData.cpp

@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/UniqCombinedBiasData.h>
+#include <AggregateFunctions/UniqCombinedBiasData.h>
 
 namespace DB
 {

dbms/src/AggregateFunctions/UniqVariadicHash.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <city.h>
-#include <DB/Core/Defines.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/UInt128.h>
-#include <DB/Columns/ColumnTuple.h>
+#include <Core/Defines.h>
+#include <Common/SipHash.h>
+#include <Common/UInt128.h>
+#include <Columns/ColumnTuple.h>
 
 
 namespace DB

dbms/src/AggregateFunctions/UniquesHashSet.h

@@ -4,14 +4,14 @@
 
 #include <common/Common.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/VarInt.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/VarInt.h>
 
-#include <DB/Common/HashTable/HashTableAllocator.h>
-#include <DB/Common/HashTable/Hash.h>
+#include <Common/HashTable/HashTableAllocator.h>
+#include <Common/HashTable/Hash.h>
 
 
 /** Approximate calculation of anything, as a rule, is constructed according to the following scheme:

dbms/src/Analyzers/AnalyzeArrayJoins.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 #include <unordered_map>
 #include <vector>
 

dbms/src/Analyzers/AnalyzeColumns.cpp

@@ -1,15 +1,15 @@
 #include <vector>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTAsterisk.h>
-#include <DB/Parsers/ASTQualifiedAsterisk.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/CollectAliases.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTQualifiedAsterisk.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 #include <Poco/String.h>
 
 

dbms/src/Analyzers/AnalyzeColumns.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Analyzers/CollectTables.h>
+#include <Parsers/IAST.h>
+#include <Analyzers/CollectTables.h>
 #include <unordered_map>
 
 

dbms/src/Analyzers/AnalyzeLambdas.cpp

@@ -1,12 +1,12 @@
 #include <vector>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/Analyzers/AnalyzeLambdas.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 #include <vector>
 
 

dbms/src/Analyzers/AnalyzeResultOfQuery.cpp

@@ -1,13 +1,13 @@
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Parsers/ASTSelectQuery.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Interpreters/Context.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ASTSelectQuery.h>
 
 
 namespace DB

dbms/src/Analyzers/AnalyzeResultOfQuery.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Core/Block.h>
+#include <Parsers/IAST.h>
+#include <Core/Block.h>
 
 
 namespace DB

dbms/src/Analyzers/CollectAliases.cpp

@@ -1,9 +1,9 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/CollectAliases.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/Analyzers/CollectAliases.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 #include <unordered_map>
 
 

dbms/src/Analyzers/CollectTables.cpp

@@ -1,16 +1,16 @@
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/TableFunctions/TableFunctionFactory.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Interpreters/Context.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSubquery.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/Analyzers/CollectTables.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Storages/IStorage.h>
+#include <Parsers/IAST.h>
+#include <Storages/IStorage.h>
 #include <vector>
 
 

dbms/src/Analyzers/OptimizeGroupOrderLimitBy.cpp

@@ -1,14 +1,14 @@
 #include <set>
 #include <unordered_set>
 
-#include <DB/Analyzers/OptimizeGroupOrderLimitBy.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTOrderByElement.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Functions/IFunction.h>
+#include <Analyzers/OptimizeGroupOrderLimitBy.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Interpreters/Context.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTLiteral.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB

dbms/src/Analyzers/OptimizeGroupOrderLimitBy.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB

dbms/src/Analyzers/TranslatePositionalArguments.cpp

@@ -1,9 +1,9 @@
-#include <DB/Analyzers/TranslatePositionalArguments.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTOrderByElement.h>
-#include <DB/Common/typeid_cast.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/TranslatePositionalArguments.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/Analyzers/TranslatePositionalArguments.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB

dbms/src/Analyzers/TypeAndConstantInference.cpp

@@ -1,28 +1,28 @@
 #include <Poco/String.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/DataTypes/FieldToDataType.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypeExpression.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSubquery.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <Core/FieldVisitors.h>
+#include <DataTypes/FieldToDataType.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeExpression.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB

dbms/src/Analyzers/TypeAndConstantInference.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/DataTypes/IDataType.h>
-#include <DB/Common/UInt128.h>
+#include <Parsers/IAST.h>
+#include <DataTypes/IDataType.h>
+#include <Common/UInt128.h>
 #include <unordered_map>
 
 

dbms/src/Analyzers/tests/analyze_columns.cpp

@@ -1,18 +1,18 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print found columns and corresponding tables.

dbms/src/Analyzers/tests/analyze_lambdas.cpp

@@ -1,12 +1,12 @@
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
 
 
 /// Parses query from stdin and print found higher order functions and query with rewritten names of lambda parameters.

dbms/src/Analyzers/tests/analyze_result_of_query.cpp

@@ -1,14 +1,14 @@
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print names and types of result columns.

dbms/src/Analyzers/tests/collect_aliases.cpp

@@ -1,10 +1,10 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
+#include <Analyzers/CollectAliases.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
 
 
 /// Parses query from stdin and print found aliases.

dbms/src/Analyzers/tests/collect_tables.cpp

@@ -1,15 +1,15 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print found tables.

dbms/src/Analyzers/tests/optimize_group_order_limit_by.cpp

@@ -1,21 +1,21 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Analyzers/TranslatePositionalArguments.h>
-#include <DB/Analyzers/OptimizeGroupOrderLimitBy.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Analyzers/TranslatePositionalArguments.h>
+#include <Analyzers/OptimizeGroupOrderLimitBy.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print same query with optimized GROUP BY, ORDER BY, LIMIT BY.

dbms/src/Analyzers/tests/translate_positional_arguments.cpp

@@ -1,11 +1,11 @@
-#include <DB/Analyzers/TranslatePositionalArguments.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
+#include <Analyzers/TranslatePositionalArguments.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
 
 
 /// Parses query from stdin and print same query with translated positional arguments.

dbms/src/Analyzers/tests/type_and_constant_inference.cpp

@@ -1,19 +1,19 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print data types of expressions; and for constant expressions, print its values.

dbms/src/Client/Benchmark.cpp

@@ -12,30 +12,30 @@
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/ThreadPool.h>
-#include <DB/AggregateFunctions/ReservoirSampler.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
+#include <AggregateFunctions/ReservoirSampler.h>
 
 #include <boost/program_options.hpp>
 
-#include <DB/Common/ConcurrentBoundedQueue.h>
+#include <Common/ConcurrentBoundedQueue.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/randomSeed.h>
-#include <DB/Core/Types.h>
+#include <Common/Exception.h>
+#include <Common/randomSeed.h>
+#include <Core/Types.h>
 
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/Operators.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
 
-#include <DB/DataStreams/RemoteBlockInputStream.h>
+#include <DataStreams/RemoteBlockInputStream.h>
 
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/Context.h>
 
-#include <DB/Client/Connection.h>
+#include <Client/Connection.h>
 
 #include "InterruptListener.h"
 

dbms/src/Client/Client.cpp

@@ -11,39 +11,39 @@
 #include <boost/program_options.hpp>
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
-#include <DB/Common/ClickHouseRevision.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/ShellCommand.h>
-#include <DB/Core/Types.h>
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/AsynchronousBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/Parsers/ParserQuery.h>
-#include <DB/Parsers/ASTSetQuery.h>
-#include <DB/Parsers/ASTUseQuery.h>
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTQueryWithOutput.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Client/Connection.h>
+#include <Common/ClickHouseRevision.h>
+#include <Common/Stopwatch.h>
+#include <Common/Exception.h>
+#include <Common/ShellCommand.h>
+#include <Core/Types.h>
+#include <Core/QueryProcessingStage.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/AsynchronousBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTUseQuery.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
+#include <Interpreters/Context.h>
+#include <Client/Connection.h>
 #include "InterruptListener.h"
-#include <DB/Common/ExternalTable.h>
-#include <DB/Common/UnicodeBar.h>
-#include <DB/Common/formatReadable.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Common/NetException.h>
+#include <Common/ExternalTable.h>
+#include <Common/UnicodeBar.h>
+#include <Common/formatReadable.h>
+#include <Columns/ColumnString.h>
+#include <Common/NetException.h>
 #include <common/readline_use.h>
 
 

dbms/src/Client/Connection.cpp

@@ -2,28 +2,28 @@
 
 #include <Poco/Net/NetException.h>
 
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/ClickHouseRevision.h>
 
-#include <DB/Core/Defines.h>
-#include <DB/Common/Exception.h>
+#include <Core/Defines.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadBufferFromPocoSocket.h>
-#include <DB/IO/WriteBufferFromPocoSocket.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/copyData.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadBufferFromPocoSocket.h>
+#include <IO/WriteBufferFromPocoSocket.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/copyData.h>
 
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
 
-#include <DB/Client/Connection.h>
+#include <Client/Connection.h>
 
-#include <DB/Common/NetException.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/NetException.h>
+#include <Common/CurrentMetrics.h>
 
-#include <DB/Interpreters/ClientInfo.h>
+#include <Interpreters/ClientInfo.h>
 
 
 namespace CurrentMetrics

dbms/src/Client/Connection.h

@@ -4,19 +4,19 @@
 
 #include <Poco/Net/StreamSocket.h>
 
-#include <DB/Common/Throttler.h>
+#include <Common/Throttler.h>
 
-#include <DB/Core/Block.h>
-#include <DB/Core/Defines.h>
-#include <DB/Core/Progress.h>
-#include <DB/Core/Protocol.h>
-#include <DB/Core/QueryProcessingStage.h>
+#include <Core/Block.h>
+#include <Core/Defines.h>
+#include <Core/Progress.h>
+#include <Core/Protocol.h>
+#include <Core/QueryProcessingStage.h>
 
-#include <DB/DataStreams/IBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/BlockStreamProfileInfo.h>
+#include <DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/BlockStreamProfileInfo.h>
 
-#include <DB/Interpreters/Settings.h>
+#include <Interpreters/Settings.h>
 
 #include <atomic>
 

dbms/src/Client/ConnectionPool.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/PoolBase.h>
+#include <Common/PoolBase.h>
 
-#include <DB/Client/Connection.h>
+#include <Client/Connection.h>
 
 
 namespace DB

dbms/src/Client/ConnectionPoolWithFailover.h

@@ -5,10 +5,10 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/DNS.h>
 
-#include <DB/Common/PoolWithFailoverBase.h>
+#include <Common/PoolWithFailoverBase.h>
 
-#include <DB/Common/getFQDNOrHostName.h>
-#include <DB/Client/ConnectionPool.h>
+#include <Common/getFQDNOrHostName.h>
+#include <Client/ConnectionPool.h>
 
 
 namespace DB

dbms/src/Client/InterruptListener.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <signal.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 namespace DB

dbms/src/Client/MultiplexedConnections.cpp

@@ -1,4 +1,4 @@
-#include <DB/Client/MultiplexedConnections.h>
+#include <Client/MultiplexedConnections.h>
 
 namespace DB
 {

dbms/src/Client/MultiplexedConnections.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/Throttler.h>
-#include <DB/Client/Connection.h>
-#include <DB/Client/ConnectionPool.h>
+#include <Common/Throttler.h>
+#include <Client/Connection.h>
+#include <Client/ConnectionPool.h>
 #include <Poco/ScopedLock.h>
 #include <mutex>
 

dbms/src/Client/tests/test_connect.cpp

@@ -4,8 +4,8 @@
 
 #include <iostream>
 #include <Poco/Net/StreamSocket.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <IO/ReadHelpers.h>
 
 
 /** In a loop it connects to the server and immediately breaks the connection.

dbms/src/Columns/ColumnAggregateFunction.cpp

@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionState.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
-#include <DB/Common/SipHash.h>
+#include <AggregateFunctions/AggregateFunctionState.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Common/SipHash.h>
 
 namespace DB
 {

dbms/src/Columns/ColumnAggregateFunction.h

@@ -1,16 +1,16 @@
 #pragma once
 
-#include <DB/Common/Arena.h>
+#include <Common/Arena.h>
 
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
-#include <DB/Columns/IColumn.h>
+#include <Columns/IColumn.h>
 
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB

dbms/src/Columns/ColumnArray.cpp

@@ -1,13 +1,13 @@
 #include <string.h> // memcpy
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsCommon.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsCommon.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/Arena.h>
-#include <DB/Common/SipHash.h>
+#include <Common/Exception.h>
+#include <Common/Arena.h>
+#include <Common/SipHash.h>
 
 
 

dbms/src/Columns/ColumnArray.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Columns/IColumn.h>
-#include <DB/Columns/ColumnVector.h>
+#include <Columns/IColumn.h>
+#include <Columns/ColumnVector.h>
 
 
 namespace DB

dbms/src/Columns/ColumnConst.cpp

@@ -1,14 +1,14 @@
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/DataTypes/DataTypeTuple.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <ext/enumerate.hpp>