diff --git a/reactos/subsystems/win32/win32k/objects/device.c b/reactos/subsystems/win32/win32k/objects/device.c
index bd8741bb526..ffb38c13fa6 100644
--- a/reactos/subsystems/win32/win32k/objects/device.c
+++ b/reactos/subsystems/win32/win32k/objects/device.c
@@ -8,7 +8,7 @@
 
 #include <w32k.h>
 
-#define YDEBUG
+#define NDEBUG
 #include <debug.h>
 
 // TODO: proper implementation of LDEVOBJ and PDEVOBJ interface
@@ -214,9 +214,6 @@ IntPrepareDriver()
     LARGE_INTEGER Zero;
     BOOLEAN ret = FALSE;
 
-    DPRINT("IntPrepareDriver()\n");
-ASSERT(FALSE);
-
     Zero.QuadPart = 0;
     if (STATUS_SUCCESS != KeWaitForSingleObject(&VideoDriverNeedsPreparation, Executive, KernelMode, TRUE, &Zero))
     {
@@ -453,7 +450,7 @@ PrepareVideoPrt()
     IO_STATUS_BLOCK Iosb;
     BOOL Prepare = TRUE;
     ULONG Length = sizeof(BOOL);
-//    PIO_STACK_LOCATION StackPtr;
+    PIO_STACK_LOCATION StackPtr;
     LARGE_INTEGER StartOffset;
     PFILE_OBJECT FileObject = PrimarySurface.VideoFileObject;
     PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject;
@@ -478,16 +475,16 @@ PrepareVideoPrt()
     }
 
     /* Set up IRP Data */
-//    Irp->Tail.Overlay.OriginalFileObject = FileObject;
-//    Irp->RequestorMode = KernelMode;
-//    Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL;
-//    Irp->Overlay.AsynchronousParameters.UserApcContext = NULL;
-//    Irp->Flags |= IRP_WRITE_OPERATION;
+    Irp->Tail.Overlay.OriginalFileObject = FileObject;
+    Irp->RequestorMode = KernelMode;
+    Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL;
+    Irp->Overlay.AsynchronousParameters.UserApcContext = NULL;
+    Irp->Flags |= IRP_WRITE_OPERATION;
 
     /* Setup Stack Data */
-//    StackPtr = IoGetNextIrpStackLocation(Irp);
-//    StackPtr->FileObject = PrimarySurface.VideoFileObject;
-//    StackPtr->Parameters.Write.Key = 0;
+    StackPtr = IoGetNextIrpStackLocation(Irp);
+    StackPtr->FileObject = PrimarySurface.VideoFileObject;
+    StackPtr->Parameters.Write.Key = 0;
 
     Status = IoCallDriver(DeviceObject, Irp);
 
@@ -509,8 +506,6 @@ IntCreatePrimarySurface()
     SURFOBJ *SurfObj;
     BOOL calledFromUser;
 
-    DPRINT("IntCreatePrimarySurface()\n");
-
     if (! IntPrepareDriverIfNeeded())
     {
         return FALSE;
diff --git a/reactos/subsystems/win32/win32k/objects/dibobj.c b/reactos/subsystems/win32/win32k/objects/dibobj.c
index 3fc4e41bdd4..e5aac6035b7 100644
--- a/reactos/subsystems/win32/win32k/objects/dibobj.c
+++ b/reactos/subsystems/win32/win32k/objects/dibobj.c
@@ -19,9 +19,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if 0
-#include "dibbmp.c"
-#else
 #include <w32k.h>
 
 #define NDEBUG
@@ -1738,6 +1735,4 @@ BuildDIBPalette(CONST BITMAPINFO *bmi, PINT paletteType)
     return hPal;
 }
 
-#endif
-
 /* EOF */