diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c
index 23335819b5a..56a115fffd4 100644
--- a/drivers/setup/blue/blue.c
+++ b/drivers/setup/blue/blue.c
@@ -10,6 +10,7 @@
 /* INCLUDES ******************************************************************/
 
 #include "blue.h"
+#include <ndk/inbvfuncs.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/drivers/setup/blue/blue.h b/drivers/setup/blue/blue.h
index b18edfc2e04..335313abe15 100644
--- a/drivers/setup/blue/blue.h
+++ b/drivers/setup/blue/blue.h
@@ -9,7 +9,7 @@
 #ifndef _BLUE_PCH_
 #define _BLUE_PCH_
 
-#include <wdm.h>
+#include <ntifs.h>
 
 #define TAG_BLUE    'EULB'
 
@@ -54,7 +54,6 @@ typedef struct tagCONSOLE_CURSOR_INFO
 #define ENABLE_WRAP_AT_EOL_OUTPUT               0x0002
 
 #include <blue/ntddblue.h>
-#include <ndk/inbvfuncs.h>
 
 /*
  * Color attributes for text and screen background
diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c
index ba315f9e594..975f2d91de9 100644
--- a/drivers/setup/blue/font.c
+++ b/drivers/setup/blue/font.c
@@ -10,8 +10,7 @@
 /* INCLUDES ***************************************************************/
 
 #include "blue.h"
-
-#include <ntddk.h>
+#include <ndk/rtlfuncs.h>
 
 #define NDEBUG
 #include <debug.h>