diff --git a/td/telegram/CallbackQueriesManager.cpp b/td/telegram/CallbackQueriesManager.cpp
index 0aa4eb21b..4afaa1120 100644
--- a/td/telegram/CallbackQueriesManager.cpp
+++ b/td/telegram/CallbackQueriesManager.cpp
@@ -12,6 +12,7 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/InlineQueriesManager.h"
 #include "td/telegram/MessagesManager.h"
+#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/PasswordManager.h"
 #include "td/telegram/Td.h"
 #include "td/telegram/td_api.h"
diff --git a/td/telegram/ChatManager.cpp b/td/telegram/ChatManager.cpp
index 8f48822e6..da5b6cd7c 100644
--- a/td/telegram/ChatManager.cpp
+++ b/td/telegram/ChatManager.cpp
@@ -28,7 +28,6 @@
 #include "td/telegram/MinChannel.h"
 #include "td/telegram/misc.h"
 #include "td/telegram/MissingInvitee.h"
-#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/OptionManager.h"
 #include "td/telegram/PeerColor.h"
 #include "td/telegram/Photo.h"
diff --git a/td/telegram/ClientActor.cpp b/td/telegram/ClientActor.cpp
index e70df1dca..915ba7f13 100644
--- a/td/telegram/ClientActor.cpp
+++ b/td/telegram/ClientActor.cpp
@@ -6,7 +6,6 @@
 //
 #include "td/telegram/ClientActor.h"
 
-#include "td/telegram/net/NetQueryCounter.h"
 #include "td/telegram/net/NetQueryStats.h"
 #include "td/telegram/Td.h"
 
diff --git a/td/telegram/Global.cpp b/td/telegram/Global.cpp
index 269f633f3..4714ffba2 100644
--- a/td/telegram/Global.cpp
+++ b/td/telegram/Global.cpp
@@ -9,6 +9,7 @@
 #include "td/telegram/AuthManager.h"
 #include "td/telegram/net/ConnectionCreator.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
+#include "td/telegram/net/NetQueryStats.h"
 #include "td/telegram/net/TempAuthKeyWatchdog.h"
 #include "td/telegram/OptionManager.h"
 #include "td/telegram/StateManager.h"
diff --git a/td/telegram/Global.h b/td/telegram/Global.h
index a9ba54a48..4a2ea40c7 100644
--- a/td/telegram/Global.h
+++ b/td/telegram/Global.h
@@ -61,6 +61,7 @@ class LinkManager;
 class MessageImportManager;
 class MessagesManager;
 class NetQueryDispatcher;
+class NetQueryStats;
 class NotificationManager;
 class NotificationSettingsManager;
 class OnlineManager;
diff --git a/td/telegram/Requests.cpp b/td/telegram/Requests.cpp
index 3935494dd..054ab8f65 100644
--- a/td/telegram/Requests.cpp
+++ b/td/telegram/Requests.cpp
@@ -98,8 +98,6 @@
 #include "td/telegram/MessageTtl.h"
 #include "td/telegram/misc.h"
 #include "td/telegram/net/ConnectionCreator.h"
-#include "td/telegram/net/NetQuery.h"
-#include "td/telegram/net/NetQueryDelayer.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/net/NetStatsManager.h"
 #include "td/telegram/net/NetType.h"
diff --git a/td/telegram/SecretChatsManager.cpp b/td/telegram/SecretChatsManager.cpp
index 966ce39b6..693c30deb 100644
--- a/td/telegram/SecretChatsManager.cpp
+++ b/td/telegram/SecretChatsManager.cpp
@@ -13,6 +13,7 @@
 #include "td/telegram/logevent/SecretChatEvent.h"
 #include "td/telegram/MessageId.h"
 #include "td/telegram/MessagesManager.h"
+#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/SecretChatDb.h"
 #include "td/telegram/SequenceDispatcher.h"
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 71776c95e..7be4d8e09 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -53,7 +53,6 @@
 #include "td/telegram/net/ConnectionCreator.h"
 #include "td/telegram/net/MtprotoHeader.h"
 #include "td/telegram/net/NetQuery.h"
-#include "td/telegram/net/NetQueryDelayer.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/net/NetStatsManager.h"
 #include "td/telegram/net/Proxy.h"
