Index: rostests/winetests/gdi32/bitmap.c
===================================================================
--- rostests/winetests/gdi32/bitmap.c	(revision 75633)
+++ rostests/winetests/gdi32/bitmap.c	(working copy)
@@ -32,16 +32,12 @@
 #include "winuser.h"
 #include "mmsystem.h"
 #include "wine/winternl.h"
-#ifndef __REACTOS__ /* CORE-11331 */
-#include "wine/ddk/d3dkmthk.h"
-#endif
+#include "ddk/d3dkmthk.h"
 
 #include "wine/test.h"
 
-#ifndef __REACTOS__ /* CORE-11331 */
 static NTSTATUS (WINAPI *pD3DKMTCreateDCFromMemory)( D3DKMT_CREATEDCFROMMEMORY *desc );
 static NTSTATUS (WINAPI *pD3DKMTDestroyDCFromMemory)( const D3DKMT_DESTROYDCFROMMEMORY *desc );
-#endif
 static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 static BOOL (WINAPI *pGdiGradientFill)(HDC,TRIVERTEX*,ULONG,void*,ULONG,ULONG);
 static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout);
@@ -5664,7 +5660,6 @@
     HeapFree( GetProcessHeap(), 0, info );
 }
 
-#ifndef __REACTOS__ /* CORE-11331 */
 static void test_D3DKMTCreateDCFromMemory( void )
 {
     D3DKMT_DESTROYDCFROMMEMORY destroy_desc;
@@ -5937,7 +5932,6 @@
         DeleteDC( bmp_dc );
     }
 }
-#endif /* __REACTOS__ */
 
 START_TEST(bitmap)
 {
@@ -5944,10 +5938,8 @@
     HMODULE hdll;
 
     hdll = GetModuleHandleA("gdi32.dll");
-#ifndef __REACTOS__ /* CORE-11331 */
     pD3DKMTCreateDCFromMemory  = (void *)GetProcAddress( hdll, "D3DKMTCreateDCFromMemory" );
     pD3DKMTDestroyDCFromMemory = (void *)GetProcAddress( hdll, "D3DKMTDestroyDCFromMemory" );
-#endif
     pGdiAlphaBlend             = (void *)GetProcAddress( hdll, "GdiAlphaBlend" );
     pGdiGradientFill           = (void *)GetProcAddress( hdll, "GdiGradientFill" );
     pSetLayout                 = (void *)GetProcAddress( hdll, "SetLayout" );
@@ -5987,7 +5979,5 @@
     test_SetDIBits_RLE8();
     test_SetDIBitsToDevice();
     test_SetDIBitsToDevice_RLE8();
-#ifndef __REACTOS__ /* CORE-11331 */
     test_D3DKMTCreateDCFromMemory();
-#endif
 }