diff --git a/td/mtproto/utils.h b/td/mtproto/utils.h
index 2e80e1563..4e5e3ae71 100644
--- a/td/mtproto/utils.h
+++ b/td/mtproto/utils.h
@@ -6,14 +6,8 @@
 //
 #pragma once
 
-#include "td/utils/buffer.h"
-#include "td/utils/format.h"
-#include "td/utils/logging.h"
-#include "td/utils/Slice.h"
-#include "td/utils/Status.h"
 #include "td/utils/Storer.h"
 #include "td/utils/StorerBase.h"
-#include "td/utils/tl_parsers.h"
 #include "td/utils/tl_storers.h"
 
 #include <limits>
diff --git a/td/telegram/LanguagePackManager.cpp b/td/telegram/LanguagePackManager.cpp
index 53dadda8c..0fff0d786 100644
--- a/td/telegram/LanguagePackManager.cpp
+++ b/td/telegram/LanguagePackManager.cpp
@@ -10,7 +10,6 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/misc.h"
-#include "td/telegram/net/DcId.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/Td.h"
 
diff --git a/td/telegram/Payments.cpp b/td/telegram/Payments.cpp
index f3bb976ea..a73a97fd1 100644
--- a/td/telegram/Payments.cpp
+++ b/td/telegram/Payments.cpp
@@ -12,7 +12,6 @@
 #include "td/telegram/ContactsManager.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/misc.h"
-#include "td/telegram/net/DcId.h"
 #include "td/telegram/PasswordManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/UpdatesManager.h"
diff --git a/td/telegram/PhoneNumberManager.cpp b/td/telegram/PhoneNumberManager.cpp
index 10f2c481e..7c3038ce6 100644
--- a/td/telegram/PhoneNumberManager.cpp
+++ b/td/telegram/PhoneNumberManager.cpp
@@ -7,7 +7,6 @@
 #include "td/telegram/PhoneNumberManager.h"
 
 #include "td/telegram/Global.h"
-#include "td/telegram/net/DcId.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/td_api.h"
diff --git a/td/telegram/SecretChatActor.cpp b/td/telegram/SecretChatActor.cpp
index 3182fdac1..2bf13ca90 100644
--- a/td/telegram/SecretChatActor.cpp
+++ b/td/telegram/SecretChatActor.cpp
@@ -6,6 +6,7 @@
 //
 #include "td/telegram/SecretChatActor.h"
 
+#include "td/telegram/net/DcId.h"
 #include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/SecretChatId.h"
 #include "td/telegram/ServerMessageId.h"
@@ -570,7 +571,6 @@ Status SecretChatActor::run_auth() {
         return Status::OK();
       }
       // messages.requestEncryption#f64daf43 user_id:InputUser random_id:int g_a:bytes = EncryptedChat;
-      ;
       auto query = create_net_query(QueryType::EncryptedChat, telegram_api::messages_requestEncryption(
                                                                   get_input_user(), auth_state_.random_id,
                                                                   BufferSlice(auth_state_.handshake.get_g_b())));
