diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index c1d70b359..afb1f51e1 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -6973,7 +6973,7 @@ requestQrCodeAuthentication other_user_ids:vector<int53> = Ok;
 //@description Finishes user registration. Works only when the current authorization state is authorizationStateWaitRegistration
 //@first_name The first name of the user; 1-64 characters
 //@last_name The last name of the user; 0-64 characters
-//@disable_notification Pass true to disable notification about the current user joining Telegram for other users that added them to contacts list
+//@disable_notification Pass true to disable notification about the current user joining Telegram for other users that added them to contact list
 registerUser first_name:string last_name:string disable_notification:Bool = Ok;
 
 //@description Resets the login email address. May return an error with a message "TASK_ALREADY_EXISTS" if reset is still pending.
diff --git a/td/telegram/DraftMessage.cpp b/td/telegram/DraftMessage.cpp
index 041b3720f..c045c6602 100644
--- a/td/telegram/DraftMessage.cpp
+++ b/td/telegram/DraftMessage.cpp
@@ -20,6 +20,7 @@
 
 #include "td/utils/buffer.h"
 #include "td/utils/logging.h"
+#include "td/utils/tl_helpers.h"
 
 namespace td {
 
@@ -171,10 +172,10 @@ class DraftMessageContentVideoNote final : public DraftMessageContent {
     return DraftMessageContentType::VideoNote;
   }
 
-  td_api::object_ptr<td_api::InputMessageContent> get_input_message_content_object() const final {
+  td_api::object_ptr<td_api::InputMessageContent> get_draft_input_message_content_object() const final {
     return td_api::make_object<td_api::inputMessageVideoNote>(td_api::make_object<td_api::inputFileLocal>(path_),
                                                               nullptr, duration_, length_,
-                                                              ttl_.get_message_self_desctruct_type_object());
+                                                              ttl_.get_message_self_destruct_type_object());
   }
 
   template <class StorerT>
@@ -247,10 +248,10 @@ class DraftMessageContentVoiceNote final : public DraftMessageContent {
     return DraftMessageContentType::VoiceNote;
   }
 
-  td_api::object_ptr<td_api::InputMessageContent> get_input_message_content_object() const final {
+  td_api::object_ptr<td_api::InputMessageContent> get_draft_input_message_content_object() const final {
     return td_api::make_object<td_api::inputMessageVoiceNote>(td_api::make_object<td_api::inputFileLocal>(path_),
                                                               duration_, waveform_, nullptr,
-                                                              ttl_.get_message_self_desctruct_type_object());
+                                                              ttl_.get_message_self_destruct_type_object());
   }
 
   template <class StorerT>
@@ -396,7 +397,7 @@ void DraftMessage::add_dependencies(Dependencies &dependencies) const {
 td_api::object_ptr<td_api::draftMessage> DraftMessage::get_draft_message_object(Td *td) const {
   td_api::object_ptr<td_api::InputMessageContent> input_message_content;
   if (local_content_ != nullptr) {
-    input_message_content = local_content_->get_input_message_content_object();
+    input_message_content = local_content_->get_draft_input_message_content_object();
   } else {
     input_message_content = input_message_text_.get_input_message_text_object();
   }
diff --git a/td/telegram/DraftMessage.h b/td/telegram/DraftMessage.h
index 9cca70637..1f7db7207 100644
--- a/td/telegram/DraftMessage.h
+++ b/td/telegram/DraftMessage.h
@@ -36,7 +36,7 @@ class DraftMessageContent {
 
   virtual DraftMessageContentType get_type() const = 0;
 
-  virtual td_api::object_ptr<td_api::InputMessageContent> get_input_message_content_object() const = 0;
+  virtual td_api::object_ptr<td_api::InputMessageContent> get_draft_input_message_content_object() const = 0;
 
   virtual ~DraftMessageContent() = default;
 };
diff --git a/td/telegram/DraftMessage.hpp b/td/telegram/DraftMessage.hpp
index c4636b9c5..32ce42a8a 100644
--- a/td/telegram/DraftMessage.hpp
+++ b/td/telegram/DraftMessage.hpp
@@ -41,7 +41,7 @@ void DraftMessage::store(StorerT &storer) const {
 template <class ParserT>
 void DraftMessage::parse(ParserT &parser) {
   bool has_legacy_reply_to_message_id;
-  bool has_input_message_text = true;
+  bool has_input_message_text;
   bool has_message_input_reply_to = false;
   bool has_local_content = false;
   if (parser.version() >= static_cast<int32>(Version::SupportRepliesInOtherChats)) {
@@ -53,6 +53,7 @@ void DraftMessage::parse(ParserT &parser) {
     END_PARSE_FLAGS();
   } else {
     has_legacy_reply_to_message_id = true;
+    has_input_message_text = true;
   }
   td::parse(date_, parser);
   if (has_legacy_reply_to_message_id) {
diff --git a/td/telegram/MessageSelfDestructType.cpp b/td/telegram/MessageSelfDestructType.cpp
index a43adc402..4abee5764 100644
--- a/td/telegram/MessageSelfDestructType.cpp
+++ b/td/telegram/MessageSelfDestructType.cpp
@@ -58,7 +58,7 @@ Result<MessageSelfDestructType> MessageSelfDestructType::get_message_self_destru
   }
 }
 
-td_api::object_ptr<td_api::MessageSelfDestructType> MessageSelfDestructType::get_message_self_desctruct_type_object()
+td_api::object_ptr<td_api::MessageSelfDestructType> MessageSelfDestructType::get_message_self_destruct_type_object()
     const {
   if (is_immediate()) {
     return td_api::make_object<td_api::messageSelfDestructTypeImmediately>();
diff --git a/td/telegram/MessageSelfDestructType.h b/td/telegram/MessageSelfDestructType.h
index ed38fb38d..3939039b6 100644
--- a/td/telegram/MessageSelfDestructType.h
+++ b/td/telegram/MessageSelfDestructType.h
@@ -10,6 +10,7 @@
 #include "td/telegram/td_api.h"
 
 #include "td/utils/common.h"
+#include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
 #include "td/utils/tl_helpers.h"
 
@@ -47,7 +48,7 @@ class MessageSelfDestructType {
   static Result<MessageSelfDestructType> get_message_self_destruct_type(
       td_api::object_ptr<td_api::MessageSelfDestructType> &&self_destruct_type);
 
-  td_api::object_ptr<td_api::MessageSelfDestructType> get_message_self_desctruct_type_object() const;
+  td_api::object_ptr<td_api::MessageSelfDestructType> get_message_self_destruct_type_object() const;
 
   int32 get_input_ttl() const;
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index cbffe0b84..75d477729 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -22672,7 +22672,7 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
   auto has_timestamped_media = reply_to == nullptr || m->max_own_media_timestamp >= 0;
   auto reply_markup = get_reply_markup_object(td_->contacts_manager_.get(), m->reply_markup);
   auto content = get_message_message_content_object(dialog_id, m);
-  auto self_destruct_type = m->ttl.get_message_self_desctruct_type_object();
+  auto self_destruct_type = m->ttl.get_message_self_destruct_type_object();
 
   return td_api::make_object<td_api::message>(
       m->message_id.get(), std::move(sender), get_chat_id_object(dialog_id, "get_message_object"),
diff --git a/td/telegram/ReactionManager.cpp b/td/telegram/ReactionManager.cpp
index c74486c8b..93e78e90b 100644
--- a/td/telegram/ReactionManager.cpp
+++ b/td/telegram/ReactionManager.cpp
@@ -23,6 +23,7 @@
 #include "td/telegram/TdDb.h"
 #include "td/telegram/telegram_api.h"
 
+#include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteKeyValueAsync.h"
 
 #include "td/utils/algorithm.h"
@@ -30,7 +31,9 @@
 #include "td/utils/FlatHashSet.h"
 #include "td/utils/logging.h"
 #include "td/utils/ScopeGuard.h"
+#include "td/utils/SliceBuilder.h"
 #include "td/utils/Status.h"
+#include "td/utils/tl_helpers.h"
 
 #include <algorithm>
 #include <type_traits>
diff --git a/td/telegram/ReactionManager.h b/td/telegram/ReactionManager.h
index 2a014bdb3..eb18a7698 100644
--- a/td/telegram/ReactionManager.h
+++ b/td/telegram/ReactionManager.h
@@ -18,6 +18,7 @@
 #include "td/actor/actor.h"
 
 #include "td/utils/common.h"
+#include "td/utils/FlatHashMap.h"
 #include "td/utils/Promise.h"
 #include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
diff --git a/td/telegram/SavedMessagesManager.cpp b/td/telegram/SavedMessagesManager.cpp
index fd3b5e8b5..46f425554 100644
--- a/td/telegram/SavedMessagesManager.cpp
+++ b/td/telegram/SavedMessagesManager.cpp
@@ -12,6 +12,7 @@
 #include "td/telegram/DialogId.h"
 #include "td/telegram/DialogManager.h"
 #include "td/telegram/Global.h"
+#include "td/telegram/MessageFullId.h"
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/OptionManager.h"
 #include "td/telegram/ServerMessageId.h"
@@ -20,11 +21,12 @@
 
 #include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
-#include "td/utils/FlatHashMap.h"
+#include "td/utils/FlatHashSet.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 
-#include <limits>
+#include <algorithm>
 
 namespace td {
 
diff --git a/td/telegram/SavedMessagesManager.h b/td/telegram/SavedMessagesManager.h
index 46abba237..51d98520a 100644
--- a/td/telegram/SavedMessagesManager.h
+++ b/td/telegram/SavedMessagesManager.h
@@ -6,16 +6,21 @@
 //
 #pragma once
 
+#include "td/telegram/DialogId.h"
 #include "td/telegram/MessageId.h"
 #include "td/telegram/MessagesInfo.h"
 #include "td/telegram/SavedMessagesTopicId.h"
 #include "td/telegram/td_api.h"
+#include "td/telegram/telegram_api.h"
 
 #include "td/actor/actor.h"
 
 #include "td/utils/common.h"
+#include "td/utils/FlatHashMap.h"
 #include "td/utils/Promise.h"
+#include "td/utils/Status.h"
 
+#include <limits>
 #include <set>
 
 namespace td {
diff --git a/td/telegram/SavedMessagesTopicId.h b/td/telegram/SavedMessagesTopicId.h
index 8f2cce33e..2de568a0e 100644
--- a/td/telegram/SavedMessagesTopicId.h
+++ b/td/telegram/SavedMessagesTopicId.h
@@ -11,7 +11,6 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
-#include "td/utils/HashTableUtils.h"
 #include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
 
diff --git a/td/telegram/StoryViewer.cpp b/td/telegram/StoryViewer.cpp
index 184343149..ad7187eb7 100644
--- a/td/telegram/StoryViewer.cpp
+++ b/td/telegram/StoryViewer.cpp
@@ -7,7 +7,6 @@
 #include "td/telegram/StoryViewer.h"
 
 #include "td/telegram/BlockListId.h"
-#include "td/telegram/DialogManager.h"
 #include "td/telegram/MessageSender.h"
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/StoryManager.h"
diff --git a/td/telegram/net/NetQueryDispatcher.cpp b/td/telegram/net/NetQueryDispatcher.cpp
index ba857959e..e4d5d9c50 100644
--- a/td/telegram/net/NetQueryDispatcher.cpp
+++ b/td/telegram/net/NetQueryDispatcher.cpp
@@ -23,7 +23,6 @@
 #include "td/mtproto/RSA.h"
 
 #include "td/utils/common.h"
-#include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/port/sleep.h"
diff --git a/tdutils/td/utils/tl_parsers.cpp b/tdutils/td/utils/tl_parsers.cpp
index 3e2bae03f..9a346a265 100644
--- a/tdutils/td/utils/tl_parsers.cpp
+++ b/tdutils/td/utils/tl_parsers.cpp
@@ -6,6 +6,7 @@
 //
 #include "td/utils/tl_parsers.h"
 
+#include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/utf8.h"
diff --git a/tdutils/td/utils/tl_parsers.h b/tdutils/td/utils/tl_parsers.h
index 76a74b9eb..f08009b57 100644
--- a/tdutils/td/utils/tl_parsers.h
+++ b/tdutils/td/utils/tl_parsers.h
@@ -8,7 +8,6 @@
 
 #include "td/utils/buffer.h"
 #include "td/utils/common.h"
-#include "td/utils/format.h"
 #include "td/utils/Slice.h"
 #include "td/utils/SliceBuilder.h"
 #include "td/utils/Status.h"