diff --git a/td/telegram/DialogDb.cpp b/td/telegram/DialogDb.cpp
index 33fb5f298..bf0e98e62 100644
--- a/td/telegram/DialogDb.cpp
+++ b/td/telegram/DialogDb.cpp
@@ -6,8 +6,6 @@
 //
 #include "td/telegram/DialogDb.h"
 
-#include "td/telegram/Global.h"
-#include "td/telegram/TdDb.h"
 #include "td/telegram/Version.h"
 
 #include "td/actor/actor.h"
@@ -18,8 +16,10 @@
 #include "td/db/SqliteKeyValue.h"
 #include "td/db/SqliteStatement.h"
 
+#include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/Time.h"
 
@@ -80,7 +80,7 @@ Status init_dialog_db(SqliteDb &db, int32 version, KeyValueSyncInterface &binlog
     TRY_STATUS(db.exec("UPDATE dialogs SET folder_id = 0 WHERE dialog_id < -1500000000000 AND dialog_order > 0"));
   }
   if (version < static_cast<int32>(DbVersion::StorePinnedDialogsInBinlog)) {
-    // 9221294780217032704 == get_dialog_order(MessageId(), MIN_PINNED_DIALOG_DATE - 1)
+    // 9221294780217032704 == get_dialog_order(Auto(), MIN_PINNED_DIALOG_DATE - 1)
     TRY_RESULT(get_pinned_dialogs_stmt,
                db.get_statement("SELECT dialog_id FROM dialogs WHERE folder_id == ?1 AND dialog_order > "
                                 "9221294780217032704 ORDER BY dialog_order DESC, dialog_id DESC"));
diff --git a/td/telegram/DialogFilter.cpp b/td/telegram/DialogFilter.cpp
index 151e93e3a..e747b8b86 100644
--- a/td/telegram/DialogFilter.cpp
+++ b/td/telegram/DialogFilter.cpp
@@ -6,9 +6,11 @@
 //
 #include "td/telegram/DialogFilter.h"
 
+#include "td/telegram/DialogId.h"
 #include "td/telegram/misc.h"
 
 #include "td/utils/format.h"
+#include "td/utils/logging.h"
 #include "td/utils/misc.h"
 
 #include <unordered_set>
diff --git a/td/telegram/DialogFilter.h b/td/telegram/DialogFilter.h
index a43f8bc19..24b416cf8 100644
--- a/td/telegram/DialogFilter.h
+++ b/td/telegram/DialogFilter.h
@@ -13,6 +13,7 @@
 
 #include "td/utils/common.h"
 #include "td/utils/Status.h"
+#include "td/utils/StringBuilder.h"
 
 #include <unordered_map>
 
diff --git a/td/telegram/DialogListId.h b/td/telegram/DialogListId.h
index c1cf5d151..729ec89dc 100644
--- a/td/telegram/DialogListId.h
+++ b/td/telegram/DialogListId.h
@@ -14,6 +14,7 @@
 #include "td/utils/StringBuilder.h"
 
 #include <functional>
+#include <limits>
 #include <type_traits>
 
 namespace td {
diff --git a/td/telegram/InputDialogId.cpp b/td/telegram/InputDialogId.cpp
index 105b94b68..aca6b3361 100644
--- a/td/telegram/InputDialogId.cpp
+++ b/td/telegram/InputDialogId.cpp
@@ -6,8 +6,11 @@
 //
 #include "td/telegram/InputDialogId.h"
 
+#include "td/telegram/ChannelId.h"
+#include "td/telegram/ChatId.h"
+#include "td/telegram/USerId.h"
+
 #include "td/utils/logging.h"
-#include "td/utils/misc.h"
 
 namespace td {
 
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 8771099d4..1f04aaf5a 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -25,6 +25,7 @@
 #include "td/telegram/DeviceTokenManager.h"
 #include "td/telegram/DialogAdministrator.h"
 #include "td/telegram/DialogFilter.h"
+#include "td/telegram/DialogFilterId.h"
 #include "td/telegram/DialogId.h"
 #include "td/telegram/DialogListId.h"
 #include "td/telegram/DialogLocation.h"
diff --git a/td/telegram/TdDb.cpp b/td/telegram/TdDb.cpp
index 9cebd10e1..76e1af284 100644
--- a/td/telegram/TdDb.cpp
+++ b/td/telegram/TdDb.cpp
@@ -29,10 +29,13 @@
 #include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 #include "td/utils/port/path.h"
 #include "td/utils/Random.h"
 #include "td/utils/StringBuilder.h"
 
+#include <algorithm>
+
 namespace td {
 
 namespace {
@@ -525,7 +528,7 @@ Result<string> TdDb::get_stats() {
   TRY_STATUS(run_kv_query("ss%"));
   TRY_STATUS(run_kv_query("gr%"));
 
-  std::vector<int32> prev(1);
+  vector<int32> prev(1);
   size_t count = 0;
   int32 max_bad_to = 0;
   size_t bad_count = 0;
@@ -534,8 +537,8 @@ Result<string> TdDb::get_stats() {
       return true;
     }
     count++;
-    auto from = to_integer<td::int32>(key.substr(4));
-    auto to = to_integer<td::int32>(value.substr(2));
+    auto from = to_integer<int32>(key.substr(4));
+    auto to = to_integer<int32>(value.substr(2));
     if (from <= to) {
       LOG(DEBUG) << "Have forward reference from " << from << " to " << to;
       if (to > max_bad_to) {
diff --git a/tdactor/td/actor/MultiPromise.cpp b/tdactor/td/actor/MultiPromise.cpp
index beed4d2a8..101024fdf 100644
--- a/tdactor/td/actor/MultiPromise.cpp
+++ b/tdactor/td/actor/MultiPromise.cpp
@@ -6,6 +6,8 @@
 //
 #include "td/actor/MultiPromise.h"
 
+#include "td/utils/logging.h"
+
 namespace td {
 
 void MultiPromiseActor::add_promise(Promise<Unit> &&promise) {
diff --git a/tdnet/td/net/SslStream.cpp b/tdnet/td/net/SslStream.cpp
index 4eddcdd45..feb8eed26 100644
--- a/tdnet/td/net/SslStream.cpp
+++ b/tdnet/td/net/SslStream.cpp
@@ -13,9 +13,7 @@
 #include "td/utils/misc.h"
 #include "td/utils/port/IPAddress.h"
 #include "td/utils/port/wstring_convert.h"
-#include "td/utils/StackAllocator.h"
 #include "td/utils/Status.h"
-#include "td/utils/StringBuilder.h"
 #include "td/utils/Time.h"
 
 #include <openssl/err.h>
diff --git a/tdutils/td/utils/crypto.cpp b/tdutils/td/utils/crypto.cpp
index 80f03ce6f..0e9a5c9b5 100644
--- a/tdutils/td/utils/crypto.cpp
+++ b/tdutils/td/utils/crypto.cpp
@@ -15,6 +15,8 @@
 #include "td/utils/port/thread_local.h"
 #include "td/utils/Random.h"
 #include "td/utils/ScopeGuard.h"
+#include "td/utils/StackAllocator.h"
+#include "td/utils/StringBuilder.h"
 
 #if TD_HAVE_OPENSSL
 #include <openssl/aes.h>
@@ -38,6 +40,8 @@
 #endif
 
 #include <algorithm>
+#include <cerrno>
+#include <cstring>
 #include <mutex>
 #include <utility>
 
diff --git a/tdutils/td/utils/port/FileFd.cpp b/tdutils/td/utils/port/FileFd.cpp
index 8b9529ebd..0b8300f33 100644
--- a/tdutils/td/utils/port/FileFd.cpp
+++ b/tdutils/td/utils/port/FileFd.cpp
@@ -26,6 +26,8 @@
 #include <utility>
 
 #if TD_PORT_POSIX
+#include <cerrno>
+
 #include <fcntl.h>
 #include <sys/file.h>
 #include <sys/types.h>
diff --git a/tdutils/td/utils/port/ServerSocketFd.cpp b/tdutils/td/utils/port/ServerSocketFd.cpp
index 75d68a75e..fdeecb39c 100644
--- a/tdutils/td/utils/port/ServerSocketFd.cpp
+++ b/tdutils/td/utils/port/ServerSocketFd.cpp
@@ -14,6 +14,7 @@
 #include "td/utils/port/PollFlags.h"
 
 #if TD_PORT_POSIX
+#include <cerrno>
 
 #include <arpa/inet.h>
 #include <fcntl.h>
@@ -22,7 +23,6 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-
 #endif
 
 #if TD_PORT_WINDOWS
diff --git a/tdutils/td/utils/port/SocketFd.cpp b/tdutils/td/utils/port/SocketFd.cpp
index 0641feaa5..515f5fa1a 100644
--- a/tdutils/td/utils/port/SocketFd.cpp
+++ b/tdutils/td/utils/port/SocketFd.cpp
@@ -20,6 +20,8 @@
 #endif
 
 #if TD_PORT_POSIX
+#include <cerrno>
+
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <netinet/in.h>
diff --git a/tdutils/td/utils/port/UdpSocketFd.cpp b/tdutils/td/utils/port/UdpSocketFd.cpp
index de56a02c7..bdba69ae7 100644
--- a/tdutils/td/utils/port/UdpSocketFd.cpp
+++ b/tdutils/td/utils/port/UdpSocketFd.cpp
@@ -20,6 +20,8 @@
 #endif
 
 #if TD_PORT_POSIX
+#include <cerrno>
+
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <netinet/in.h>
diff --git a/tdutils/td/utils/port/detail/Epoll.cpp b/tdutils/td/utils/port/detail/Epoll.cpp
index e691570d9..afa739017 100644
--- a/tdutils/td/utils/port/detail/Epoll.cpp
+++ b/tdutils/td/utils/port/detail/Epoll.cpp
@@ -14,6 +14,8 @@ char disable_linker_warning_about_empty_file_epoll_cpp TD_UNUSED;
 #include "td/utils/logging.h"
 #include "td/utils/Status.h"
 
+#include <cerrno>
+
 #include <unistd.h>
 
 namespace td {
diff --git a/tdutils/td/utils/port/detail/EventFdBsd.cpp b/tdutils/td/utils/port/detail/EventFdBsd.cpp
index 7c604c559..077e31653 100644
--- a/tdutils/td/utils/port/detail/EventFdBsd.cpp
+++ b/tdutils/td/utils/port/detail/EventFdBsd.cpp
@@ -16,6 +16,8 @@ char disable_linker_warning_about_empty_file_event_fd_bsd_cpp TD_UNUSED;
 #include "td/utils/port/SocketFd.h"
 #include "td/utils/Slice.h"
 
+#include <cerrno>
+
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/socket.h>
diff --git a/tdutils/td/utils/port/detail/EventFdLinux.cpp b/tdutils/td/utils/port/detail/EventFdLinux.cpp
index 9b34d1e76..ad26f95e1 100644
--- a/tdutils/td/utils/port/detail/EventFdLinux.cpp
+++ b/tdutils/td/utils/port/detail/EventFdLinux.cpp
@@ -17,6 +17,8 @@ char disable_linker_warning_about_empty_file_event_fd_linux_cpp TD_UNUSED;
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/Slice.h"
 
+#include <cerrno>
+
 #include <poll.h>
 #include <sys/eventfd.h>
 #include <unistd.h>
diff --git a/tdutils/td/utils/port/detail/KQueue.cpp b/tdutils/td/utils/port/detail/KQueue.cpp
index 37d756bc6..0f5651692 100644
--- a/tdutils/td/utils/port/detail/KQueue.cpp
+++ b/tdutils/td/utils/port/detail/KQueue.cpp
@@ -13,6 +13,7 @@ char disable_linker_warning_about_empty_file_kqueue_cpp TD_UNUSED;
 #include "td/utils/logging.h"
 #include "td/utils/Status.h"
 
+#include <cerrno>
 #include <utility>
 
 #include <sys/time.h>
diff --git a/tdutils/td/utils/port/detail/Poll.cpp b/tdutils/td/utils/port/detail/Poll.cpp
index 41cc20313..d5069c01d 100644
--- a/tdutils/td/utils/port/detail/Poll.cpp
+++ b/tdutils/td/utils/port/detail/Poll.cpp
@@ -16,6 +16,8 @@ char disable_linker_warning_about_empty_file_poll_cpp TD_UNUSED;
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/Status.h"
 
+#include <cerrno>
+
 namespace td {
 namespace detail {
 
diff --git a/tdutils/td/utils/port/detail/PollableFd.h b/tdutils/td/utils/port/detail/PollableFd.h
index 4cc9fd709..609a64ed8 100644
--- a/tdutils/td/utils/port/detail/PollableFd.h
+++ b/tdutils/td/utils/port/detail/PollableFd.h
@@ -16,6 +16,7 @@
 #include "td/utils/SpinLock.h"
 
 #include <atomic>
+#include <cerrno>
 #include <memory>
 #include <type_traits>
 
diff --git a/tdutils/td/utils/port/path.cpp b/tdutils/td/utils/port/path.cpp
index 3d358ac59..991f20afc 100644
--- a/tdutils/td/utils/port/path.cpp
+++ b/tdutils/td/utils/port/path.cpp
@@ -43,6 +43,7 @@
 #include <sys/syslimits.h>
 #endif
 
+#include <cerrno>
 #include <cstdlib>
 #include <string>