diff --git a/benchmark/bench_handshake.cpp b/benchmark/bench_handshake.cpp
index 2db17e9f..376175ff 100644
--- a/benchmark/bench_handshake.cpp
+++ b/benchmark/bench_handshake.cpp
@@ -4,7 +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/benchmark.h"  // for bench, do_not_optimize_away, etc
+#include "td/utils/benchmark.h"
 
 #include "td/mtproto/DhHandshake.h"
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 9054c395..55c49a1d 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -23,9 +23,9 @@
 #include "td/telegram/HashtagHints.h"
 #include "td/telegram/InlineQueriesManager.h"
 #include "td/telegram/InputMessageText.h"
+#include "td/telegram/Location.h"
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/logevent/LogEventHelper.h"
-#include "td/telegram/Location.h"
 #include "td/telegram/MessageContent.h"
 #include "td/telegram/MessageEntity.hpp"
 #include "td/telegram/MessagesDb.h"
diff --git a/td/telegram/PasswordManager.cpp b/td/telegram/PasswordManager.cpp
index 1c2886ef..ece74208 100644
--- a/td/telegram/PasswordManager.cpp
+++ b/td/telegram/PasswordManager.cpp
@@ -10,7 +10,6 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
-#include "td/telegram/SecureStorage.h"
 #include "td/telegram/TdDb.h"
 
 #include "td/mtproto/DhHandshake.h"
@@ -25,9 +24,6 @@
 #include "td/utils/Slice.h"
 #include "td/utils/Time.h"
 
-#include "td/telegram/td_api.h"
-#include "td/telegram/telegram_api.h"  // TODO: this file is already included. Why?
-
 namespace td {
 
 tl_object_ptr<td_api::temporaryPasswordState> TempPasswordState::as_td_api() const {
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 3a200916..57e09bd7 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -45,7 +45,7 @@
 #include <clocale>
 #include <cstdio>
 #include <cstdlib>
-#include <cstring>  // for strcmp
+#include <cstring>
 #include <ctime>
 #include <iostream>
 #include <limits>
diff --git a/tdutils/td/utils/Timer.cpp b/tdutils/td/utils/Timer.cpp
index a65d011b..c73b9542 100644
--- a/tdutils/td/utils/Timer.cpp
+++ b/tdutils/td/utils/Timer.cpp
@@ -8,7 +8,6 @@
 
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
-//#include  "td/utils/Slice.h"  // TODO move StringBuilder implementation to cpp, remove header
 #include "td/utils/Time.h"
 
 namespace td {