From 808926be7e947832107d5e76efca881532322bc8 Mon Sep 17 00:00:00 2001
From: merge-script <falke.marco@gmail.com>
Date: Thu, 16 Sep 2021 09:13:18 +0200
Subject: [PATCH] Merge bitcoin/bitcoin#22952: Cleanup headers after #20788

317442525586ba9ff8b9af6c506b48f87cd8cd87 Cleanup headers after #20788 (Hennadii Stepanov)

Pull request description:

  This is a header cleanup after #20788.

ACKs for top commit:
  vasild:
    ACK 317442525586ba9ff8b9af6c506b48f87cd8cd87

Tree-SHA512: 1c21b1ba43841880625289174f10e5b333f6eb857f448e1e4114b1ecdf32a6044ec91c5987c1d66806c1d408a4e3d46569eb41d69a0acb8296601d7c203d9f1d
---
 src/netbase.cpp   | 2 --
 src/util/sock.cpp | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/netbase.cpp b/src/netbase.cpp
index fc940b0501..6218162c26 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -22,8 +22,6 @@
 
 #ifndef WIN32
 #include <fcntl.h>
-#else
-#include <codecvt>
 #endif
 
 #ifdef USE_POLL
diff --git a/src/util/sock.cpp b/src/util/sock.cpp
index b6c2a47434..1a4d67a65e 100644
--- a/src/util/sock.cpp
+++ b/src/util/sock.cpp
@@ -10,12 +10,14 @@
 #include <util/system.h>
 #include <util/time.h>
 
-#include <codecvt>
-#include <cwchar>
-#include <locale>
 #include <stdexcept>
 #include <string>
 
+#ifdef WIN32
+#include <codecvt>
+#include <locale>
+#endif
+
 #ifdef USE_POLL
 #include <poll.h>
 #endif