diff --git a/reactos/base/services/svchost/svchost.c b/reactos/base/services/svchost/svchost.c
index f05955127e4..c79ffae2009 100644
--- a/reactos/base/services/svchost/svchost.c
+++ b/reactos/base/services/svchost/svchost.c
@@ -104,7 +104,7 @@ BOOL PrepareService(LPCTSTR ServiceName)
 	HeapFree(GetProcessHeap(), 0, Buffer);
 
 	/* Load the service dll */
-	DPRINT1("Trying to load dll\n");
+	DPRINT("Trying to load dll\n");
 	hServiceDll = LoadLibrary(DllPath);
 
 	if (NULL == hServiceDll)
@@ -226,7 +226,7 @@ int _tmain (int argc, LPTSTR argv [])
 
 	NrOfServices = LoadServiceCategory(argv[2]);
 
-	DPRINT1("NrOfServices: %lu\n", NrOfServices);
+	DPRINT("NrOfServices: %lu\n", NrOfServices);
 	if (0 == NrOfServices)
 		return 0;
 
@@ -240,7 +240,7 @@ int _tmain (int argc, LPTSTR argv [])
 		/* Fill the service table */
 		for (i = 0; i < NrOfServices; ++i)
 		{
-			DPRINT1("Loading service: %s\n", Service->Name);
+			DPRINT("Loading service: %s\n", Service->Name);
 			ServiceTable[i].lpServiceName = Service->Name;
 			ServiceTable[i].lpServiceProc = Service->ServiceMainFunc;
 			Service = Service->Next;
diff --git a/reactos/dll/win32/user32/windows/cursoricon.c b/reactos/dll/win32/user32/windows/cursoricon.c
index f7ada0b80af..165e52df3fa 100644
--- a/reactos/dll/win32/user32/windows/cursoricon.c
+++ b/reactos/dll/win32/user32/windows/cursoricon.c
@@ -1005,7 +1005,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType,
         && (iDesiredCX > 0 || iDesiredCY > 0))
         || nFlags & LR_MONOCHROME)
     {
-		FIXME("Copying from resource isn't implemented yet\n");
+		TRACE("Copying from resource isn't implemented yet\n");
 		hNew = CopyIcon(hIcon);
 
 #if 0
diff --git a/reactos/subsystems/win32/win32k/eng/device.c b/reactos/subsystems/win32/win32k/eng/device.c
index 730b2ffaa3a..3e6759499e0 100644
--- a/reactos/subsystems/win32/win32k/eng/device.c
+++ b/reactos/subsystems/win32/win32k/eng/device.c
@@ -124,7 +124,7 @@ EngpRegisterGraphicsDevice(
      * This is a REG_MULTI_SZ string */
     for (; *pwsz; pwsz += wcslen(pwsz) + 1)
     {
-        DPRINT1("trying driver: %ls\n", pwsz);
+        DPRINT("trying driver: %ls\n", pwsz);
         /* Try to load the display driver */
         pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY);
         if (!pldev)
@@ -197,7 +197,7 @@ EngpRegisterGraphicsDevice(
             {
                 pGraphicsDevice->iDefaultMode = i;
                 pGraphicsDevice->iCurrentMode = i;
-                DPRINT1("Found default entry: %ld '%ls'\n", i, pdm->dmDeviceName);
+                DPRINT("Found default entry: %ld '%ls'\n", i, pdm->dmDeviceName);
             }
 
             /* Initialize the entry */
@@ -221,7 +221,7 @@ EngpRegisterGraphicsDevice(
 
     /* Unlock loader */
     EngReleaseSemaphore(ghsemGraphicsDeviceList);
-    DPRINT1("Prepared %ld modes for %ls\n", cModes, pGraphicsDevice->pwszDescription);
+    DPRINT("Prepared %ld modes for %ls\n", cModes, pGraphicsDevice->pwszDescription);
 
     return pGraphicsDevice;
 }
diff --git a/reactos/subsystems/win32/win32k/eng/pdevobj.c b/reactos/subsystems/win32/win32k/eng/pdevobj.c
index 2da468ee3fb..faff16e4aa0 100644
--- a/reactos/subsystems/win32/win32k/eng/pdevobj.c
+++ b/reactos/subsystems/win32/win32k/eng/pdevobj.c
@@ -117,7 +117,7 @@ PDEVOBJ_bEnablePDEV(
 {
     PFN_DrvEnablePDEV pfnEnablePDEV;
 
-    DPRINT1("PDEVOBJ_bEnablePDEV()\n");
+    DPRINT("PDEVOBJ_bEnablePDEV()\n");
 
     /* Get the DrvEnablePDEV function */
     pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV;
@@ -146,7 +146,7 @@ PDEVOBJ_bEnablePDEV(
     GDIOBJ_SetOwnership(ppdev->devinfo.hpalDefault, NULL);
     ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault);
 
-    DPRINT1("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev);
+    DPRINT("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev);
 
     return TRUE;
 }
@@ -266,7 +266,7 @@ EngpCreatePDEV(
     {
         /* ... use the device's default one */
         pdm = pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm;
-        DPRINT1("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode);
+        DPRINT("Using iDefaultMode = %ld\n", pGraphicsDevice->iDefaultMode);
     }
 
     /* Try to get a diplay driver */
diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c
index 8e97e1b7b7a..b4a4e20fb39 100644
--- a/reactos/subsystems/win32/win32k/ntuser/desktop.c
+++ b/reactos/subsystems/win32/win32k/ntuser/desktop.c
@@ -572,7 +572,7 @@ BOOL FASTCALL IntDesktopUpdatePerUserSettings(BOOL bEnable)
                                       QueryTable, NULL, NULL);
       if (!NT_SUCCESS(Status))
       {
-         DPRINT1("RtlQueryRegistryValues failed for PaintDesktopVersion (%x)\n",
+         DPRINT("RtlQueryRegistryValues failed for PaintDesktopVersion (%x)\n",
                  Status);
          g_PaintDesktopVersion = FALSE;
          return FALSE;
diff --git a/reactos/subsystems/win32/win32k/ntuser/display.c b/reactos/subsystems/win32/win32k/ntuser/display.c
index f5770a7ce2c..5e8f50d0c51 100644
--- a/reactos/subsystems/win32/win32k/ntuser/display.c
+++ b/reactos/subsystems/win32/win32k/ntuser/display.c
@@ -551,7 +551,7 @@ NtUserEnumDisplaySettings(
     ULONG cbSize, cbExtra;
     DEVMODEW dmReg, *pdm;
 
-    DPRINT1("Enter NtUserEnumDisplaySettings(%ls, %ld)\n",
+    DPRINT("Enter NtUserEnumDisplaySettings(%ls, %ld)\n",
             pustrDevice ? pustrDevice->Buffer : 0, iModeNum);
 
     if (pustrDevice)
diff --git a/reactos/subsystems/win32/win32k/objects/device.c b/reactos/subsystems/win32/win32k/objects/device.c
index c9b930331fa..d0d74683327 100644
--- a/reactos/subsystems/win32/win32k/objects/device.c
+++ b/reactos/subsystems/win32/win32k/objects/device.c
@@ -41,7 +41,7 @@ IntCreatePrimarySurface()
     /* attach monitor */
     IntAttachMonitor(gppdevPrimary, 0);
 
-    DPRINT1("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n",
+    DPRINT("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n",
         pPrimarySurface, pPrimarySurface->pSurface);
 
     /* Create surface */