diff --git a/td/telegram/OptionManager.cpp b/td/telegram/OptionManager.cpp
index b25abce76..fd53fb569 100644
--- a/td/telegram/OptionManager.cpp
+++ b/td/telegram/OptionManager.cpp
@@ -11,6 +11,7 @@
 #include "td/telegram/ConfigManager.h"
 #include "td/telegram/ConfigShared.h"
 #include "td/telegram/ContactsManager.h"
+#include "td/telegram/DialogId.h"
 #include "td/telegram/Global.h"
 #include "td/telegram/JsonValue.h"
 #include "td/telegram/LanguagePackManager.h"
@@ -27,6 +28,7 @@
 
 #include "td/utils/misc.h"
 #include "td/utils/SliceBuilder.h"
+#include "td/utils/Status.h"
 
 #include <cmath>
 #include <limits>
diff --git a/tddb/td/db/SqliteKeyValueAsync.h b/tddb/td/db/SqliteKeyValueAsync.h
index 075eca1b3..462287f18 100644
--- a/tddb/td/db/SqliteKeyValueAsync.h
+++ b/tddb/td/db/SqliteKeyValueAsync.h
@@ -10,6 +10,8 @@
 
 #include "td/actor/PromiseFuture.h"
 
+#include "td/utils/common.h"
+
 #include <memory>
 #include <unordered_map>
 
diff --git a/tdutils/td/utils/buffer.cpp b/tdutils/td/utils/buffer.cpp
index d6e70a4cd..1f99540bc 100644
--- a/tdutils/td/utils/buffer.cpp
+++ b/tdutils/td/utils/buffer.cpp
@@ -30,7 +30,6 @@ int64 BufferAllocator::get_buffer_slice_size() {
 }
 
 void BufferAllocator::track_buffer_slice(int64 size) {
-  return;
 }
 
 size_t BufferAllocator::get_buffer_mem() {