diff --git a/reactos/dll/win32/gdi32/misc/gdientry.c b/reactos/dll/win32/gdi32/misc/gdientry.c
index 17f47eeba3c..1e38d974cf4 100644
--- a/reactos/dll/win32/gdi32/misc/gdientry.c
+++ b/reactos/dll/win32/gdi32/misc/gdientry.c
@@ -1033,20 +1033,7 @@ DdSetGammaRamp(LPDDRAWI_DIRECTDRAW_LCL pDDraw,
                                hdc,
                                lpGammaRamp);
 }
-/*
- * @implemented
- *
- * GDIEntry 16
- */
-DWORD
-WINAPI
-DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw,
-                     LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
-                     LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2)
-{
-    /* Always returns success */
-    return TRUE;
-}
+
 
 
 
diff --git a/reactos/dll/win32/gdi32/misc/historic.c b/reactos/dll/win32/gdi32/misc/historic.c
index 24386450daf..0deb68d83f9 100644
--- a/reactos/dll/win32/gdi32/misc/historic.c
+++ b/reactos/dll/win32/gdi32/misc/historic.c
@@ -9,6 +9,11 @@
  */
 
 #include "precomp.h"
+#include <ddraw.h>
+#include <ddrawi.h>
+#include <ddrawint.h>
+#include <ddrawgdi.h>
+#include <ntgdi.h>
 
 /*
  * @implemented
@@ -65,6 +70,7 @@ HBITMAP
 STDCALL
 GdiConvertBitmap(HBITMAP hbm)
 {
+    /* Note Windows 2000/XP/VISTA always returns hbm */
     return hbm;
 }
 
@@ -75,6 +81,7 @@ HBRUSH
 STDCALL
 GdiConvertBrush(HBRUSH hbr)
 {
+    /* Note Windows 2000/XP/VISTA always returns hbr */
     return hbr;
 }
 
@@ -85,6 +92,7 @@ HDC
 STDCALL
 GdiConvertDC(HDC hdc)
 {
+    /* Note Windows 2000/XP/VISTA always returns hdc */
     return hdc;
 }
 
@@ -95,6 +103,7 @@ HFONT
 STDCALL
 GdiConvertFont(HFONT hfont)
 {
+    /* Note Windows 2000/XP/VISTA always returns hfont */
     return hfont;
 }
 
@@ -105,6 +114,7 @@ HPALETTE
 STDCALL
 GdiConvertPalette(HPALETTE hpal)
 {
+    /* Note Windows 2000/XP/VISTA always returns hpal */
     return hpal;
 }
 
@@ -115,6 +125,7 @@ HRGN
 STDCALL
 GdiConvertRegion(HRGN hregion)
 {
+    /* Note Windows 2000/XP/VISTA always returns hregion */
     return hregion;
 }
 
@@ -125,9 +136,22 @@ BOOL
 STDCALL
 GdiSetAttrs(HDC hdc)
 {
+    /* Note Windows 2000/XP/VISTA always returns TRUE */
     return TRUE;
 }
 
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+GdiDeleteLocalDC(HDC hdc)
+{
+    /* Note Windows 2000/XP/VISTA always returns TRUE */
+    return TRUE;
+}
+
+
 /*
  * @implemented
  */
@@ -139,5 +163,74 @@ GdiSetServerAttr(HDC hdc,DWORD attr)
 }
 
 
