diff --git a/CMake/AddCXXCompilerFlag.cmake b/CMake/AddCXXCompilerFlag.cmake
index 85cb6c5c6..ef3dfaaf4 100644
--- a/CMake/AddCXXCompilerFlag.cmake
+++ b/CMake/AddCXXCompilerFlag.cmake
@@ -12,7 +12,7 @@
 # add_cxx_compiler_flag(-no-strict-aliasing RELEASE)
 # Requires CMake 2.6+
 
-if(__add_cxx_compiler_flag)
+if (__add_cxx_compiler_flag)
   return()
 endif()
 set(__add_cxx_compiler_flag INCLUDED)
@@ -42,9 +42,9 @@ function(add_cxx_compiler_flag FLAG)
   else()
     unset(CMAKE_REQUIRED_FLAGS)
   endif()
-  if(${MANGLED_FLAG})
+  if (MANGLED_FLAG)
     set(VARIANT ${ARGV1})
-    if(ARGV1)
+    if (ARGV1)
       string(TOUPPER "_${VARIANT}" VARIANT)
     endif()
     set(CMAKE_CXX_FLAGS${VARIANT} "${CMAKE_CXX_FLAGS${VARIANT}} ${FLAG}" PARENT_SCOPE)
diff --git a/td/telegram/Document.cpp b/td/telegram/Document.cpp
index 4aac60f40..0287cbc9a 100644
--- a/td/telegram/Document.cpp
+++ b/td/telegram/Document.cpp
@@ -13,7 +13,6 @@
 #include "td/telegram/Td.h"
 #include "td/telegram/VideosManager.h"
 #include "td/telegram/VideoNotesManager.h"
-#include "td/telegram/VoiceNotesManager.h"
 
 namespace td {
 
diff --git a/td/telegram/Logging.cpp b/td/telegram/Logging.cpp
index b91334795..900073eaf 100644
--- a/td/telegram/Logging.cpp
+++ b/td/telegram/Logging.cpp
@@ -130,8 +130,8 @@ Result<int> Logging::get_tag_verbosity_level(Slice tag) {
   return *it->second;
 }
 
-void Logging::add_message(int verbosity_level, Slice message) {
-  int VERBOSITY_NAME(client) = clamp(verbosity_level, 0, VERBOSITY_NAME(NEVER));
+void Logging::add_message(int log_verbosity_level, Slice message) {
+  int VERBOSITY_NAME(client) = clamp(log_verbosity_level, 0, VERBOSITY_NAME(NEVER));
   VLOG(client) << message;
 }
 
diff --git a/td/telegram/Logging.h b/td/telegram/Logging.h
index ba92312c2..43a2bc52f 100644
--- a/td/telegram/Logging.h
+++ b/td/telegram/Logging.h
@@ -30,7 +30,7 @@ class Logging {
 
   static Result<int> get_tag_verbosity_level(Slice tag);
 
-  static void add_message(int verbosity_level, Slice message);
+  static void add_message(int log_verbosity_level, Slice message);
 };
 
 }  // namespace td
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 2a9ffdf81..38b1e2ef2 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -45,6 +45,7 @@
 #include "td/telegram/TdDb.h"
 #include "td/telegram/TopDialogManager.h"
 #include "td/telegram/UpdatesManager.h"
+#include "td/telegram/Version.h"
 #include "td/telegram/WebPageId.h"
 #include "td/telegram/WebPagesManager.h"
 
diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp
index 0e4e84542..dfd096dcc 100644
--- a/td/telegram/NotificationManager.cpp
+++ b/td/telegram/NotificationManager.cpp
@@ -49,6 +49,7 @@
 #include "td/utils/misc.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Time.h"
+#include "td/utils/tl_helpers.h"
 #include "td/utils/tl_parsers.h"
 #include "td/utils/utf8.h"
 
diff --git a/td/telegram/NotificationType.cpp b/td/telegram/NotificationType.cpp
index d23dbb3f6..cd0a11321 100644
--- a/td/telegram/NotificationType.cpp
+++ b/td/telegram/NotificationType.cpp
@@ -21,6 +21,8 @@
 #include "td/utils/misc.h"
 #include "td/utils/Slice.h"
 
+#include <tuple>
+
 namespace td {
 
 class NotificationTypeMessage : public NotificationType {
diff --git a/td/telegram/StorageManager.cpp b/td/telegram/StorageManager.cpp
index d5804356f..f7fe2ca2e 100644
--- a/td/telegram/StorageManager.cpp
+++ b/td/telegram/StorageManager.cpp
@@ -15,8 +15,6 @@
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/TdDb.h"
 
-#include "td/telegram/td_api.h"
-
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/port/Clocks.h"
diff --git a/td/telegram/StorageManager.h b/td/telegram/StorageManager.h
index 675112498..11c41fd66 100644
--- a/td/telegram/StorageManager.h
+++ b/td/telegram/StorageManager.h
@@ -12,14 +12,13 @@
 #include "td/telegram/files/FileGcWorker.h"
 #include "td/telegram/files/FileStats.h"
 #include "td/telegram/files/FileStatsWorker.h"
+#include "td/telegram/td_api.h"
 
 #include "td/utils/common.h"
+#include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 
 namespace td {
-namespace td_api {
-class databaseStatistics;
-}  // namespace td_api
 
 struct DatabaseStats {
   string debug;
diff --git a/td/telegram/TdDb.cpp b/td/telegram/TdDb.cpp
index 68f198188..d3226cac7 100644
--- a/td/telegram/TdDb.cpp
+++ b/td/telegram/TdDb.cpp
@@ -26,9 +26,11 @@
 #include "td/db/SqliteKeyValueSafe.h"
 
 #include "td/utils/common.h"
+#include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/path.h"
 #include "td/utils/Random.h"
+#include "td/utils/StringBuilder.h"
 
 namespace td {
 
diff --git a/td/telegram/net/DcOptions.h b/td/telegram/net/DcOptions.h
index 6f4971baf..72d901f1f 100644
--- a/td/telegram/net/DcOptions.h
+++ b/td/telegram/net/DcOptions.h
@@ -12,6 +12,7 @@
 
 #include "td/utils/common.h"
 #include "td/utils/format.h"
+#include "td/utils/logging.h"
 #include "td/utils/port/IPAddress.h"
 #include "td/utils/Slice.h"
 #include "td/utils/StringBuilder.h"