diff --git a/td/telegram/TopDialogManager.cpp b/td/telegram/TopDialogManager.cpp
index 8837ec7ef..d2dafbf45 100644
--- a/td/telegram/TopDialogManager.cpp
+++ b/td/telegram/TopDialogManager.cpp
@@ -15,7 +15,6 @@
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/misc.h"
-#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/StateManager.h"
 #include "td/telegram/Td.h"
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index e9cd82dc7..498d5d457 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -44,7 +44,6 @@
 #include "td/telegram/MessageTtl.h"
 #include "td/telegram/misc.h"
 #include "td/telegram/net/DcOptions.h"
-#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/NotificationManager.h"
 #include "td/telegram/NotificationSettingsManager.h"
 #include "td/telegram/NotificationSettingsScope.h"
diff --git a/td/telegram/UserManager.cpp b/td/telegram/UserManager.cpp
index ad034f8e6..884c8c154 100644
--- a/td/telegram/UserManager.cpp
+++ b/td/telegram/UserManager.cpp
@@ -41,7 +41,6 @@
 #include "td/telegram/MessagesManager.h"
 #include "td/telegram/MessageTtl.h"
 #include "td/telegram/misc.h"
-#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/NotificationManager.h"
 #include "td/telegram/OnlineManager.h"
 #include "td/telegram/OptionManager.h"
diff --git a/td/telegram/files/FileHashUploader.h b/td/telegram/files/FileHashUploader.h
index 509753c1e..33b936ce0 100644
--- a/td/telegram/files/FileHashUploader.h
+++ b/td/telegram/files/FileHashUploader.h
@@ -9,6 +9,7 @@
 #include "td/telegram/files/FileLoaderActor.h"
 #include "td/telegram/files/FileLocation.h"
 #include "td/telegram/files/ResourceManager.h"
+#include "td/telegram/net/NetQuery.h"
 
 #include "td/actor/actor.h"
 
diff --git a/td/telegram/net/PublicRsaKeyWatchdog.h b/td/telegram/net/PublicRsaKeyWatchdog.h
index c64b3191b..52d837f31 100644
--- a/td/telegram/net/PublicRsaKeyWatchdog.h
+++ b/td/telegram/net/PublicRsaKeyWatchdog.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "td/telegram/net/NetActor.h"
+#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/net/PublicRsaKeySharedCdn.h"
diff --git a/td/telegram/net/Session.cpp b/td/telegram/net/Session.cpp
index 06e188652..dc1973ac9 100644
--- a/td/telegram/net/Session.cpp
+++ b/td/telegram/net/Session.cpp
@@ -373,7 +373,7 @@ void Session::connection_online_update(double now, bool force) {
 void Session::send(NetQueryPtr &&query) {
   last_activity_timestamp_ = Time::now();
 
-  // query->debug(PSTRING() << get_name() << ": received from SessionProxy");
+  // query->debug(PSTRING() << get_name() << ": received by Session");
   query->set_session_id(auth_data_.get_session_id());
   VLOG(net_query) << "Receive query " << query;
   if (query->update_is_ready()) {
diff --git a/td/telegram/net/TempAuthKeyWatchdog.h b/td/telegram/net/TempAuthKeyWatchdog.h
index 259e9e4e8..2da94648a 100644
--- a/td/telegram/net/TempAuthKeyWatchdog.h
+++ b/td/telegram/net/TempAuthKeyWatchdog.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "td/telegram/Global.h"
+#include "td/telegram/net/NetQuery.h"
 #include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/net/NetQueryDispatcher.h"
 #include "td/telegram/telegram_api.h"
diff --git a/test/mtproto.cpp b/test/mtproto.cpp
index 39087599b..c7bf876e5 100644
--- a/test/mtproto.cpp
+++ b/test/mtproto.cpp
@@ -6,7 +6,6 @@
 //
 #include "td/telegram/ConfigManager.h"
 #include "td/telegram/net/PublicRsaKeySharedMain.h"
-#include "td/telegram/net/Session.h"
 #include "td/telegram/NotificationManager.h"
 #include "td/telegram/telegram_api.h"
 
diff --git a/test/secret.cpp b/test/secret.cpp
index 158027569..48523ec27 100644
--- a/test/secret.cpp
+++ b/test/secret.cpp
@@ -9,6 +9,8 @@
 #include "td/telegram/Global.h"
 #include "td/telegram/logevent/LogEvent.h"
 #include "td/telegram/MessageId.h"
+#include "td/telegram/net/NetQuery.h"
+#include "td/telegram/net/NetQueryCreator.h"
 #include "td/telegram/secret_api.h"
 #include "td/telegram/SecretChatActor.h"
 #include "td/telegram/SecretChatDb.h"