diff --git a/benchmark/bench_actor.cpp b/benchmark/bench_actor.cpp
index a6939adf3..6f49c7aad 100644
--- a/benchmark/bench_actor.cpp
+++ b/benchmark/bench_actor.cpp
@@ -4,12 +4,11 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/utils/benchmark.h"
-
 #include "td/actor/actor.h"
 #include "td/actor/ConcurrentScheduler.h"
 #include "td/actor/PromiseFuture.h"
 
+#include "td/utils/benchmark.h"
 #include "td/utils/common.h"
 #include "td/utils/crypto.h"
 #include "td/utils/logging.h"
diff --git a/benchmark/bench_db.cpp b/benchmark/bench_db.cpp
index 03983aab0..7c1e69318 100644
--- a/benchmark/bench_db.cpp
+++ b/benchmark/bench_db.cpp
@@ -4,9 +4,6 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-
 #include "td/db/binlog/Binlog.h"
 #include "td/db/binlog/ConcurrentBinlog.h"
 #include "td/db/BinlogKeyValue.h"
@@ -17,6 +14,9 @@
 #include "td/db/SqliteKeyValueAsync.h"
 #include "td/db/SqliteKeyValueSafe.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+
 #include "td/utils/benchmark.h"
 #include "td/utils/common.h"
 #include "td/utils/format.h"
diff --git a/benchmark/bench_handshake.cpp b/benchmark/bench_handshake.cpp
index d56840a2c..2b7efebd6 100644
--- a/benchmark/bench_handshake.cpp
+++ b/benchmark/bench_handshake.cpp
@@ -4,12 +4,11 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/utils/benchmark.h"
-
 #include "td/mtproto/DhCallback.h"
 #include "td/mtproto/DhHandshake.h"
 
 #include "td/utils/base64.h"
+#include "td/utils/benchmark.h"
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/Slice.h"
diff --git a/benchmark/bench_http.cpp b/benchmark/bench_http.cpp
index 835d5a83f..7650073e4 100644
--- a/benchmark/bench_http.cpp
+++ b/benchmark/bench_http.cpp
@@ -4,13 +4,13 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-
 #include "td/net/HttpOutboundConnection.h"
 #include "td/net/HttpQuery.h"
 #include "td/net/SslStream.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/IPAddress.h"
diff --git a/benchmark/bench_http_server.cpp b/benchmark/bench_http_server.cpp
index cf6f4e4c6..82aed1914 100644
--- a/benchmark/bench_http_server.cpp
+++ b/benchmark/bench_http_server.cpp
@@ -4,14 +4,14 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-
 #include "td/net/HttpHeaderCreator.h"
 #include "td/net/HttpInboundConnection.h"
 #include "td/net/HttpQuery.h"
 #include "td/net/TcpListener.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/SocketFd.h"
diff --git a/benchmark/bench_http_server_cheat.cpp b/benchmark/bench_http_server_cheat.cpp
index 98e8c7a98..1c3455aba 100644
--- a/benchmark/bench_http_server_cheat.cpp
+++ b/benchmark/bench_http_server_cheat.cpp
@@ -4,13 +4,13 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-
 #include "td/net/HttpHeaderCreator.h"
 #include "td/net/HttpInboundConnection.h"
 #include "td/net/TcpListener.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/detail/PollableFd.h"
diff --git a/benchmark/bench_http_server_fast.cpp b/benchmark/bench_http_server_fast.cpp
index 1d2896346..d0a0e115b 100644
--- a/benchmark/bench_http_server_fast.cpp
+++ b/benchmark/bench_http_server_fast.cpp
@@ -4,14 +4,14 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-
 #include "td/net/HttpHeaderCreator.h"
 #include "td/net/HttpQuery.h"
 #include "td/net/HttpReader.h"
 #include "td/net/TcpListener.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/BufferedFd.h"
 #include "td/utils/logging.h"
diff --git a/benchmark/bench_misc.cpp b/benchmark/bench_misc.cpp
index 34eda6633..f5f57f4d6 100644
--- a/benchmark/bench_misc.cpp
+++ b/benchmark/bench_misc.cpp
@@ -4,6 +4,9 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+#include "td/telegram/telegram_api.h"
+#include "td/telegram/telegram_api.hpp"
+
 #include "td/utils/benchmark.h"
 #include "td/utils/common.h"
 #include "td/utils/format.h"
@@ -20,9 +23,6 @@
 #include "td/utils/Status.h"
 #include "td/utils/ThreadSafeCounter.h"
 
-#include "td/telegram/telegram_api.h"
-#include "td/telegram/telegram_api.hpp"
-
 #if !TD_WINDOWS
 #include <unistd.h>
 #include <utime.h>
diff --git a/benchmark/bench_tddb.cpp b/benchmark/bench_tddb.cpp
index 4677d681d..575f9e0e4 100644
--- a/benchmark/bench_tddb.cpp
+++ b/benchmark/bench_tddb.cpp
@@ -11,12 +11,12 @@
 #include "td/telegram/ServerMessageId.h"
 #include "td/telegram/UserId.h"
 
-#include "td/actor/ConcurrentScheduler.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/SqliteConnectionSafe.h"
 #include "td/db/SqliteDb.h"
 
+#include "td/actor/ConcurrentScheduler.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/benchmark.h"
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
diff --git a/benchmark/wget.cpp b/benchmark/wget.cpp
index 7657b20dc..357ebd03c 100644
--- a/benchmark/wget.cpp
+++ b/benchmark/wget.cpp
@@ -4,13 +4,13 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+#include "td/net/HttpQuery.h"
+#include "td/net/Wget.h"
+
 #include "td/actor/actor.h"
 #include "td/actor/ConcurrentScheduler.h"
 #include "td/actor/PromiseFuture.h"
 
-#include "td/net/HttpQuery.h"
-#include "td/net/Wget.h"
-
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/Status.h"
diff --git a/td/mtproto/SessionConnection.cpp b/td/mtproto/SessionConnection.cpp
index 039660f7a..228edae56 100644
--- a/td/mtproto/SessionConnection.cpp
+++ b/td/mtproto/SessionConnection.cpp
@@ -9,6 +9,8 @@
 #include "td/mtproto/AuthData.h"
 #include "td/mtproto/AuthKey.h"
 #include "td/mtproto/CryptoStorer.h"
+#include "td/mtproto/mtproto_api.h"
+#include "td/mtproto/mtproto_api.hpp"
 #include "td/mtproto/PacketStorer.h"
 #include "td/mtproto/Transport.h"
 #include "td/mtproto/utils.h"
