diff --git a/lldb/tools/lldb-dap/EventHelper.cpp b/lldb/tools/lldb-dap/EventHelper.cpp
index 20845fbc5b91..705eb0a457d9 100644
--- a/lldb/tools/lldb-dap/EventHelper.cpp
+++ b/lldb/tools/lldb-dap/EventHelper.cpp
@@ -12,6 +12,15 @@
 #include "LLDBUtils.h"
 #include "lldb/API/SBFileSpec.h"
 
+#if defined(_WIN32)
+#define NOMINMAX
+#include <windows.h>
+
+#ifndef PATH_MAX
+#define PATH_MAX MAX_PATH
+#endif
+#endif
+
 namespace lldb_dap {
 
 static void SendThreadExitedEvent(DAP &dap, lldb::tid_t tid) {
diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp
index fcefb4137f22..7935e88dba71 100644
--- a/lldb/tools/lldb-dap/lldb-dap.cpp
+++ b/lldb/tools/lldb-dap/lldb-dap.cpp
@@ -80,6 +80,7 @@
 #include <windows.h>
 #undef GetObject
 #include <io.h>
+typedef int socklen_t;
 #else
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -91,13 +92,6 @@
 #include <sys/prctl.h>
 #endif
 
-#if defined(_WIN32)
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
-typedef int socklen_t;
-#endif
-
 using namespace lldb_dap;
 using lldb_private::NativeSocket;
 using lldb_private::Socket;