diff --git a/reactos/subsystems/win32/win32k/eng/bitblt.c b/reactos/subsystems/win32/win32k/eng/bitblt.c
index 9aa1a0531ed..4592cc71564 100644
--- a/reactos/subsystems/win32/win32k/eng/bitblt.c
+++ b/reactos/subsystems/win32/win32k/eng/bitblt.c
@@ -551,6 +551,9 @@ IntEngBitBltEx(SURFOBJ *DestSurf,
   BITMAPOBJ *DestObj;
   BITMAPOBJ *SourceObj = NULL;
 
+  if (DestSurf == NULL)
+    return FALSE;
+
   ASSERT(DestSurf);
   DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj);
   ASSERT(DestObj);
diff --git a/reactos/subsystems/win32/win32k/w32k.h b/reactos/subsystems/win32/win32k/w32k.h
index 09045ea9226..2cf1220d7e6 100644
--- a/reactos/subsystems/win32/win32k/w32k.h
+++ b/reactos/subsystems/win32/win32k/w32k.h
@@ -13,11 +13,11 @@
 #define _NO_COM
 
 /* DDK/NDK/SDK Headers */
-#include <ntifs.h>
-#include <ntddk.h>
-#include <ntddmou.h>
-#include <ntndk.h>
-//#include <rtltypes.h>
+#include <ddk/ntddk.h>
+#include <ddk/ntddmou.h>
+#include <ddk/ntifs.h>
+#include <ddk/tvout.h>
+#include <ndk/ntndk.h>
 
 /* Win32 Headers */
 /* FIXME: Defines in winbase.h that we need... */