diff --git a/reactos/lib/ws2_32/include/catalog.h b/reactos/lib/ws2_32/include/catalog.h
index 741cf47b5de..2876a265d4f 100644
--- a/reactos/lib/ws2_32/include/catalog.h
+++ b/reactos/lib/ws2_32/include/catalog.h
@@ -7,8 +7,6 @@
 #ifndef __CATALOG_H
 #define __CATALOG_H
 
-#include <wsahelp.h>
-
 typedef struct _CATALOG_ENTRY {
     LIST_ENTRY ListEntry;
     ULONG ReferenceCount;
diff --git a/reactos/lib/ws2_32/include/ws2_32.h b/reactos/lib/ws2_32/include/ws2_32.h
index ad9b9491793..3facacc3be3 100644
--- a/reactos/lib/ws2_32/include/ws2_32.h
+++ b/reactos/lib/ws2_32/include/ws2_32.h
@@ -8,14 +8,14 @@
 #define __WS2_32_H
 
 #include <roscfg.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <ntos.h>
-#include <napi/teb.h>
 #include <winsock2.h>
 #include <ws2spi.h>
 #include <ws2tcpip.h>
 #include <windows.h>
+#include <wsahelp.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 #undef assert
 #include <debug.h>
 #include <windns.h> // DNS_A_DATA