diff --git a/examples/peerconnection/client/main_wnd.cc b/examples/peerconnection/client/main_wnd.cc
index 95eb1f93f6..86f84fdbd0 100644
--- a/examples/peerconnection/client/main_wnd.cc
+++ b/examples/peerconnection/client/main_wnd.cc
@@ -17,6 +17,7 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 #include "third_party/libyuv/include/libyuv/convert_argb.h"
 
 ATOM MainWnd::wnd_class_ = 0;
diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.cc b/modules/desktop_capture/win/dxgi_output_duplicator.cc
index b920821dea..4675b0748a 100644
--- a/modules/desktop_capture/win/dxgi_output_duplicator.cc
+++ b/modules/desktop_capture/win/dxgi_output_duplicator.cc
@@ -23,6 +23,7 @@
 #include "modules/desktop_capture/win/dxgi_texture_staging.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/win32.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/screen_capture_utils.cc b/modules/desktop_capture/win/screen_capture_utils.cc
index a76a7f527a..948adc8d45 100644
--- a/modules/desktop_capture/win/screen_capture_utils.cc
+++ b/modules/desktop_capture/win/screen_capture_utils.cc
@@ -17,6 +17,7 @@
 
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/win32.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/window_capturer_win.cc b/modules/desktop_capture/window_capturer_win.cc
index 7fa7e34dce..1b59af6891 100644
--- a/modules/desktop_capture/window_capturer_win.cc
+++ b/modules/desktop_capture/window_capturer_win.cc
@@ -20,6 +20,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/trace_event.h"
 #include "rtc_base/win32.h"
 
diff --git a/rtc_base/basictypes.h b/rtc_base/basictypes.h
index 4430731981..1d149d6ff4 100644
--- a/rtc_base/basictypes.h
+++ b/rtc_base/basictypes.h
@@ -42,8 +42,4 @@
 #error RTC_ARCH_CPU_BIG_ENDIAN and RTC_ARCH_CPU_LITTLE_ENDIAN both defined.
 #endif
 
-#if defined(WEBRTC_WIN)
-typedef int socklen_t;
-#endif
-
 #endif  // RTC_BASE_BASICTYPES_H_
diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index e857e75574..ca198819d7 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -40,6 +40,7 @@
 #include "rtc_base/socket.h"  // includes something that makes windows happy
 #include "rtc_base/stream.h"
 #include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc
index 1c5585be3a..86f8352ac5 100644
--- a/rtc_base/win32.cc
+++ b/rtc_base/win32.cc
@@ -18,6 +18,7 @@
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/win32.h b/rtc_base/win32.h
index 4e91687132..b20f3f3268 100644
--- a/rtc_base/win32.h
+++ b/rtc_base/win32.h
@@ -27,6 +27,8 @@
 #include <winsock2.h>
 #include <windows.h>
 
+typedef int socklen_t;
+
 #ifndef SECURITY_MANDATORY_LABEL_AUTHORITY
 // Add defines that we use if we are compiling against older sdks
 #define SECURITY_MANDATORY_MEDIUM_RID               (0x00002000L)
@@ -40,9 +42,6 @@ typedef struct _TOKEN_MANDATORY_LABEL {
 
 #include <string>
 
-#include "rtc_base/basictypes.h"
-#include "rtc_base/stringutils.h"
-
 namespace rtc {
 
 const char* win32_inet_ntop(int af, const void *src, char* dst, socklen_t size);
diff --git a/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc
index 309c885f57..23508de266 100644
--- a/test/testsupport/fileutils.cc
+++ b/test/testsupport/fileutils.cc
@@ -43,6 +43,7 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
 #include "typedefs.h"  // NOLINT(build/include)  // For architecture defines
 
 namespace webrtc {