diff --git a/td/telegram/BusinessAwayMessage.cpp b/td/telegram/BusinessAwayMessage.cpp
index 273aafb85..63ffe920e 100644
--- a/td/telegram/BusinessAwayMessage.cpp
+++ b/td/telegram/BusinessAwayMessage.cpp
@@ -6,14 +6,6 @@
 //
 #include "td/telegram/BusinessAwayMessage.h"
 
-#include "td/telegram/ContactsManager.h"
-#include "td/telegram/DialogId.h"
-#include "td/telegram/DialogManager.h"
-#include "td/telegram/Td.h"
-
-#include "td/utils/algorithm.h"
-#include "td/utils/misc.h"
-
 namespace td {
 
 BusinessAwayMessage::BusinessAwayMessage(telegram_api::object_ptr<telegram_api::businessAwayMessage> away_message) {
diff --git a/td/telegram/BusinessGreetingMessage.cpp b/td/telegram/BusinessGreetingMessage.cpp
index 08967767b..59393d96a 100644
--- a/td/telegram/BusinessGreetingMessage.cpp
+++ b/td/telegram/BusinessGreetingMessage.cpp
@@ -6,12 +6,6 @@
 //
 #include "td/telegram/BusinessGreetingMessage.h"
 
-#include "td/telegram/ContactsManager.h"
-#include "td/telegram/DialogId.h"
-#include "td/telegram/DialogManager.h"
-#include "td/telegram/Td.h"
-
-#include "td/utils/algorithm.h"
 #include "td/utils/misc.h"
 
 namespace td {
diff --git a/td/telegram/BusinessManager.cpp b/td/telegram/BusinessManager.cpp
index b8c45b1d8..1b7804d7c 100644
--- a/td/telegram/BusinessManager.cpp
+++ b/td/telegram/BusinessManager.cpp
@@ -9,6 +9,7 @@
 #include "td/telegram/BusinessAwayMessage.h"
 #include "td/telegram/BusinessConnectedBot.h"
 #include "td/telegram/BusinessGreetingMessage.h"
+#include "td/telegram/BusinessRecipients.h"
 #include "td/telegram/BusinessWorkHours.h"
 #include "td/telegram/ContactsManager.h"
 #include "td/telegram/DialogLocation.h"
@@ -18,6 +19,7 @@
 #include "td/telegram/UpdatesManager.h"
 
 #include "td/utils/buffer.h"
+#include "td/utils/logging.h"
 #include "td/utils/Status.h"
 
 namespace td {
diff --git a/td/telegram/QuickReplyManager.cpp b/td/telegram/QuickReplyManager.cpp
index 1537cccab..b7704d39d 100644
--- a/td/telegram/QuickReplyManager.cpp
+++ b/td/telegram/QuickReplyManager.cpp
@@ -6,6 +6,7 @@
 //
 #include "td/telegram/QuickReplyManager.h"
 
+#include "td/telegram/AccessRights.h"
 #include "td/telegram/AuthManager.h"
 #include "td/telegram/ContactsManager.h"
 #include "td/telegram/Dependencies.h"
@@ -17,22 +18,31 @@
 #include "td/telegram/logevent/LogEventHelper.h"
 #include "td/telegram/MessageContent.h"
 #include "td/telegram/MessageContentType.h"
+#include "td/telegram/MessageCopyOptions.h"
 #include "td/telegram/MessageReplyHeader.h"
 #include "td/telegram/MessageSelfDestructType.h"
 #include "td/telegram/misc.h"
-#include "td/telegram/RepliedMessageInfo.h"
 #include "td/telegram/ReplyMarkup.h"
 #include "td/telegram/ReplyMarkup.hpp"
+#include "td/telegram/ServerMessageId.h"
+#include "td/telegram/StoryFullId.h"
 #include "td/telegram/Td.h"
+#include "td/telegram/TdDb.h"
+#include "td/telegram/telegram_api.h"
 #include "td/telegram/Version.h"
 
 #include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
+#include "td/utils/Time.h"
+#include "td/utils/tl_helpers.h"
 #include "td/utils/unicode.h"
 #include "td/utils/utf8.h"
 
+#include <algorithm>
+
 namespace td {
 
 class GetQuickRepliesQuery final : public Td::ResultHandler {
@@ -1409,7 +1419,6 @@ Result<vector<QuickReplyManager::QuickReplyMessageContent>> QuickReplyManager::g
     return Status::Error(400, "Can't use quick replies in the chat");
   }
 
-  std::unordered_map<int64, std::pair<int64, int32>, Hash<int64>> new_media_album_ids;
   vector<QuickReplyMessageContent> result;
   for (auto &message : shortcut->messages_) {
     if (!message->message_id.is_server()) {
diff --git a/td/telegram/QuickReplyManager.h b/td/telegram/QuickReplyManager.h
index 8ad27d165..2590ab546 100644
--- a/td/telegram/QuickReplyManager.h
+++ b/td/telegram/QuickReplyManager.h
@@ -13,6 +13,7 @@
 #include "td/telegram/QuickReplyMessageFullId.h"
 #include "td/telegram/QuickReplyShortcutId.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/TimeZoneManager.cpp b/td/telegram/TimeZoneManager.cpp
index 7df9693fa..db3e61888 100644
--- a/td/telegram/TimeZoneManager.cpp
+++ b/td/telegram/TimeZoneManager.cpp
@@ -9,10 +9,12 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/Td.h"
+#include "td/telegram/TdDb.h"
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
+#include "td/utils/logging.h"
 #include "td/utils/tl_helpers.h"
 
 namespace td {
diff --git a/td/telegram/TimeZoneManager.h b/td/telegram/TimeZoneManager.h
index 1758543f1..c73fbbfc5 100644
--- a/td/telegram/TimeZoneManager.h
+++ b/td/telegram/TimeZoneManager.h
@@ -13,6 +13,7 @@
 
 #include "td/utils/common.h"
 #include "td/utils/Promise.h"
+#include "td/utils/Status.h"
 
 namespace td {