diff --git a/td/telegram/PasswordManager.cpp b/td/telegram/PasswordManager.cpp
index a0ee7e2a..062e48a5 100644
--- a/td/telegram/PasswordManager.cpp
+++ b/td/telegram/PasswordManager.cpp
@@ -462,7 +462,6 @@ void PasswordManager::do_get_state(Promise<PasswordState> promise) {
                             (password->flags_ & telegram_api::account_password::HAS_RECOVERY_MASK) != 0;
                         state.has_secure_values =
                             (password->flags_ & telegram_api::account_password::HAS_SECURE_VALUES_MASK) != 0;
-                        ;
                         state.unconfirmed_recovery_email_address_pattern = password->email_unconfirmed_pattern_;
                       } else {
                         UNREACHABLE();
diff --git a/td/telegram/SecureManager.cpp b/td/telegram/SecureManager.cpp
index 63c82fc9..0a6a1df8 100644
--- a/td/telegram/SecureManager.cpp
+++ b/td/telegram/SecureManager.cpp
@@ -7,6 +7,7 @@
 #include "td/telegram/SecureManager.h"
 
 #include "td/telegram/ContactsManager.h"
+#include "td/telegram/DialogId.h"
 #include "td/telegram/files/FileManager.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/misc.h"
@@ -15,9 +16,10 @@
 #include "td/telegram/Td.h"
 
 #include "td/utils/buffer.h"
-#include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/optional.h"
+#include "td/utils/Slice.h"
 
 #include <mutex>
 
diff --git a/td/telegram/SecureManager.h b/td/telegram/SecureManager.h
index 628ba602..9fcf7c76 100644
--- a/td/telegram/SecureManager.h
+++ b/td/telegram/SecureManager.h
@@ -8,8 +8,6 @@
 
 #include "td/actor/actor.h"
 
-#include "td/telegram/files/FileId.h"
-#include "td/telegram/files/FileManager.h"
 #include "td/telegram/net/NetQuery.h"
 #include "td/telegram/SecureValue.h"
 #include "td/telegram/UserId.h"
@@ -18,7 +16,6 @@
 #include "td/telegram/telegram_api.h"
 
 #include "td/utils/Container.h"
-#include "td/utils/optional.h"
 #include "td/utils/Status.h"
 
 #include <map>
diff --git a/td/telegram/SecureValue.cpp b/td/telegram/SecureValue.cpp
index ee0d2bd5..3d944083 100644
--- a/td/telegram/SecureValue.cpp
+++ b/td/telegram/SecureValue.cpp
@@ -23,6 +23,7 @@
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/overloaded.h"
+#include "td/utils/utf8.h"
 
 #include <limits>
 
diff --git a/td/telegram/SecureValue.h b/td/telegram/SecureValue.h
index 865018d1..7919ac23 100644
--- a/td/telegram/SecureValue.h
+++ b/td/telegram/SecureValue.h
@@ -16,6 +16,7 @@
 #include "td/utils/optional.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
+#include "td/utils/StringBuilder.h"
 
 #include <utility>
 
diff --git a/tdnet/td/net/Wget.cpp b/tdnet/td/net/Wget.cpp
index 29c6a2e7..dde4fefa 100644
--- a/tdnet/td/net/Wget.cpp
+++ b/tdnet/td/net/Wget.cpp
@@ -13,6 +13,7 @@
 #include "td/utils/buffer.h"
 #include "td/utils/HttpUrl.h"
 #include "td/utils/logging.h"
+#include "td/utils/misc.h"
 #include "td/utils/port/IPAddress.h"
 #include "td/utils/port/SocketFd.h"
 #include "td/utils/Slice.h"
diff --git a/tdutils/td/utils/optional.h b/tdutils/td/utils/optional.h
index b1c4244e..927e8fc0 100644
--- a/tdutils/td/utils/optional.h
+++ b/tdutils/td/utils/optional.h
@@ -8,6 +8,7 @@
 
 #include "td/utils/Status.h"
 
+#include <type_traits>
 #include <utility>
 
 namespace td {