diff --git a/reactos/lib/dnsapi/dnsapi/context.c b/reactos/lib/dnsapi/dnsapi/context.c
index a66b2a8e4c0..a46be104fc9 100644
--- a/reactos/lib/dnsapi/dnsapi/context.c
+++ b/reactos/lib/dnsapi/dnsapi/context.c
@@ -12,7 +12,7 @@
 #include <winerror.h>
 #include <windns.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
 #include <internal/windns.h>
 
 /* DnsAcquireContextHandle *************
diff --git a/reactos/lib/dnsapi/dnsapi/free.c b/reactos/lib/dnsapi/dnsapi/free.c
index e4bfe9d10e5..28571b4105a 100644
--- a/reactos/lib/dnsapi/dnsapi/free.c
+++ b/reactos/lib/dnsapi/dnsapi/free.c
@@ -13,7 +13,7 @@
 #include <windns.h>
 #include <internal/windns.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
 
 VOID WINAPI DnsFree
 ( PVOID Data, DNS_FREE_TYPE FreeType ) {
diff --git a/reactos/lib/dnsapi/dnsapi/names.c b/reactos/lib/dnsapi/dnsapi/names.c
index dd24e8ae6fa..e7f41a52679 100644
--- a/reactos/lib/dnsapi/dnsapi/names.c
+++ b/reactos/lib/dnsapi/dnsapi/names.c
@@ -3,10 +3,7 @@
 #include <windns.h>
 #include <internal/windns.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
-#include <wchar.h>
-#include <string.h>
-#include <ctype.h>
+#include <ndk/ntndk.h>
 
 static BOOL DnsIntNameContainsDots( LPCWSTR Name ) {
   return wcschr( Name, '.' ) ? TRUE : FALSE;
diff --git a/reactos/lib/dnsapi/dnsapi/query.c b/reactos/lib/dnsapi/dnsapi/query.c
index 2def104f4a1..27001e89d17 100644
--- a/reactos/lib/dnsapi/dnsapi/query.c
+++ b/reactos/lib/dnsapi/dnsapi/query.c
@@ -12,9 +12,8 @@
 #include <winerror.h>
 #include <windns.h>
 #include <internal/windns.h>
-#include <string.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
 
 /* DnsQuery ****************************
  * Begin a DNS query, and allow the result to be placed in the application
diff --git a/reactos/lib/dnsapi/dnsapi/stubs.c b/reactos/lib/dnsapi/dnsapi/stubs.c
index 101660b5544..9b7f62d0096 100644
--- a/reactos/lib/dnsapi/dnsapi/stubs.c
+++ b/reactos/lib/dnsapi/dnsapi/stubs.c
@@ -1,8 +1,7 @@
 #include <windows.h>
-/*#include <windns.h>*/
 #include <winerror.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
+#include <ndk/ntndk.h>
 #include <debug.h>
 
 typedef ULONG DNS_STATUS;