+/*
+ * @implemented
+ */
+int
+STDCALL
+DeviceCapabilitiesExA(LPCSTR pDevice,
+                      LPCSTR pPort,
+                      WORD fwCapability,
+                      LPSTR pOutput,
+                      CONST DEVMODEA *pDevMode)
+{
+    /* Note Windows 2000/XP/VISTA always returns -1 */
+    return -1;
+}
+
+/*
+ * @implemented
+ */
+int
+STDCALL
+DeviceCapabilitiesExW(LPCWSTR pDevice,
+                      LPCWSTR pPort,
+                      WORD fwCapability,
+                      LPWSTR pOutput,
+                      CONST DEVMODEW *pDevMode)
+{
+    /* Note Windows 2000/XP/VISTA always returns -1 */
+    return -1;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+FixBrushOrgEx(HDC hDC,
+              INT nXOrg,
+              INT nYOrg,
+              LPPOINT lpPoint)
+{
+    /* Note Windows 2000/XP/VISTA always returns FALSE */
+    return FALSE;
+}
+
+/*
+ * @implemented
+ *
+ * GDIEntry 16
+ */
+DWORD
+WINAPI
+DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw,
+                     LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1,
+                     LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2)
+{
+    /* Note Windows 2000/XP/VISTA always returns success */
+    return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+GdiReleaseLocalDC(HDC hdc)
+{
+    /* Note Windows 2000/XP/VISTA always returns TRUE */
+    return TRUE;
+}
 
 
diff --git a/reactos/dll/win32/gdi32/misc/misc.c b/reactos/dll/win32/gdi32/misc/misc.c
index 3f430db8e69..a21c94da1da 100644
--- a/reactos/dll/win32/gdi32/misc/misc.c
+++ b/reactos/dll/win32/gdi32/misc/misc.c
@@ -158,18 +158,6 @@ GdiGetBatchLimit()
     return GDI_BatchLimit;
 }
 
-
-/*
- * @implemented
- */
-BOOL
-STDCALL
-GdiReleaseLocalDC(HDC hdc)
-{
-	return TRUE;
-}
-
-
 /*
  * @unimplemented
  */
@@ -177,8 +165,7 @@ BOOL
 STDCALL
 GdiReleaseDC(HDC hdc)
 {
-	GdiReleaseLocalDC(hdc);
-	return 0;
+    return 0;
 }
 
 INT STDCALL
diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c
index 5df604bb5c7..4453ee6f57b 100644
--- a/reactos/dll/win32/gdi32/misc/stubs.c
+++ b/reactos/dll/win32/gdi32/misc/stubs.c
@@ -1350,18 +1350,6 @@ GdiConvertEnhMetaFile(HENHMETAFILE hmf)
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-GdiDeleteLocalDC(HDC hdc)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
 /*
  * @unimplemented
  */
diff --git a/reactos/dll/win32/gdi32/misc/stubsa.c b/reactos/dll/win32/gdi32/misc/stubsa.c
index 009f353ed91..550c8161b31 100644
--- a/reactos/dll/win32/gdi32/misc/stubsa.c
+++ b/reactos/dll/win32/gdi32/misc/stubsa.c
@@ -14,22 +14,6 @@
 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
 
 
-/*
- * @implemented
- */
-int
-STDCALL
-DeviceCapabilitiesExA(
-	LPCSTR		pDevice,
-	LPCSTR		pPort,
-	WORD		fwCapability,
-	LPSTR		pOutput,
-	CONST DEVMODEA	*pDevMode
-	)
-{
-	/* Note Windows 2000/XP/VISTA always return -1 */
-	return -1;
-}
 
 
 /*
diff --git a/reactos/dll/win32/gdi32/misc/stubsw.c b/reactos/dll/win32/gdi32/misc/stubsw.c
index 8f723c0664f..c0892a8862c 100644
--- a/reactos/dll/win32/gdi32/misc/stubsw.c
+++ b/reactos/dll/win32/gdi32/misc/stubsw.c
@@ -13,22 +13,7 @@
 
 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
 
-/*
- * @implemented
- */
-int
-STDCALL
-DeviceCapabilitiesExW(
-	LPCWSTR		pDevice,
-	LPCWSTR		pPort,
-	WORD		fwCapability,
-	LPWSTR		pOutput,
-	CONST DEVMODEW	*pDevMode
-	)
-{
-    /* Note Windows 2000/XP/VISTA always return -1 */
-    return -1;
-}
+
 
 
 /*
diff --git a/reactos/dll/win32/gdi32/objects/brush.c b/reactos/dll/win32/gdi32/objects/brush.c
index 24d423cdada..379b6af8379 100644
--- a/reactos/dll/win32/gdi32/objects/brush.c
+++ b/reactos/dll/win32/gdi32/objects/brush.c
@@ -3,19 +3,7 @@
 #define NDEBUG
 #include <debug.h>
 
-/*
- * @implemented
- */
-BOOL
-STDCALL
-FixBrushOrgEx(
-   HDC hDC,
-   INT nXOrg,
-   INT nYOrg,
-   LPPOINT lpPoint)
-{
-   return FALSE;
-}
+
 
 /*
  * @implemented