Fix includes.

benchmark/bench_http_server_cheat.cpp

@@ -11,6 +11,7 @@
 #include "td/actor/ConcurrentScheduler.h"
 
 #include "td/utils/buffer.h"
+#include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/detail/PollableFd.h"
 #include "td/utils/port/SocketFd.h"

benchmark/bench_misc.cpp

@@ -9,7 +9,6 @@
 
 #include "td/utils/benchmark.h"
 #include "td/utils/common.h"
-#include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/Clocks.h"
 #include "td/utils/port/EventFd.h"

benchmark/rmdir.cpp

@@ -4,6 +4,7 @@
 // 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/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/path.h"
 #include "td/utils/Slice.h"

td/telegram/AutosaveManager.cpp

@@ -6,16 +6,25 @@
 //
 #include "td/telegram/AutosaveManager.h"
 
+#include "td/telegram/AccessRights.h"
 #include "td/telegram/ContactsManager.h"
 #include "td/telegram/Dependencies.h"
+#include "td/telegram/Global.h"
+#include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/Td.h"
+#include "td/telegram/TdDb.h"
+#include "td/telegram/TdParameters.h"
 
 #include "td/db/SqliteKeyValueAsync.h"
 
 #include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
+#include "td/utils/FlatHashSet.h"
+#include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/ScopeGuard.h"
+#include "td/utils/tl_helpers.h"
 
 namespace td {
 
@@ -287,13 +296,13 @@ void AutosaveManager::load_autosave_settings(Promise<td_api::object_ptr<td_api::
 }
 
 void AutosaveManager::on_load_autosave_settings_from_database(string value) {
+  if (G()->close_flag()) {
+    return fail_promises(load_settings_queries_, Global::request_aborted_error());
+  }
   if (settings_.are_inited_) {
     CHECK(load_settings_queries_.empty());
     return;
   }
-  if (G()->close_flag()) {
-    return fail_promises(load_settings_queries_, Global::request_aborted_error());
-  }
   if (value.empty()) {
     LOG(INFO) << "Autosave settings aren't found in database";
     return reload_autosave_settings();

td/telegram/ContactsManager.cpp

@@ -44,6 +44,7 @@
 #include "td/telegram/SecretChatLayer.h"
 #include "td/telegram/SecretChatsManager.h"
 #include "td/telegram/ServerMessageId.h"
+#include "td/telegram/StickerPhotoSize.h"
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"

td/telegram/ContactsManager.h

@@ -35,7 +35,6 @@
 #include "td/telegram/QueryMerger.h"
 #include "td/telegram/RestrictionReason.h"
 #include "td/telegram/SecretChatId.h"
-#include "td/telegram/StickerPhotoSize.h"
 #include "td/telegram/StickerSetId.h"
 #include "td/telegram/SuggestedAction.h"
 #include "td/telegram/td_api.h"

td/telegram/DialogInviteLink.cpp

@@ -10,6 +10,7 @@
 #include "td/telegram/LinkManager.h"
 
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 #include "td/utils/SliceBuilder.h"
 
 namespace td {

td/telegram/EmojiGroup.cpp

@@ -9,6 +9,7 @@
 #include "td/telegram/StickersManager.h"
 
 #include "td/utils/algorithm.h"
+#include "td/utils/logging.h"
 #include "td/utils/Time.h"
 
 namespace td {

td/telegram/ForumTopicManager.cpp

@@ -23,7 +23,6 @@
 #include "td/telegram/misc.h"
 #include "td/telegram/NotificationManager.h"
 #include "td/telegram/NotificationSettingsManager.h"
-#include "td/telegram/OptionManager.h"
 #include "td/telegram/ServerMessageId.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"

td/telegram/MessageEntity.cpp

@@ -24,7 +24,6 @@
 #include "td/utils/misc.h"
 #include "td/utils/Promise.h"
 #include "td/utils/SliceBuilder.h"
-#include "td/utils/StackAllocator.h"
 #include "td/utils/StringBuilder.h"
 #include "td/utils/unicode.h"
 #include "td/utils/utf8.h"

td/telegram/MessagesManager.cpp

@@ -57,6 +57,7 @@
 #include "td/telegram/ReplyMarkup.hpp"
 #include "td/telegram/SecretChatsManager.h"
 #include "td/telegram/SponsoredMessageManager.h"
+#include "td/telegram/StickerPhotoSize.h"
 #include "td/telegram/StickerType.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/TdDb.h"

td/telegram/MessagesManager.h

@@ -60,7 +60,6 @@
 #include "td/telegram/SecretChatId.h"
 #include "td/telegram/SecretInputMedia.h"
 #include "td/telegram/ServerMessageId.h"
-#include "td/telegram/StickerPhotoSize.h"
 #include "td/telegram/td_api.h"
 #include "td/telegram/telegram_api.h"
 #include "td/telegram/UserId.h"

td/telegram/QueryMerger.cpp

@@ -7,7 +7,6 @@
 #include "td/telegram/QueryMerger.h"
 
 #include "td/utils/logging.h"
-#include "td/utils/Time.h"
 
 namespace td {
 

td/telegram/RequestedDialogType.h

@@ -12,6 +12,7 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
+#include "td/utils/Status.h"
 
 namespace td {
 

td/telegram/StickerMaskPosition.cpp

@@ -6,8 +6,6 @@
 //
 #include "td/telegram/StickerMaskPosition.h"
 
-#include "td/utils/logging.h"
-
 namespace td {
 
 static td_api::object_ptr<td_api::MaskPoint> get_mask_point_object(int32 point) {

td/telegram/StickerMaskPosition.h

@@ -10,7 +10,6 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
-#include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
 
 namespace td {

td/telegram/SuggestedAction.cpp

@@ -15,6 +15,7 @@
 #include "td/actor/actor.h"
 
 #include "td/utils/algorithm.h"
+#include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/Status.h"
 

td/telegram/Td.cpp

@@ -115,6 +115,7 @@
 #include "td/telegram/SentEmailCode.h"
 #include "td/telegram/SponsoredMessageManager.h"
 #include "td/telegram/StateManager.h"
+#include "td/telegram/StickerFormat.h"
 #include "td/telegram/StickerSetId.h"
 #include "td/telegram/StickersManager.h"
 #include "td/telegram/StickerType.h"

td/telegram/TranslationManager.cpp

@@ -13,6 +13,7 @@
 
 #include "td/utils/algorithm.h"
 #include "td/utils/buffer.h"
+#include "td/utils/logging.h"
 #include "td/utils/Status.h"
 
 namespace td {

td/telegram/UpdatesManager.cpp

@@ -56,6 +56,7 @@
 #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.hpp"
 #include "td/telegram/ThemeManager.h"
 #include "td/telegram/Usernames.h"

td/telegram/WebApp.cpp

@@ -9,7 +9,6 @@
 #include "td/telegram/AnimationsManager.h"
 #include "td/telegram/Document.h"
 #include "td/telegram/DocumentsManager.h"
-#include "td/telegram/misc.h"
 #include "td/telegram/Photo.h"
 #include "td/telegram/Td.h"
 

td/telegram/WebApp.h

@@ -13,7 +13,6 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/common.h"
-#include "td/utils/Status.h"
 #include "td/utils/StringBuilder.h"
 
 namespace td {

td/telegram/WebApp.hpp

@@ -8,10 +8,10 @@
 
 #include "td/telegram/WebApp.h"
 
+#include "td/telegram/AnimationsManager.h"
 #include "td/telegram/AnimationsManager.hpp"
 #include "td/telegram/Photo.hpp"
 #include "td/telegram/Td.h"
-#include "td/telegram/Version.h"
 
 #include "td/utils/tl_helpers.h"
 

td/telegram/net/NetQueryCreator.cpp

@@ -15,7 +15,6 @@
 #include "td/utils/format.h"
 #include "td/utils/Gzip.h"
 #include "td/utils/logging.h"
-#include "td/utils/Slice.h"
 #include "td/utils/Storer.h"
 
 namespace td {

tdutils/test/HttpUrl.cpp

@@ -8,6 +8,7 @@
 #include "td/utils/HttpUrl.h"
 #include "td/utils/misc.h"
 #include "td/utils/Slice.h"
+#include "td/utils/SliceBuilder.h"
 #include "td/utils/StringBuilder.h"
 #include "td/utils/tests.h"
 

tdutils/test/emoji.cpp

@@ -4,6 +4,7 @@
 // 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/common.h"
 #include "td/utils/emoji.h"
 #include "td/utils/tests.h"
 

tdutils/test/hashset_benchmark.cpp

@@ -17,6 +17,7 @@
 #include "td/utils/Slice.h"
 #include "td/utils/Span.h"
 #include "td/utils/StringBuilder.h"
+#include "td/utils/tests.h"
 #include "td/utils/Time.h"
 #include "td/utils/VectorQueue.h"
 

tdutils/test/json.cpp

@@ -4,6 +4,7 @@
 // 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/common.h"
 #include "td/utils/JsonBuilder.h"
 #include "td/utils/logging.h"
 #include "td/utils/Slice.h"

tdutils/test/port.cpp

@@ -14,6 +14,7 @@
 #include "td/utils/port/path.h"
 #include "td/utils/port/signals.h"
 #include "td/utils/port/sleep.h"
+#include "td/utils/port/Stat.h"
 #include "td/utils/port/thread.h"
 #include "td/utils/port/thread_local.h"
 #include "td/utils/Random.h"

tdutils/test/variant.cpp

@@ -4,6 +4,7 @@
 // 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/common.h"
 #include "td/utils/Slice.h"
 #include "td/utils/StringBuilder.h"
 #include "td/utils/tests.h"

test/country_info.cpp

@@ -7,6 +7,7 @@
 #include "td/telegram/CountryInfoManager.h"
 
 #include "td/utils/common.h"
+#include "td/utils/logging.h"
 #include "td/utils/tests.h"
 
 static void check_phone_number_info(td::string phone_number_prefix, const td::string &country_code,
@@ -20,8 +21,10 @@ static void check_phone_number_info(td::string phone_number_prefix, const td::st
     CHECK(result->country_->country_code_ == country_code);
   }
   CHECK(result->country_calling_code_ == calling_code);
-  // LOG(ERROR) << phone_number_prefix << ' ' << result->formatted_phone_number_ << ' ' << formatted_phone_number;
-  CHECK(result->formatted_phone_number_ == formatted_phone_number);
+  if (result->formatted_phone_number_ != formatted_phone_number) {
+    LOG(ERROR) << phone_number_prefix << ' ' << result->formatted_phone_number_ << ' ' << formatted_phone_number;
+    CHECK(result->formatted_phone_number_ == formatted_phone_number);
+  }
   CHECK(result->is_anonymous_ == is_anonymous);
 }
 

test/db.cpp

@@ -30,6 +30,7 @@
 #include "td/utils/Random.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
+#include "td/utils/StringBuilder.h"
 #include "td/utils/tests.h"
 
 #include <limits>

test/query_merger.cpp

@@ -12,7 +12,10 @@
 
 #include "td/utils/common.h"
 #include "td/utils/FlatHashSet.h"
+#include "td/utils/logging.h"
+#include "td/utils/Promise.h"
 #include "td/utils/Random.h"
+#include "td/utils/Status.h"
 #include "td/utils/tests.h"
 
 #include <queue>

test/secure_storage.cpp

@@ -7,6 +7,7 @@
 #include "td/telegram/SecureStorage.h"
 
 #include "td/utils/buffer.h"
+#include "td/utils/common.h"
 #include "td/utils/filesystem.h"
 #include "td/utils/port/path.h"
 #include "td/utils/SliceBuilder.h"

test/string_cleaning.cpp

@@ -6,6 +6,7 @@
 //
 #include "td/telegram/misc.h"
 
+#include "td/utils/common.h"
 #include "td/utils/Slice.h"
 #include "td/utils/tests.h"