Fix platform.h/config.h includes.

33 files changed, 35 insertions, 20 deletions

diff --git a/tdutils/td/utils/BufferedUdp.h b/tdutils/td/utils/BufferedUdp.h
index 0bd355a4e..0cec11b1e 100644
--- a/tdutils/td/utils/BufferedUdp.h
+++ b/tdutils/td/utils/BufferedUdp.h
@@ -10,6 +10,7 @@
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/optional.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/detail/PollableFd.h"
 #include "td/utils/port/thread_local.h"
 #include "td/utils/port/UdpSocketFd.h"
diff --git a/tdutils/td/utils/MpmcQueue.h b/tdutils/td/utils/MpmcQueue.h
index a9fd10d55..5330c527c 100644
--- a/tdutils/td/utils/MpmcQueue.h
+++ b/tdutils/td/utils/MpmcQueue.h
@@ -11,6 +11,7 @@
 // To close queue, one should send as much sentinel elements as there are readers.
 // Once there are no readers and writers, one may easily destroy queue
 
+#include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/HazardPointers.h"
 #include "td/utils/logging.h"
diff --git a/tdutils/td/utils/MpscPollableQueue.h b/tdutils/td/utils/MpscPollableQueue.h
index a003c8d14..2288469fb 100644
--- a/tdutils/td/utils/MpscPollableQueue.h
+++ b/tdutils/td/utils/MpscPollableQueue.h
@@ -8,6 +8,7 @@
 
 #include "td/utils/common.h"
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/EventFd.h"
 
 #if !TD_EVENTFD_UNSUPPORTED
diff --git a/tdutils/td/utils/OptionParser.cpp b/tdutils/td/utils/OptionParser.cpp
index dfc38421c..d8960aebe 100644
--- a/tdutils/td/utils/OptionParser.cpp
+++ b/tdutils/td/utils/OptionParser.cpp
@@ -9,6 +9,7 @@
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/logging.h"
 #include "td/utils/PathView.h"
+#include "td/utils/port/config.h"
 #include "td/utils/SliceBuilder.h"
 
 #if TD_PORT_WINDOWS
diff --git a/tdutils/td/utils/Status.h b/tdutils/td/utils/Status.h
index aa8e8fc7e..5b2e663f8 100644
--- a/tdutils/td/utils/Status.h
+++ b/tdutils/td/utils/Status.h
@@ -8,6 +8,7 @@
 
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
+#include "td/utils/port/config.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/Slice.h"
 #include "td/utils/StackAllocator.h"