@@ -27,9 +29,6 @@
 #include "td/utils/tl_parsers.h"
 #include "td/utils/TlDowncastHelper.h"
 
-#include "td/mtproto/mtproto_api.h"
-#include "td/mtproto/mtproto_api.hpp"
-
 #include <algorithm>
 #include <iterator>
 #include <type_traits>
diff --git a/td/telegram/AnimationsManager.cpp b/td/telegram/AnimationsManager.cpp
index 44c89d4ce..a2e63a813 100644
--- a/td/telegram/AnimationsManager.cpp
+++ b/td/telegram/AnimationsManager.cpp
@@ -21,12 +21,13 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/telegram_api.h"
 
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
diff --git a/td/telegram/AnimationsManager.h b/td/telegram/AnimationsManager.h
index c3e592b3f..25c6938d2 100644
--- a/td/telegram/AnimationsManager.h
+++ b/td/telegram/AnimationsManager.h
@@ -6,17 +6,16 @@
 //
 #pragma once
 
+#include "td/telegram/files/FileId.h"
+#include "td/telegram/files/FileSourceId.h"
+#include "td/telegram/Photo.h"
+#include "td/telegram/SecretInputMedia.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/telegram_api.h"
 
 #include "td/actor/actor.h"
 #include "td/actor/PromiseFuture.h"
 
-#include "td/telegram/files/FileId.h"
-#include "td/telegram/files/FileSourceId.h"
-#include "td/telegram/Photo.h"
-#include "td/telegram/SecretInputMedia.h"
-
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
diff --git a/td/telegram/BackgroundManager.cpp b/td/telegram/BackgroundManager.cpp
index 9abf98709..86bda628d 100644
--- a/td/telegram/BackgroundManager.cpp
+++ b/td/telegram/BackgroundManager.cpp
@@ -24,6 +24,7 @@
 #include "td/telegram/Photo.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/db/SqliteKeyValueAsync.h"
 
diff --git a/td/telegram/CallActor.h b/td/telegram/CallActor.h
index da5ee3a9c..ae67b73ae 100644
--- a/td/telegram/CallActor.h
+++ b/td/telegram/CallActor.h
@@ -6,17 +6,16 @@
 //
 #pragma once
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
-#include "td/mtproto/DhHandshake.h"
-
 #include "td/telegram/CallDiscardReason.h"
 #include "td/telegram/CallId.h"
 #include "td/telegram/DhConfig.h"
 #include "td/telegram/net/NetQuery.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/UserId.h"
 
+#include "td/mtproto/DhHandshake.h"
+
 #include "td/actor/actor.h"
 #include "td/actor/PromiseFuture.h"
 
diff --git a/td/telegram/CallManager.cpp b/td/telegram/CallManager.cpp
index ac0975cf9..5559e93d4 100644
--- a/td/telegram/CallManager.cpp
+++ b/td/telegram/CallManager.cpp
@@ -6,14 +6,14 @@
 //
 #include "td/telegram/CallManager.h"
 
+#include "td/telegram/telegram_api.hpp"
+
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/SliceBuilder.h"
 
