CLICKHOUSE-3772: Move headers to appropriate place (one more time)

dbms/src/Storages/System/StorageSystemBuildOptions.cpp

@@ -1,6 +1,7 @@
+#include <Common/config_build.h>
+#include <DataTypes/DataTypeString.h>
 #include <Interpreters/Settings.h>
 #include <Storages/System/StorageSystemBuildOptions.h>
-#include <Common/config_build.h>
 
 namespace DB
 {

dbms/src/Storages/System/StorageSystemBuildOptions.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <DataTypes/DataTypeString.h>
 #include <ext/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 

dbms/src/Storages/System/StorageSystemClusters.cpp

@@ -1,7 +1,9 @@
+#include <Common/DNSResolver.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
 #include <Storages/System/StorageSystemClusters.h>
-#include <Common/DNSResolver.h>
 
 namespace DB
 {

dbms/src/Storages/System/StorageSystemDataTypeFamilies.cpp

@@ -1,5 +1,7 @@
 #include <Core/Field.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/StorageSystemDataTypeFamilies.h>
 
 namespace DB
@@ -9,8 +11,8 @@ NamesAndTypesList StorageSystemDataTypeFamilies::getNamesAndTypes()
 {
     return {
         {"name", std::make_shared<DataTypeString>()},
-        {"case_insensivie", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt8>())},
+        {"case_insensivie", std::make_shared<DataTypeUInt8>()},
-        {"alias_to", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+        {"alias_to", std::make_shared<DataTypeString>()},
     };
 }
 

dbms/src/Storages/System/StorageSystemDataTypeFamilies.h

@@ -1,10 +1,8 @@
 #pragma once
 
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Storages/System/IStorageSystemOneBlock.h>
 #include <ext/shared_ptr_helper.h>
+#include <Storages/System/IStorageSystemOneBlock.h>
+
 namespace DB
 {
 

dbms/src/Storages/System/StorageSystemDatabases.cpp

@@ -1,4 +1,5 @@
 #include <Databases/IDatabase.h>
+#include <DataTypes/DataTypeString.h>
 #include <Interpreters/Context.h>
 #include <Storages/System/StorageSystemDatabases.h>
 

dbms/src/Storages/System/StorageSystemDatabases.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <DataTypes/DataTypeString.h>
-#include <Storages/System/IStorageSystemOneBlock.h>
 #include <ext/shared_ptr_helper.h>
+#include <Storages/System/IStorageSystemOneBlock.h>
 
 
 namespace DB

dbms/src/Storages/System/StorageSystemDictionaries.cpp

@@ -1,9 +1,14 @@
-#include <Storages/System/StorageSystemDictionaries.h>
+#include <DataTypes/DataTypeArray.h>
-#include <Interpreters/Context.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 #include <Dictionaries/IDictionary.h>
 #include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/DictionaryStructure.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionaries.h>
+#include <Storages/System/StorageSystemDictionaries.h>
+
 #include <ext/map.h>
 #include <mutex>
 

dbms/src/Storages/System/StorageSystemDictionaries.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeString.h>
 #include <ext/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 

dbms/src/Storages/System/StorageSystemEvents.cpp

@@ -1,4 +1,6 @@
 #include <Common/ProfileEvents.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/StorageSystemEvents.h>
 
 namespace DB

dbms/src/Storages/System/StorageSystemEvents.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <ext/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 

dbms/src/Storages/System/StorageSystemFormats.cpp

@@ -1,3 +1,5 @@
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <Formats/FormatFactory.h>
 #include <Storages/System/StorageSystemFormats.h>
 

dbms/src/Storages/System/StorageSystemFormats.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 #include <ext/shared_ptr_helper.h>
 

dbms/src/Storages/System/StorageSystemFunctions.cpp

@@ -1,7 +1,4 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnsNumber.h>
-#include <DataStreams/OneBlockInputStream.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>

dbms/src/Storages/System/StorageSystemFunctions.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <ext/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 

dbms/src/Storages/System/StorageSystemGraphite.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 #include <ext/shared_ptr_helper.h>
 

dbms/src/Storages/System/StorageSystemMacros.cpp

@@ -1,6 +1,6 @@
+#include <Common/Macros.h>
 #include <Interpreters/Context.h>
 #include <Storages/System/StorageSystemMacros.h>
-#include <Common/Macros.h>
 
 
 namespace DB