diff --git a/tdutils/td/utils/StorerBase.h b/tdutils/td/utils/StorerBase.h
index b8c532ea8..2d967aa1b 100644
--- a/tdutils/td/utils/StorerBase.h
+++ b/tdutils/td/utils/StorerBase.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "td/utils/common.h"
 #include "td/utils/int_types.h"
 
 namespace td {
diff --git a/tdutils/td/utils/benchmark.h b/tdutils/td/utils/benchmark.h
index 7e41e6145..065b29fbb 100644
--- a/tdutils/td/utils/benchmark.h
+++ b/tdutils/td/utils/benchmark.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "td/utils/common.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/port/Clocks.h"
diff --git a/tdutils/td/utils/crypto.cpp b/tdutils/td/utils/crypto.cpp
index f42f33c67..01fc1ff7a 100644
--- a/tdutils/td/utils/crypto.cpp
+++ b/tdutils/td/utils/crypto.cpp
@@ -13,6 +13,7 @@
 #include "td/utils/Destructor.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/RwMutex.h"
 #include "td/utils/port/thread_local.h"
 #include "td/utils/Random.h"
diff --git a/tdutils/td/utils/port/CxCli.h b/tdutils/td/utils/port/CxCli.h
index 29e13cfc7..92041c728 100644
--- a/tdutils/td/utils/port/CxCli.h
+++ b/tdutils/td/utils/port/CxCli.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #pragma managed(push, off)
-#include "td/utils/port/config.h"
+#include "td/utils/port/platform.h"
 #pragma managed(pop)
 
 #include "td/utils/common.h"
diff --git a/tdutils/td/utils/port/FileFd.cpp b/tdutils/td/utils/port/FileFd.cpp
index eadf0ac28..3da88f1d9 100644
--- a/tdutils/td/utils/port/FileFd.cpp
+++ b/tdutils/td/utils/port/FileFd.cpp
@@ -17,6 +17,7 @@
 #include "td/utils/FlatHashSet.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/detail/PollableFd.h"
 #include "td/utils/port/detail/skip_eintr.h"
 #include "td/utils/port/PollFlags.h"
diff --git a/tdutils/td/utils/port/FileFd.h b/tdutils/td/utils/port/FileFd.h
index 8c7180e98..bd555ced4 100644
--- a/tdutils/td/utils/port/FileFd.h
+++ b/tdutils/td/utils/port/FileFd.h
@@ -6,8 +6,6 @@
 //
 #pragma once
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/common.h"
 #include "td/utils/port/detail/NativeFd.h"
 #include "td/utils/port/detail/PollableFd.h"
diff --git a/tdutils/td/utils/port/FromApp.h b/tdutils/td/utils/port/FromApp.h
index 31ad0911d..6ef03cc3a 100644
--- a/tdutils/td/utils/port/FromApp.h
+++ b/tdutils/td/utils/port/FromApp.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "td/utils/common.h"
+#include "td/utils/port/config.h"
 
 #ifdef TD_PORT_WINDOWS
 
diff --git a/tdutils/td/utils/port/IPAddress.h b/tdutils/td/utils/port/IPAddress.h
index 2e844c2d9..faf443cbd 100644
--- a/tdutils/td/utils/port/IPAddress.h
+++ b/tdutils/td/utils/port/IPAddress.h
@@ -6,8 +6,6 @@
 //
 #pragma once
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/common.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
diff --git a/tdutils/td/utils/port/IoSlice.h b/tdutils/td/utils/port/IoSlice.h
index 9f8c281a1..aea26133e 100644
--- a/tdutils/td/utils/port/IoSlice.h
+++ b/tdutils/td/utils/port/IoSlice.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "td/utils/port/config.h"
 #include "td/utils/Slice.h"
 
 #if TD_PORT_POSIX
diff --git a/tdutils/td/utils/port/RwMutex.h b/tdutils/td/utils/port/RwMutex.h
index af3f49642..de8ae6ad0 100644
--- a/tdutils/td/utils/port/RwMutex.h
+++ b/tdutils/td/utils/port/RwMutex.h
@@ -6,9 +6,8 @@
 //
 #pragma once
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/common.h"
+#include "td/utils/port/config.h"
 
 #if TD_PORT_POSIX
 #include <pthread.h>
diff --git a/tdutils/td/utils/port/ServerSocketFd.cpp b/tdutils/td/utils/port/ServerSocketFd.cpp
index 305065f49..0593c0923 100644
--- a/tdutils/td/utils/port/ServerSocketFd.cpp
+++ b/tdutils/td/utils/port/ServerSocketFd.cpp
@@ -6,10 +6,9 @@
 //
 #include "td/utils/port/ServerSocketFd.h"
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/detail/skip_eintr.h"
 #include "td/utils/port/IPAddress.h"
 #include "td/utils/port/PollFlags.h"
diff --git a/tdutils/td/utils/port/ServerSocketFd.h b/tdutils/td/utils/port/ServerSocketFd.h
index f25f25163..15335a1b7 100644
--- a/tdutils/td/utils/port/ServerSocketFd.h
+++ b/tdutils/td/utils/port/ServerSocketFd.h
@@ -8,6 +8,7 @@
 
 #include "td/utils/port/detail/NativeFd.h"
 #include "td/utils/port/detail/PollableFd.h"
+#include "td/utils/port/platform.h"
 #include "td/utils/port/SocketFd.h"
 
 #include "td/utils/Slice.h"
@@ -16,6 +17,7 @@
 #include <memory>
 
 namespace td {
+
 namespace detail {
 class ServerSocketFdImpl;
 class ServerSocketFdImplDeleter {
@@ -54,4 +56,5 @@ class ServerSocketFd {
   std::unique_ptr<detail::ServerSocketFdImpl, detail::ServerSocketFdImplDeleter> impl_;
   explicit ServerSocketFd(unique_ptr<detail::ServerSocketFdImpl> impl);
 };
+
 }  // namespace td
diff --git a/tdutils/td/utils/port/SocketFd.h b/tdutils/td/utils/port/SocketFd.h
index b92841cfe..0f01be175 100644
--- a/tdutils/td/utils/port/SocketFd.h
+++ b/tdutils/td/utils/port/SocketFd.h
@@ -7,11 +7,11 @@
 #pragma once
 
 #include "td/utils/port/config.h"
-
 #include "td/utils/port/detail/NativeFd.h"
 #include "td/utils/port/detail/PollableFd.h"
 #include "td/utils/port/IoSlice.h"
 #include "td/utils/port/IPAddress.h"
+#include "td/utils/port/platform.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Span.h"
 #include "td/utils/Status.h"
diff --git a/tdutils/td/utils/port/Stat.h b/tdutils/td/utils/port/Stat.h
index 17affdba5..f96219ec5 100644
--- a/tdutils/td/utils/port/Stat.h
+++ b/tdutils/td/utils/port/Stat.h
@@ -6,9 +6,8 @@
 //
 #pragma once
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/common.h"
+#include "td/utils/port/config.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
 
diff --git a/tdutils/td/utils/port/StdStreams.cpp b/tdutils/td/utils/port/StdStreams.cpp
index b8de12150..80ada556f 100644
--- a/tdutils/td/utils/port/StdStreams.cpp
+++ b/tdutils/td/utils/port/StdStreams.cpp
@@ -8,6 +8,7 @@
 
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/detail/Iocp.h"
 #include "td/utils/port/detail/NativeFd.h"
 #include "td/utils/port/detail/PollableFd.h"
diff --git a/tdutils/td/utils/port/UdpSocketFd.h b/tdutils/td/utils/port/UdpSocketFd.h
index 914a5c4a3..02e79ed0f 100644
--- a/tdutils/td/utils/port/UdpSocketFd.h
+++ b/tdutils/td/utils/port/UdpSocketFd.h
@@ -13,6 +13,7 @@
 #include "td/utils/port/detail/NativeFd.h"
 #include "td/utils/port/detail/PollableFd.h"
 #include "td/utils/port/IPAddress.h"
+#include "td/utils/port/platform.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Span.h"
 #include "td/utils/Status.h"
diff --git a/tdutils/td/utils/port/detail/PollableFd.h b/tdutils/td/utils/port/detail/PollableFd.h
index f514c33f4..b000bf9fb 100644
--- a/tdutils/td/utils/port/detail/PollableFd.h
+++ b/tdutils/td/utils/port/detail/PollableFd.h
@@ -11,6 +11,7 @@
 #include "td/utils/List.h"
 #include "td/utils/logging.h"
 #include "td/utils/Observer.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/detail/NativeFd.h"
 #include "td/utils/port/Mutex.h"
 #include "td/utils/port/PollFlags.h"
diff --git a/tdutils/td/utils/port/detail/skip_eintr.h b/tdutils/td/utils/port/detail/skip_eintr.h
index ff29e279d..ea07fadef 100644
--- a/tdutils/td/utils/port/detail/skip_eintr.h
+++ b/tdutils/td/utils/port/detail/skip_eintr.h
@@ -6,6 +6,8 @@
 //
 #pragma once
 
+#include "td/utils/port/config.h"
+
 #if TD_PORT_POSIX
 #include "td/utils/common.h"
 #include "td/utils/Time.h"
diff --git a/tdutils/td/utils/port/path.cpp b/tdutils/td/utils/port/path.cpp
index 9463d006a..44fb44181 100644
--- a/tdutils/td/utils/port/path.cpp
+++ b/tdutils/td/utils/port/path.cpp
@@ -6,10 +6,9 @@
 //
 #include "td/utils/port/path.h"
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/detail/skip_eintr.h"
 #include "td/utils/ScopeGuard.h"
 #include "td/utils/SliceBuilder.h"
diff --git a/tdutils/td/utils/port/rlimit.cpp b/tdutils/td/utils/port/rlimit.cpp
index 9d88e14f6..1c8aa39e4 100644
--- a/tdutils/td/utils/port/rlimit.cpp
+++ b/tdutils/td/utils/port/rlimit.cpp
@@ -6,9 +6,8 @@
 //
 #include "td/utils/port/rlimit.h"
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 
 #if TD_PORT_POSIX
 #include <sys/resource.h>
diff --git a/tdutils/td/utils/port/stacktrace.cpp b/tdutils/td/utils/port/stacktrace.cpp
index 83fbe4941..6589a8e18 100644
--- a/tdutils/td/utils/port/stacktrace.cpp
+++ b/tdutils/td/utils/port/stacktrace.cpp
@@ -6,6 +6,8 @@
 //
 #include "td/utils/port/stacktrace.h"
 
+#include "td/utils/port/config.h"
+#include "td/utils/port/platform.h"
 #include "td/utils/port/signals.h"
 
 #if __GLIBC__
diff --git a/tdutils/td/utils/port/thread_local.h b/tdutils/td/utils/port/thread_local.h
index 9942e8546..28d019670 100644
--- a/tdutils/td/utils/port/thread_local.h
+++ b/tdutils/td/utils/port/thread_local.h
@@ -6,8 +6,6 @@
 //
 #pragma once
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/common.h"
 #include "td/utils/Destructor.h"
 
diff --git a/tdutils/td/utils/port/uname.cpp b/tdutils/td/utils/port/uname.cpp
index ae9f5f57f..0e62df77c 100644
--- a/tdutils/td/utils/port/uname.cpp
+++ b/tdutils/td/utils/port/uname.cpp
@@ -6,12 +6,11 @@
 //
 #include "td/utils/port/uname.h"
 
-#include "td/utils/port/config.h"
-
 #include "td/utils/common.h"
 #include "td/utils/filesystem.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/Stat.h"
 #include "td/utils/SliceBuilder.h"
 
diff --git a/tdutils/td/utils/port/user.cpp b/tdutils/td/utils/port/user.cpp
index 801943c19..10430fc45 100644
--- a/tdutils/td/utils/port/user.cpp
+++ b/tdutils/td/utils/port/user.cpp
@@ -7,6 +7,7 @@
 #include "td/utils/port/user.h"
 
 #include "td/utils/port/config.h"
+#include "td/utils/port/platform.h"
 
 #if TD_PORT_POSIX
 #include "td/utils/SliceBuilder.h"
diff --git a/tdutils/td/utils/queue.h b/tdutils/td/utils/queue.h
index 75a5d1c53..fbbba83b4 100644
--- a/tdutils/td/utils/queue.h
+++ b/tdutils/td/utils/queue.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "td/utils/port/config.h"
 #include "td/utils/port/EventFd.h"
 #include "td/utils/port/sleep.h"
 
diff --git a/tdutils/test/log.cpp b/tdutils/test/log.cpp
index cbf181de9..dcfd009bb 100644
--- a/tdutils/test/log.cpp
+++ b/tdutils/test/log.cpp
@@ -7,11 +7,13 @@
 #include "td/utils/AsyncFileLog.h"
 #include "td/utils/benchmark.h"
 #include "td/utils/CombinedLog.h"
+#include "td/utils/common.h"
 #include "td/utils/FileLog.h"
 #include "td/utils/format.h"
 #include "td/utils/logging.h"
 #include "td/utils/MemoryLog.h"
 #include "td/utils/NullLog.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/path.h"
 #include "td/utils/port/thread.h"
 #include "td/utils/Slice.h"
diff --git a/tdutils/test/misc.cpp b/tdutils/test/misc.cpp
index ee27c0de5..581f7c0ca 100644
--- a/tdutils/test/misc.cpp
+++ b/tdutils/test/misc.cpp
@@ -21,6 +21,7 @@
 #include "td/utils/invoke.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/EventFd.h"
 #include "td/utils/port/FileFd.h"
 #include "td/utils/port/IPAddress.h"
diff --git a/tdutils/test/port.cpp b/tdutils/test/port.cpp
index 3ae26922e..87f669a06 100644
--- a/tdutils/test/port.cpp
+++ b/tdutils/test/port.cpp
@@ -8,6 +8,7 @@
 #include "td/utils/common.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
+#include "td/utils/port/config.h"
 #include "td/utils/port/EventFd.h"
 #include "td/utils/port/FileFd.h"
 #include "td/utils/port/IoSlice.h"