-#include "td/telegram/telegram_api.hpp"
-
 #include <limits>
 
 namespace td {
diff --git a/td/telegram/CallbackQueriesManager.cpp b/td/telegram/CallbackQueriesManager.cpp
index 5c669068e..0f5ed889b 100644
--- a/td/telegram/CallbackQueriesManager.cpp
+++ b/td/telegram/CallbackQueriesManager.cpp
@@ -6,12 +6,6 @@
 //
 #include "td/telegram/CallbackQueriesManager.h"
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/AccessRights.h"
 #include "td/telegram/AuthManager.h"
 #include "td/telegram/ContactsManager.h"
@@ -20,6 +14,11 @@
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/PasswordManager.h"
 #include "td/telegram/Td.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
+
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
 
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index e37aff485..052d20300 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -6,10 +6,6 @@
 //
 #include "td/telegram/ContactsManager.h"
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-#include "td/telegram/telegram_api.hpp"
-
 #include "td/telegram/AuthManager.h"
 #include "td/telegram/ConfigManager.h"
 #include "td/telegram/ConfigShared.h"
@@ -43,17 +39,19 @@
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
+#include "td/telegram/telegram_api.hpp"
 #include "td/telegram/UpdatesManager.h"
 #include "td/telegram/Version.h"
 
-#include "td/actor/PromiseFuture.h"
-#include "td/actor/SleepActor.h"
-
 #include "td/db/binlog/BinlogEvent.h"
 #include "td/db/binlog/BinlogHelper.h"
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/actor/PromiseFuture.h"
+#include "td/actor/SleepActor.h"
+
 #include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
 #include "td/utils/buffer.h"
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index a3f768ed5..e93eaede7 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -6,9 +6,6 @@
 //
 #pragma once
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
 #include "td/telegram/AccessRights.h"
 #include "td/telegram/BotCommand.h"
 #include "td/telegram/ChannelId.h"
@@ -33,6 +30,8 @@
 #include "td/telegram/SecretChatId.h"
 #include "td/telegram/StickerSetId.h"
 #include "td/telegram/SuggestedAction.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/UserId.h"
 
 #include "td/actor/actor.h"
diff --git a/td/telegram/DeviceTokenManager.h b/td/telegram/DeviceTokenManager.h
index 07897e73b..59399f345 100644
--- a/td/telegram/DeviceTokenManager.h
+++ b/td/telegram/DeviceTokenManager.h
@@ -6,13 +6,13 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/UserId.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/common.h"
 #include "td/utils/Slice.h"
 #include "td/utils/StringBuilder.h"
diff --git a/td/telegram/DialogAction.cpp b/td/telegram/DialogAction.cpp
index 063b0c230..a2bd86c89 100644
--- a/td/telegram/DialogAction.cpp
+++ b/td/telegram/DialogAction.cpp
@@ -10,6 +10,8 @@
 #include "td/telegram/ServerMessageId.h"
 
 #include "td/utils/misc.h"
+#include "td/utils/Slice.h"
+#include "td/utils/SliceBuilder.h"
 #include "td/utils/utf8.h"
 
 namespace td {
diff --git a/td/telegram/DialogDb.cpp b/td/telegram/DialogDb.cpp
index 16bf177f2..0eb1af32f 100644
--- a/td/telegram/DialogDb.cpp
+++ b/td/telegram/DialogDb.cpp
@@ -8,14 +8,14 @@
 
 #include "td/telegram/Version.h"
 
-#include "td/actor/actor.h"
-#include "td/actor/SchedulerLocalStorage.h"
-
 #include "td/db/SqliteConnectionSafe.h"
 #include "td/db/SqliteDb.h"
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteStatement.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/SchedulerLocalStorage.h"
+
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/DialogDb.h b/td/telegram/DialogDb.h
index d4d39b2c2..5ed117355 100644
--- a/td/telegram/DialogDb.h
+++ b/td/telegram/DialogDb.h
@@ -11,10 +11,10 @@
 #include "td/telegram/NotificationGroupId.h"
 #include "td/telegram/NotificationGroupKey.h"
 
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/KeyValueSyncInterface.h"
 
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
diff --git a/td/telegram/FileReferenceManager.h b/td/telegram/FileReferenceManager.h
index 9a5466f27..5845edc0c 100644
--- a/td/telegram/FileReferenceManager.h
+++ b/td/telegram/FileReferenceManager.h
@@ -6,9 +6,6 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/BackgroundId.h"
 #include "td/telegram/ChannelId.h"
 #include "td/telegram/ChatId.h"
@@ -19,6 +16,9 @@
 #include "td/telegram/SetWithPosition.h"
 #include "td/telegram/UserId.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/Slice.h"
diff --git a/td/telegram/Game.h b/td/telegram/Game.h
index 6f034aede..9a3174693 100644
--- a/td/telegram/Game.h
+++ b/td/telegram/Game.h
@@ -10,15 +10,14 @@
 #include "td/telegram/files/FileId.h"
 #include "td/telegram/MessageEntity.h"
 #include "td/telegram/Photo.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/UserId.h"
 
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
 namespace td {
 
 class ContactsManager;
diff --git a/td/telegram/Global.h b/td/telegram/Global.h
index 157077054..b2bf8570c 100644
--- a/td/telegram/Global.h
+++ b/td/telegram/Global.h
@@ -11,12 +11,12 @@
 #include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/TdParameters.h"
 
+#include "td/net/NetStats.h"
+
 #include "td/actor/actor.h"
 #include "td/actor/PromiseFuture.h"
 #include "td/actor/SchedulerLocalStorage.h"
 
-#include "td/net/NetStats.h"
-
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/Slice.h"
diff --git a/td/telegram/HashtagHints.cpp b/td/telegram/HashtagHints.cpp
index 7efc975eb..221616eef 100644
--- a/td/telegram/HashtagHints.cpp
+++ b/td/telegram/HashtagHints.cpp
@@ -8,6 +8,7 @@
 
 #include "td/telegram/Global.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/db/SqliteKeyValueAsync.h"
 
diff --git a/td/telegram/InlineQueriesManager.cpp b/td/telegram/InlineQueriesManager.cpp
index 31b6b38dd..6953bedf4 100644
--- a/td/telegram/InlineQueriesManager.cpp
+++ b/td/telegram/InlineQueriesManager.cpp
@@ -36,6 +36,7 @@
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/Venue.h"
 #include "td/telegram/VideosManager.h"
 #include "td/telegram/VoiceNotesManager.h"
diff --git a/td/telegram/InlineQueriesManager.h b/td/telegram/InlineQueriesManager.h
index 1b32107d8..7a2a2b6b7 100644
--- a/td/telegram/InlineQueriesManager.h
+++ b/td/telegram/InlineQueriesManager.h
@@ -6,14 +6,6 @@
 //
 #pragma once
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
-#include "td/actor/actor.h"
-#include "td/actor/MultiPromise.h"
-#include "td/actor/PromiseFuture.h"
-#include "td/actor/Timeout.h"
-
 #include "td/telegram/DialogId.h"
 #include "td/telegram/files/FileId.h"
 #include "td/telegram/Location.h"
@@ -21,8 +13,15 @@
 #include "td/telegram/MessageEntity.h"
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/Photo.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/UserId.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/MultiPromise.h"
+#include "td/actor/PromiseFuture.h"
+#include "td/actor/Timeout.h"
+
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
 
diff --git a/td/telegram/Logging.cpp b/td/telegram/Logging.cpp
index 4759ff6d5..798e31749 100644
--- a/td/telegram/Logging.cpp
+++ b/td/telegram/Logging.cpp
@@ -6,9 +6,6 @@
 //
 #include "td/telegram/Logging.h"
 
-#include "td/mtproto/SessionConnection.h"
-#include "td/mtproto/Transport.h"
-
 #include "td/telegram/ConfigManager.h"
 #include "td/telegram/FileReferenceManager.h"
 #include "td/telegram/files/FileGcWorker.h"
@@ -21,6 +18,9 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/UpdatesManager.h"
 
+#include "td/mtproto/SessionConnection.h"
+#include "td/mtproto/Transport.h"
+
 #include "td/db/binlog/Binlog.h"
 #include "td/db/SqliteStatement.h"
 
diff --git a/td/telegram/MessageEntity.h b/td/telegram/MessageEntity.h
index 2a8da6f6e..9d5944394 100644
--- a/td/telegram/MessageEntity.h
+++ b/td/telegram/MessageEntity.h
@@ -7,6 +7,9 @@
 #pragma once
 
 #include "td/telegram/DialogId.h"
+#include "td/telegram/secret_api.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/UserId.h"
 
 #include "td/utils/common.h"
@@ -14,10 +17,6 @@
 #include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
 
-#include "td/telegram/secret_api.h"
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
 #include <unordered_set>
 #include <utility>
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 3e2cfbec4..077694820 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -49,19 +49,20 @@
 #include "td/telegram/SequenceDispatcher.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/TopDialogCategory.h"
 #include "td/telegram/UpdatesManager.h"
 #include "td/telegram/Version.h"
 #include "td/telegram/WebPageId.h"
 
-#include "td/actor/PromiseFuture.h"
-#include "td/actor/SleepActor.h"
-
 #include "td/db/binlog/BinlogEvent.h"
 #include "td/db/binlog/BinlogHelper.h"
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
+#include "td/actor/PromiseFuture.h"
+#include "td/actor/SleepActor.h"
+
 #include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/misc.h"
diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp
index c818ff7da..d91c546b1 100644
--- a/td/telegram/NotificationManager.cpp
+++ b/td/telegram/NotificationManager.cpp
@@ -29,6 +29,7 @@
 #include "td/telegram/StateManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/telegram_api.h"
 
 #include "td/mtproto/AuthKey.h"
diff --git a/td/telegram/Photo.cpp b/td/telegram/Photo.cpp
index e3358a52f..3da14b1d8 100644
--- a/td/telegram/Photo.cpp
+++ b/td/telegram/Photo.cpp
@@ -6,9 +6,6 @@
 //
 #include "td/telegram/Photo.h"
 
-#include "td/telegram/secret_api.h"
-#include "td/telegram/telegram_api.h"
-
 #include "td/telegram/files/FileEncryptionKey.h"
 #include "td/telegram/files/FileLocation.h"
 #include "td/telegram/files/FileManager.h"
diff --git a/td/telegram/Photo.h b/td/telegram/Photo.h
index 3830b0777..99e864644 100644
--- a/td/telegram/Photo.h
+++ b/td/telegram/Photo.h
@@ -12,12 +12,11 @@
 #include "td/telegram/files/FileType.h"
 #include "td/telegram/net/DcId.h"
 #include "td/telegram/PhotoSizeSource.h"
-#include "td/telegram/SecretInputMedia.h"
-#include "td/telegram/UserId.h"
-
 #include "td/telegram/secret_api.h"
+#include "td/telegram/SecretInputMedia.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/telegram_api.h"
+#include "td/telegram/UserId.h"
 
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
diff --git a/td/telegram/PollManager.cpp b/td/telegram/PollManager.cpp
index 048f250e1..faca1b54d 100644
--- a/td/telegram/PollManager.cpp
+++ b/td/telegram/PollManager.cpp
@@ -23,6 +23,7 @@
 #include "td/telegram/StateManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/telegram_api.hpp"
 #include "td/telegram/UpdatesManager.h"
 
diff --git a/td/telegram/RecentDialogList.cpp b/td/telegram/RecentDialogList.cpp
index 843f3547a..648e389b8 100644
--- a/td/telegram/RecentDialogList.cpp
+++ b/td/telegram/RecentDialogList.cpp
@@ -6,15 +6,22 @@
 //
 #include "td/telegram/RecentDialogList.h"
 
+#include "td/telegram/AccessRights.h"
 #include "td/telegram/ContactsManager.h"
+#include "td/telegram/DialogListId.h"
+#include "td/telegram/FolderId.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/Td.h"
+#include "td/telegram/td_api.h"
 #include "td/telegram/TdDb.h"
 #include "td/telegram/TdParameters.h"
 
+#include "td/actor/MultiPromise.h"
+
 #include "td/utils/algorithm.h"
 #include "td/utils/misc.h"
+#include "td/utils/Slice.h"
 #include "td/utils/SliceBuilder.h"
 
 #include <algorithm>
diff --git a/td/telegram/RecentDialogList.h b/td/telegram/RecentDialogList.h
index 73d5e4239..0b45a665b 100644
--- a/td/telegram/RecentDialogList.h
+++ b/td/telegram/RecentDialogList.h
@@ -21,7 +21,7 @@ namespace td {
 class Td;
 
 // stores list of Dialog identifiers of a limited size
-class RecentDialogList : public Actor {
+class RecentDialogList final : public Actor {
  public:
   RecentDialogList(Td *td, const char *name, size_t max_size);
 
diff --git a/td/telegram/RequestActor.h b/td/telegram/RequestActor.h
index bcdbb3a5e..715d6c5e6 100644
--- a/td/telegram/RequestActor.h
+++ b/td/telegram/RequestActor.h
@@ -6,14 +6,13 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/AuthManager.h"
 #include "td/telegram/Td.h"
-
 #include "td/telegram/td_api.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/Status.h"
diff --git a/td/telegram/SecretChatsManager.cpp b/td/telegram/SecretChatsManager.cpp
index 3d270a6b4..92475d5c1 100644
--- a/td/telegram/SecretChatsManager.cpp
+++ b/td/telegram/SecretChatsManager.cpp
@@ -19,18 +19,17 @@
 #include "td/telegram/SequenceDispatcher.h"
 #include "td/telegram/StateManager.h"
 #include "td/telegram/TdDb.h"
-
-#include "td/telegram/secret_api.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/telegram_api.hpp"
 
 #include "td/mtproto/DhCallback.h"
 
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/BinlogEvent.h"
 #include "td/db/binlog/BinlogHelper.h"
 #include "td/db/binlog/BinlogInterface.h"
 
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/SecretChatsManager.h b/td/telegram/SecretChatsManager.h
index c11eba855..b5575b254 100644
--- a/td/telegram/SecretChatsManager.h
+++ b/td/telegram/SecretChatsManager.h
@@ -7,12 +7,11 @@
 #pragma once
 
 #include "td/telegram/logevent/SecretChatEvent.h"
+#include "td/telegram/secret_api.h"
 #include "td/telegram/SecretChatActor.h"
 #include "td/telegram/SecretChatId.h"
-#include "td/telegram/UserId.h"
-
-#include "td/telegram/secret_api.h"
 #include "td/telegram/telegram_api.h"
+#include "td/telegram/UserId.h"
 
 #include "td/actor/actor.h"
 #include "td/actor/PromiseFuture.h"
diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
index 5ac0e726e..9d435d964 100644
--- a/td/telegram/StickersManager.cpp
+++ b/td/telegram/StickersManager.cpp
@@ -31,15 +31,16 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/telegram_api.h"
 
+#include "td/db/SqliteKeyValue.h"
+#include "td/db/SqliteKeyValueAsync.h"
+
 #include "td/actor/MultiPromise.h"
 #include "td/actor/PromiseFuture.h"
 #include "td/actor/SleepActor.h"
 
-#include "td/db/SqliteKeyValue.h"
-#include "td/db/SqliteKeyValueAsync.h"
-
 #include "td/utils/algorithm.h"
 #include "td/utils/format.h"
 #include "td/utils/JsonBuilder.h"
diff --git a/td/telegram/StickersManager.h b/td/telegram/StickersManager.h
index 6598dc5a0..693fef838 100644
--- a/td/telegram/StickersManager.h
+++ b/td/telegram/StickersManager.h
@@ -6,11 +6,6 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/MultiPromise.h"
-#include "td/actor/PromiseFuture.h"
-#include "td/actor/Timeout.h"
-
 #include "td/telegram/files/FileId.h"
 #include "td/telegram/files/FileSourceId.h"
 #include "td/telegram/FullMessageId.h"
@@ -18,6 +13,13 @@
 #include "td/telegram/SecretInputMedia.h"
 #include "td/telegram/SpecialStickerSetType.h"
 #include "td/telegram/StickerSetId.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
+
+#include "td/actor/actor.h"
+#include "td/actor/MultiPromise.h"
+#include "td/actor/PromiseFuture.h"
+#include "td/actor/Timeout.h"
 
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
@@ -25,9 +27,6 @@
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
 #include <memory>
 #include <tuple>
 #include <unordered_map>
diff --git a/td/telegram/StorageManager.cpp b/td/telegram/StorageManager.cpp
index 990a60755..47869ebca 100644
--- a/td/telegram/StorageManager.cpp
+++ b/td/telegram/StorageManager.cpp
@@ -13,6 +13,7 @@
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/db/SqliteDb.h"
 
diff --git a/td/telegram/StorageManager.h b/td/telegram/StorageManager.h
index b6715df78..f7de8d725 100644
--- a/td/telegram/StorageManager.h
+++ b/td/telegram/StorageManager.h
@@ -6,14 +6,14 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/files/FileGcWorker.h"
 #include "td/telegram/files/FileStats.h"
 #include "td/telegram/files/FileStatsWorker.h"
 #include "td/telegram/td_api.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/CancellationToken.h"
 #include "td/utils/common.h"
 #include "td/utils/Slice.h"
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index c6d1eac35..e1bce3600 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -97,7 +97,9 @@
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/StorageManager.h"
 #include "td/telegram/SuggestedAction.h"
+#include "td/telegram/td_api.hpp"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/telegram_api.hpp"
 #include "td/telegram/ThemeManager.h"
 #include "td/telegram/TopDialogCategory.h"
 #include "td/telegram/TopDialogManager.h"
@@ -109,13 +111,6 @@
 #include "td/telegram/WebPageId.h"
 #include "td/telegram/WebPagesManager.h"
 
-#include "td/telegram/td_api.hpp"
-#include "td/telegram/telegram_api.h"
-#include "td/telegram/telegram_api.hpp"
-
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/BinlogEvent.h"
 
 #include "td/mtproto/DhCallback.h"
@@ -125,6 +120,9 @@
 #include "td/mtproto/RSA.h"
 #include "td/mtproto/TransportType.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/filesystem.h"
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index 13e53ca76..a6916db38 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -11,19 +11,18 @@
 #include "td/telegram/net/MtprotoHeader.h"
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/net/NetQueryStats.h"
+#include "td/telegram/td_api.h"
 #include "td/telegram/TdCallback.h"
 #include "td/telegram/TdParameters.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/TermsOfService.h"
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
+#include "td/db/DbKey.h"
 
 #include "td/actor/actor.h"
 #include "td/actor/PromiseFuture.h"
 #include "td/actor/Timeout.h"
 
-#include "td/db/DbKey.h"
-
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/Container.h"
diff --git a/td/telegram/TdDb.cpp b/td/telegram/TdDb.cpp
index de0ac900c..d4ae42a2c 100644
--- a/td/telegram/TdDb.cpp
+++ b/td/telegram/TdDb.cpp
@@ -15,8 +15,6 @@
 #include "td/telegram/TdParameters.h"
 #include "td/telegram/Version.h"
 
-#include "td/actor/MultiPromise.h"
-
 #include "td/db/binlog/Binlog.h"
 #include "td/db/binlog/ConcurrentBinlog.h"
 #include "td/db/BinlogKeyValue.h"
@@ -26,6 +24,8 @@
 #include "td/db/SqliteKeyValueAsync.h"
 #include "td/db/SqliteKeyValueSafe.h"
 
+#include "td/actor/MultiPromise.h"
+
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/TopDialogManager.cpp b/td/telegram/TopDialogManager.cpp
index c759b1a7d..9c4f6911c 100644
--- a/td/telegram/TopDialogManager.cpp
+++ b/td/telegram/TopDialogManager.cpp
@@ -19,6 +19,8 @@
 #include "td/telegram/StateManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
+#include "td/telegram/telegram_api.h"
 
 #include "td/utils/algorithm.h"
 #include "td/utils/logging.h"
@@ -30,8 +32,6 @@
 #include "td/utils/Status.h"
 #include "td/utils/tl_helpers.h"
 
-#include "td/telegram/telegram_api.h"
-
 #include <algorithm>
 #include <cmath>
 #include <iterator>
diff --git a/td/telegram/TopDialogManager.h b/td/telegram/TopDialogManager.h
index dedb31d13..7f9fed36e 100644
--- a/td/telegram/TopDialogManager.h
+++ b/td/telegram/TopDialogManager.h
@@ -6,14 +6,14 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/DialogId.h"
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/telegram_api.h"
 #include "td/telegram/TopDialogCategory.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/common.h"
 #include "td/utils/Time.h"
 
diff --git a/td/telegram/WebPageBlock.h b/td/telegram/WebPageBlock.h
index 05d2b2f0f..54602202d 100644
--- a/td/telegram/WebPageBlock.h
+++ b/td/telegram/WebPageBlock.h
@@ -6,12 +6,11 @@
 //
 #pragma once
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"
-
 #include "td/telegram/files/FileId.h"
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/Photo.h"
+#include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
 #include "td/utils/Slice.h"
diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp
index 0bff09047..ddde9edad 100644
--- a/td/telegram/WebPagesManager.cpp
+++ b/td/telegram/WebPagesManager.cpp
@@ -26,13 +26,12 @@
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/VideoNotesManager.h"
 #include "td/telegram/VideosManager.h"
 #include "td/telegram/VoiceNotesManager.h"
 #include "td/telegram/WebPageBlock.h"
 
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/BinlogEvent.h"
 #include "td/db/binlog/BinlogHelper.h"
 #include "td/db/SqliteKeyValue.h"
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index b75f7f170..f85b9b52d 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -4,17 +4,17 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-
-#include "memprof/memprof.h"
+#include "td/telegram/Client.h"
+#include "td/telegram/ClientActor.h"
+#include "td/telegram/td_api_json.h"
 
 #include "td/net/HttpQuery.h"
 #include "td/net/HttpReader.h"
 
-#include "td/telegram/Client.h"
-#include "td/telegram/ClientActor.h"
-#include "td/telegram/td_api_json.h"
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+
+#include "memprof/memprof.h"
 
 #include "td/utils/algorithm.h"
 #include "td/utils/base64.h"
diff --git a/td/telegram/files/FileDb.cpp b/td/telegram/files/FileDb.cpp
index 98cca8621..31fc394e4 100644
--- a/td/telegram/files/FileDb.cpp
+++ b/td/telegram/files/FileDb.cpp
@@ -13,13 +13,13 @@
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/Version.h"
 
-#include "td/actor/actor.h"
-
 #include "td/db/SqliteConnectionSafe.h"
 #include "td/db/SqliteDb.h"
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueSafe.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
diff --git a/td/telegram/files/FileFromBytes.h b/td/telegram/files/FileFromBytes.h
index 73ec0a00e..f883817b0 100644
--- a/td/telegram/files/FileFromBytes.h
+++ b/td/telegram/files/FileFromBytes.h
@@ -6,12 +6,12 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-
 #include "td/telegram/files/FileLoader.h"
 #include "td/telegram/files/FileLocation.h"
 #include "td/telegram/files/FileType.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/port/FileFd.h"
diff --git a/td/telegram/files/FileGcWorker.cpp b/td/telegram/files/FileGcWorker.cpp
index 0a8bda3e7..467794307 100644
--- a/td/telegram/files/FileGcWorker.cpp
+++ b/td/telegram/files/FileGcWorker.cpp
@@ -10,6 +10,7 @@
 #include "td/telegram/files/FileManager.h"
 #include "td/telegram/files/FileType.h"
 #include "td/telegram/Global.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/utils/algorithm.h"
 #include "td/utils/format.h"
diff --git a/td/telegram/files/FileGcWorker.h b/td/telegram/files/FileGcWorker.h
index e7e6f8dbc..47b72fef1 100644
--- a/td/telegram/files/FileGcWorker.h
+++ b/td/telegram/files/FileGcWorker.h
@@ -6,12 +6,12 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/files/FileGcParameters.h"
 #include "td/telegram/files/FileStats.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/CancellationToken.h"
 #include "td/utils/logging.h"
 
diff --git a/td/telegram/files/FileGenerateManager.h b/td/telegram/files/FileGenerateManager.h
index a5063e7b3..089288672 100644
--- a/td/telegram/files/FileGenerateManager.h
+++ b/td/telegram/files/FileGenerateManager.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
+#include "td/telegram/files/FileLocation.h"
+
 #include "td/actor/actor.h"
 #include "td/actor/PromiseFuture.h"
 
-#include "td/telegram/files/FileLocation.h"
-
 #include "td/utils/Status.h"
 
 #include <map>
diff --git a/td/telegram/files/FileLoadManager.cpp b/td/telegram/files/FileLoadManager.cpp
index 3f4821a80..7d7b69f12 100644
--- a/td/telegram/files/FileLoadManager.cpp
+++ b/td/telegram/files/FileLoadManager.cpp
@@ -8,6 +8,7 @@
 
 #include "td/telegram/Global.h"
 #include "td/telegram/net/DcId.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/utils/common.h"
 #include "td/utils/filesystem.h"
diff --git a/td/telegram/files/FileLoadManager.h b/td/telegram/files/FileLoadManager.h
index 47fdaf85c..2066e068c 100644
--- a/td/telegram/files/FileLoadManager.h
+++ b/td/telegram/files/FileLoadManager.h
@@ -6,9 +6,6 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/files/FileDownloader.h"
 #include "td/telegram/files/FileEncryptionKey.h"
 #include "td/telegram/files/FileFromBytes.h"
@@ -19,6 +16,9 @@
 #include "td/telegram/files/ResourceManager.h"
 #include "td/telegram/net/DcId.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/Container.h"
 #include "td/utils/Status.h"
diff --git a/td/telegram/files/FileLoader.h b/td/telegram/files/FileLoader.h
index d529d818d..848447c81 100644
--- a/td/telegram/files/FileLoader.h
+++ b/td/telegram/files/FileLoader.h
@@ -6,8 +6,6 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-
 #include "td/telegram/DelayDispatcher.h"
 #include "td/telegram/files/FileLoaderActor.h"
 #include "td/telegram/files/FileLocation.h"
@@ -16,6 +14,8 @@
 #include "td/telegram/files/ResourceState.h"
 #include "td/telegram/net/NetQuery.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/OrderedEventsProcessor.h"
 #include "td/utils/Status.h"
 
diff --git a/td/telegram/files/FileLoaderUtils.cpp b/td/telegram/files/FileLoaderUtils.cpp
index 23e5ac973..4556909a1 100644
--- a/td/telegram/files/FileLoaderUtils.cpp
+++ b/td/telegram/files/FileLoaderUtils.cpp
@@ -9,6 +9,7 @@
 #include "td/telegram/files/FileLocation.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/utils/common.h"
 #include "td/utils/filesystem.h"
diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index 644ed8e6a..a63a42a92 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -20,6 +20,7 @@
 #include "td/telegram/misc.h"
 #include "td/telegram/SecureStorage.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 #include "td/telegram/Version.h"
 
 #include "td/actor/SleepActor.h"
diff --git a/td/telegram/files/FileStatsWorker.cpp b/td/telegram/files/FileStatsWorker.cpp
index e50e143d1..e3e5ba934 100644
--- a/td/telegram/files/FileStatsWorker.cpp
+++ b/td/telegram/files/FileStatsWorker.cpp
@@ -15,6 +15,7 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/db/SqliteKeyValue.h"
 
diff --git a/td/telegram/files/FileStatsWorker.h b/td/telegram/files/FileStatsWorker.h
index c3f545c02..1da42f160 100644
--- a/td/telegram/files/FileStatsWorker.h
+++ b/td/telegram/files/FileStatsWorker.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
+#include "td/telegram/files/FileStats.h"
+
 #include "td/actor/actor.h"
 #include "td/actor/PromiseFuture.h"
 
-#include "td/telegram/files/FileStats.h"
-
 #include "td/utils/CancellationToken.h"
 
 namespace td {
diff --git a/td/telegram/files/ResourceManager.h b/td/telegram/files/ResourceManager.h
index 1fe1753ec..31f5b8b93 100644
--- a/td/telegram/files/ResourceManager.h
+++ b/td/telegram/files/ResourceManager.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-
 #include "td/telegram/files/FileLoaderActor.h"
 #include "td/telegram/files/ResourceState.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/Container.h"
 #include "td/utils/Heap.h"
 
diff --git a/td/telegram/net/AuthDataShared.h b/td/telegram/net/AuthDataShared.h
index 1fdb2d42e..581c79ffa 100644
--- a/td/telegram/net/AuthDataShared.h
+++ b/td/telegram/net/AuthDataShared.h
@@ -6,12 +6,12 @@
 //
 #pragma once
 
-#include "td/mtproto/AuthData.h"
-#include "td/mtproto/AuthKey.h"
-
 #include "td/telegram/net/DcId.h"
 #include "td/telegram/net/PublicRsaKeyShared.h"
 
+#include "td/mtproto/AuthData.h"
+#include "td/mtproto/AuthKey.h"
+
 #include "td/utils/common.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/StringBuilder.h"
diff --git a/td/telegram/net/DcAuthManager.cpp b/td/telegram/net/DcAuthManager.cpp
index 39f830f16..cf3969036 100644
--- a/td/telegram/net/DcAuthManager.cpp
+++ b/td/telegram/net/DcAuthManager.cpp
@@ -6,16 +6,15 @@
 //
 #include "td/telegram/net/DcAuthManager.h"
 
-#include "td/actor/actor.h"
-
 #include "td/telegram/Global.h"
 #include "td/telegram/net/AuthDataShared.h"
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/TdDb.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/UniqueId.h"
 
-#include "td/telegram/telegram_api.h"
+#include "td/actor/actor.h"
 
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
diff --git a/td/telegram/net/DcOptions.h b/td/telegram/net/DcOptions.h
index eee4fd10e..284e3866e 100644
--- a/td/telegram/net/DcOptions.h
+++ b/td/telegram/net/DcOptions.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
-#include "td/mtproto/ProxySecret.h"
-
 #include "td/telegram/net/DcId.h"
 #include "td/telegram/telegram_api.h"
 
+#include "td/mtproto/ProxySecret.h"
+
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/net/NetStatsManager.cpp b/td/telegram/net/NetStatsManager.cpp
index ce64866c8..2caa38146 100644
--- a/td/telegram/net/NetStatsManager.cpp
+++ b/td/telegram/net/NetStatsManager.cpp
@@ -6,9 +6,6 @@
 //
 #include "td/telegram/net/NetStatsManager.h"
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/telegram/ConfigShared.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/logevent/LogEvent.h"
diff --git a/td/telegram/net/NetStatsManager.h b/td/telegram/net/NetStatsManager.h
index 98299abbd..66bc77e0f 100644
--- a/td/telegram/net/NetStatsManager.h
+++ b/td/telegram/net/NetStatsManager.h
@@ -6,16 +6,15 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
-#include "td/telegram/td_api.h"
-
 #include "td/telegram/files/FileType.h"
 #include "td/telegram/net/NetType.h"
+#include "td/telegram/td_api.h"
 
 #include "td/net/NetStats.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/Slice.h"
 
 #include <array>
diff --git a/td/telegram/net/SessionProxy.cpp b/td/telegram/net/SessionProxy.cpp
index 690505599..58eea2606 100644
--- a/td/telegram/net/SessionProxy.cpp
+++ b/td/telegram/net/SessionProxy.cpp
@@ -16,6 +16,7 @@
 
 #include "td/actor/PromiseFuture.h"
 
+#include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/Slice.h"
diff --git a/td/telegram/net/TempAuthKeyWatchdog.h b/td/telegram/net/TempAuthKeyWatchdog.h
index 388ae97d3..2d3f7b754 100644
--- a/td/telegram/net/TempAuthKeyWatchdog.h
+++ b/td/telegram/net/TempAuthKeyWatchdog.h
@@ -6,14 +6,13 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-
 #include "td/telegram/Global.h"
 #include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
-
 #include "td/telegram/telegram_api.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
diff --git a/td/telegram/td_emscripten.cpp b/td/telegram/td_emscripten.cpp
index e03c9862d..2022a59d6 100644
--- a/td/telegram/td_emscripten.cpp
+++ b/td/telegram/td_emscripten.cpp
@@ -4,11 +4,11 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/actor/ConcurrentScheduler.h"
-
 #include "td/telegram/td_json_client.h"
 #include "td/telegram/td_log.h"
 
+#include "td/actor/ConcurrentScheduler.h"
+
 #include <emscripten.h>
 
 extern "C" {
diff --git a/td/tl/tl_json.h b/td/tl/tl_json.h
index 9b5b6f282..be863636c 100644
--- a/td/tl/tl_json.h
+++ b/td/tl/tl_json.h
@@ -16,7 +16,6 @@
 #include "td/utils/Slice.h"
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/Status.h"
-#include "td/utils/tl_storers.h"
 #include "td/utils/TlDowncastHelper.h"
 
 #include <type_traits>
diff --git a/tdactor/test/actors_bugs.cpp b/tdactor/test/actors_bugs.cpp
index 683f1f74f..18ef08f59 100644
--- a/tdactor/test/actors_bugs.cpp
+++ b/tdactor/test/actors_bugs.cpp
@@ -4,15 +4,15 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+#include "td/actor/Timeout.h"
+
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/Random.h"
 #include "td/utils/tests.h"
 
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-#include "td/actor/Timeout.h"
-
 using namespace td;
 
 TEST(MultiTimeout, bug) {
diff --git a/tdactor/test/actors_main.cpp b/tdactor/test/actors_main.cpp
index aed69d216..87d4cac22 100644
--- a/tdactor/test/actors_main.cpp
+++ b/tdactor/test/actors_main.cpp
@@ -4,8 +4,6 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/utils/tests.h"
-
 #include "td/actor/actor.h"
 #include "td/actor/ConcurrentScheduler.h"
 #include "td/actor/PromiseFuture.h"
@@ -14,6 +12,7 @@
 #include "td/utils/logging.h"
 #include "td/utils/Random.h"
 #include "td/utils/ScopeGuard.h"
+#include "td/utils/tests.h"
 
 #include <limits>
 #include <map>
diff --git a/tdactor/test/actors_simple.cpp b/tdactor/test/actors_simple.cpp
index f360bde30..967394a69 100644
--- a/tdactor/test/actors_simple.cpp
+++ b/tdactor/test/actors_simple.cpp
@@ -4,8 +4,6 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/utils/tests.h"
-
 #include "td/actor/actor.h"
 #include "td/actor/ConcurrentScheduler.h"
 #include "td/actor/MultiPromise.h"
@@ -23,6 +21,7 @@
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
+#include "td/utils/tests.h"
 #include "td/utils/Time.h"
 
 #include <memory>
diff --git a/tdactor/test/actors_workers.cpp b/tdactor/test/actors_workers.cpp
index 30492834c..bfbe2c90f 100644
--- a/tdactor/test/actors_workers.cpp
+++ b/tdactor/test/actors_workers.cpp
@@ -4,12 +4,11 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
-#include "td/utils/tests.h"
-
 #include "td/actor/actor.h"
 #include "td/actor/ConcurrentScheduler.h"
 
 #include "td/utils/SliceBuilder.h"
+#include "td/utils/tests.h"
 
 namespace {
 
diff --git a/tddb/td/db/BinlogKeyValue.h b/tddb/td/db/BinlogKeyValue.h
index 010f6d808..48e6484f9 100644
--- a/tddb/td/db/BinlogKeyValue.h
+++ b/tddb/td/db/BinlogKeyValue.h
@@ -6,13 +6,13 @@
 //
 #pragma once
 
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/Binlog.h"
 #include "td/db/binlog/BinlogEvent.h"
 #include "td/db/DbKey.h"
 #include "td/db/KeyValueSyncInterface.h"
 
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
diff --git a/tddb/td/db/SqliteConnectionSafe.h b/tddb/td/db/SqliteConnectionSafe.h
index 002f8c88e..8a49548d2 100644
--- a/tddb/td/db/SqliteConnectionSafe.h
+++ b/tddb/td/db/SqliteConnectionSafe.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
-#include "td/actor/SchedulerLocalStorage.h"
-
 #include "td/db/DbKey.h"
 #include "td/db/SqliteDb.h"
 
+#include "td/actor/SchedulerLocalStorage.h"
+
 #include "td/utils/common.h"
 #include "td/utils/optional.h"
 
diff --git a/tddb/td/db/SqliteStatement.h b/tddb/td/db/SqliteStatement.h
index 828730f7e..055455aab 100644
--- a/tddb/td/db/SqliteStatement.h
+++ b/tddb/td/db/SqliteStatement.h
@@ -6,14 +6,14 @@
 //
 #pragma once
 
+#include "td/db/detail/RawSqliteDb.h"
+
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 
-#include "td/db/detail/RawSqliteDb.h"
-
 #include <memory>
 
 struct sqlite3;
diff --git a/tddb/td/db/binlog/BinlogHelper.h b/tddb/td/db/binlog/BinlogHelper.h
index ef877fa92..9a8669b71 100644
--- a/tddb/td/db/binlog/BinlogHelper.h
+++ b/tddb/td/db/binlog/BinlogHelper.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/BinlogEvent.h"
 #include "td/db/binlog/BinlogInterface.h"
 
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/common.h"
 #include "td/utils/StorerBase.h"
 
diff --git a/tddb/td/db/binlog/BinlogInterface.h b/tddb/td/db/binlog/BinlogInterface.h
index 2d306b7aa..21fe53451 100644
--- a/tddb/td/db/binlog/BinlogInterface.h
+++ b/tddb/td/db/binlog/BinlogInterface.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/BinlogEvent.h"
 #include "td/db/DbKey.h"
 
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/StorerBase.h"
diff --git a/tddb/td/db/binlog/ConcurrentBinlog.h b/tddb/td/db/binlog/ConcurrentBinlog.h
index 876572e05..d66e42277 100644
--- a/tddb/td/db/binlog/ConcurrentBinlog.h
+++ b/tddb/td/db/binlog/ConcurrentBinlog.h
@@ -6,13 +6,13 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/Binlog.h"
 #include "td/db/binlog/BinlogInterface.h"
 #include "td/db/DbKey.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
 #include "td/utils/Slice.h"
diff --git a/tdnet/td/net/HttpConnectionBase.h b/tdnet/td/net/HttpConnectionBase.h
index 43e7ec676..f77add381 100644
--- a/tdnet/td/net/HttpConnectionBase.h
+++ b/tdnet/td/net/HttpConnectionBase.h
@@ -6,12 +6,12 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-
 #include "td/net/HttpQuery.h"
 #include "td/net/HttpReader.h"
 #include "td/net/SslStream.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/buffer.h"
 #include "td/utils/BufferedFd.h"
 #include "td/utils/ByteFlow.h"
diff --git a/tdnet/td/net/HttpInboundConnection.h b/tdnet/td/net/HttpInboundConnection.h
index 4d5a387b3..f0079534e 100644
--- a/tdnet/td/net/HttpInboundConnection.h
+++ b/tdnet/td/net/HttpInboundConnection.h
@@ -6,11 +6,11 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-
 #include "td/net/HttpConnectionBase.h"
 #include "td/net/HttpQuery.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/port/SocketFd.h"
 #include "td/utils/Status.h"
 
diff --git a/tdnet/td/net/HttpOutboundConnection.h b/tdnet/td/net/HttpOutboundConnection.h
index cfefc12bb..1440a05e2 100644
--- a/tdnet/td/net/HttpOutboundConnection.h
+++ b/tdnet/td/net/HttpOutboundConnection.h
@@ -6,12 +6,12 @@
 //
 #pragma once
 
-#include "td/actor/actor.h"
-
 #include "td/net/HttpConnectionBase.h"
 #include "td/net/HttpQuery.h"
 #include "td/net/SslStream.h"
 
+#include "td/actor/actor.h"
+
 #include "td/utils/port/SocketFd.h"
 #include "td/utils/Status.h"
 
diff --git a/tdutils/td/utils/TlDowncastHelper.h b/tdutils/td/utils/TlDowncastHelper.h
index c573683af..4ca64db64 100644
--- a/tdutils/td/utils/TlDowncastHelper.h
+++ b/tdutils/td/utils/TlDowncastHelper.h
@@ -6,6 +6,9 @@
 //
 #pragma once
 
+#include "td/utils/common.h"
+#include "td/utils/tl_storers.h"
+
 namespace td {
 
 template <class T>
diff --git a/test/secret.cpp b/test/secret.cpp
index df5d6197a..6d9f693f3 100644
--- a/test/secret.cpp
+++ b/test/secret.cpp
@@ -8,16 +8,11 @@
 #include "td/telegram/FolderId.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/MessageId.h"
+#include "td/telegram/secret_api.h"
 #include "td/telegram/SecretChatActor.h"
 #include "td/telegram/SecretChatId.h"
-
-#include "td/telegram/secret_api.h"
 #include "td/telegram/telegram_api.h"
 
-#include "td/actor/actor.h"
-#include "td/actor/ConcurrentScheduler.h"
-#include "td/actor/PromiseFuture.h"
-
 #include "td/db/binlog/BinlogInterface.h"
 #include "td/db/binlog/detail/BinlogEventsProcessor.h"
 #include "td/db/BinlogKeyValue.h"
@@ -29,6 +24,10 @@
 #include "td/tl/tl_object_parse.h"
 #include "td/tl/tl_object_store.h"
 
+#include "td/actor/actor.h"
+#include "td/actor/ConcurrentScheduler.h"
+#include "td/actor/PromiseFuture.h"
+
 #include "td/utils/algorithm.h"
 #include "td/utils/as.h"
 #include "td/utils/base64.h"