@@ -758,7 +758,6 @@ void SecretChatActor::do_close_chat_impl(unique_ptr<logevent::CloseSecretChat> e
   context_->secret_chat_db()->erase_value(config_state_);
   context_->secret_chat_db()->erase_value(pfs_state_);
   context_->secret_chat_db()->erase_value(seq_no_state_);
-  ;
   auto query = create_net_query(QueryType::DiscardEncryption, telegram_api::messages_discardEncryption(auth_state_.id));
 
   send_update_secret_chat();
diff --git a/td/telegram/SecretChatActor.h b/td/telegram/SecretChatActor.h
index c24442c8f..3adbd4711 100644
--- a/td/telegram/SecretChatActor.h
+++ b/td/telegram/SecretChatActor.h
@@ -31,7 +31,6 @@
 #include "td/utils/port/Clocks.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
-#include "td/utils/StorerBase.h"
 #include "td/utils/StringBuilder.h"
 #include "td/utils/Time.h"
 #include "td/utils/tl_helpers.h"
diff --git a/td/telegram/StorageManager.cpp b/td/telegram/StorageManager.cpp
index 96cffe83b..886c3071b 100644
--- a/td/telegram/StorageManager.cpp
+++ b/td/telegram/StorageManager.cpp
@@ -7,7 +7,6 @@
 #include "td/telegram/StorageManager.h"
 
 #include "td/telegram/ConfigShared.h"
-#include "td/telegram/DialogId.h"
 #include "td/telegram/files/FileGcWorker.h"
 #include "td/telegram/files/FileStatsWorker.h"
 #include "td/telegram/Global.h"
diff --git a/td/telegram/WebPageBlock.cpp b/td/telegram/WebPageBlock.cpp
index 79ddb2f44..b213a918b 100644
--- a/td/telegram/WebPageBlock.cpp
+++ b/td/telegram/WebPageBlock.cpp
@@ -17,7 +17,6 @@
 #include "td/telegram/DocumentsManager.h"
 #include "td/telegram/DocumentsManager.hpp"
 #include "td/telegram/files/FileId.h"
-#include "td/telegram/Global.h"
 #include "td/telegram/Location.h"
 #include "td/telegram/Photo.h"
 #include "td/telegram/Photo.hpp"
diff --git a/td/telegram/net/NetQuery.h b/td/telegram/net/NetQuery.h
index 86cd89776..3ed0763e7 100644
--- a/td/telegram/net/NetQuery.h
+++ b/td/telegram/net/NetQuery.h
@@ -19,6 +19,7 @@
 #include "td/utils/List.h"
 #include "td/utils/logging.h"
 #include "td/utils/ObjectPool.h"
+#include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
 #include "td/utils/Time.h"
diff --git a/td/telegram/net/PublicRsaKeyWatchdog.cpp b/td/telegram/net/PublicRsaKeyWatchdog.cpp
index b192b18b4..25b96c44e 100644
--- a/td/telegram/net/PublicRsaKeyWatchdog.cpp
+++ b/td/telegram/net/PublicRsaKeyWatchdog.cpp
@@ -7,7 +7,7 @@
 #include "td/telegram/net/PublicRsaKeyWatchdog.h"
 
 #include "td/telegram/Global.h"
-#include "td/telegram/net/DcId.h"
+#include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/TdDb.h"
 
 #include "td/telegram/telegram_api.h"
diff --git a/td/telegram/net/Session.cpp b/td/telegram/net/Session.cpp
index 225c95e13..edf9c0ea9 100644
--- a/td/telegram/net/Session.cpp
+++ b/td/telegram/net/Session.cpp
@@ -10,6 +10,7 @@
 
 #include "td/telegram/DhCache.h"
 #include "td/telegram/Global.h"
+#include "td/telegram/net/DcId.h"
 #include "td/telegram/net/MtprotoHeader.h"
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
diff --git a/td/telegram/net/TempAuthKeyWatchdog.h b/td/telegram/net/TempAuthKeyWatchdog.h
index 203ae55b8..4a31e59c7 100644
--- a/td/telegram/net/TempAuthKeyWatchdog.h
+++ b/td/telegram/net/TempAuthKeyWatchdog.h
@@ -9,7 +9,6 @@
 #include "td/actor/actor.h"
 
 #include "td/telegram/Global.h"
-#include "td/telegram/net/DcId.h"
 #include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 
diff --git a/tdutils/test/gzip.cpp b/tdutils/test/gzip.cpp
index 4c7bd683f..06b2d3a60 100644
--- a/tdutils/test/gzip.cpp
+++ b/tdutils/test/gzip.cpp
@@ -6,6 +6,7 @@
 //
 #include "td/utils/buffer.h"
 #include "td/utils/ByteFlow.h"
+#include "td/utils/common.h"
 #include "td/utils/Gzip.h"
 #include "td/utils/GzipByteFlow.h"
 #include "td/utils/logging.h"