diff --git a/reactos/lib/gdi32/misc/stubsa.c b/reactos/lib/gdi32/misc/stubsa.c
index 23b9bbf6df6..067c35371f7 100644
--- a/reactos/lib/gdi32/misc/stubsa.c
+++ b/reactos/lib/gdi32/misc/stubsa.c
@@ -32,41 +32,6 @@ DeviceCapabilitiesExA(
   return 0;
 }
 
-
-/*
- * @unimplemented
- */
-int
-STDCALL
-EnumFontsA (
-	HDC  hDC,
-	LPCSTR lpFaceName,
-	FONTENUMPROCA  FontFunc,
-	LPARAM  lParam
-	)
-{
-  UNIMPLEMENTED;
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return 0;
-#if 0
-  NTSTATUS Status;
-  LPWSTR lpFaceNameW;
-  int rc = 0;
-
-  Status = HEAP_strdupA2W ( &lpFaceNameW, lpFaceName );
-  if (!NT_SUCCESS (Status))
-    SetLastError (RtlNtStatusToDosError(Status));
-  else
-    {
-      rc = NtGdiEnumFonts ( hDC, lpFaceNameW, FontFunc, lParam );
-
-      HEAP_free ( lpFaceNameW );
-    }
-  return rc;
-#endif
-}
-
-
 /*
  * @unimplemented
  */
diff --git a/reactos/lib/gdi32/misc/stubsw.c b/reactos/lib/gdi32/misc/stubsw.c
index 243365a0acc..4260ee07509 100644
--- a/reactos/lib/gdi32/misc/stubsw.c
+++ b/reactos/lib/gdi32/misc/stubsw.c
@@ -40,29 +40,6 @@ DeviceCapabilitiesExW(
 #endif
 }
 
-
-/*
- * @unimplemented
- */
-int
-STDCALL
-EnumFontsW(
-	HDC  hDC,
-	LPCWSTR lpFaceName,
-	FONTENUMPROCW  FontFunc,
-	LPARAM  lParam
-	)
-{
-#if 0
-  return NtGdiEnumFonts ( hDC, lpFaceName, FontFunc, lParam );
-#else
-  UNIMPLEMENTED;
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return 0;
-#endif
-}
-
-
 /*
  * @unimplemented
  */
diff --git a/reactos/lib/gdi32/objects/font.c b/reactos/lib/gdi32/objects/font.c
index f5e89a17325..30519218970 100644
--- a/reactos/lib/gdi32/objects/font.c
+++ b/reactos/lib/gdi32/objects/font.c
@@ -834,3 +834,58 @@ GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, DWORD *height)
     return (sz.cx / 26 + 1) / 2;
 }
 
+
+/*
+ * @unimplemented
+ */
+int
+STDCALL
+EnumFontsW(
+	HDC  hDC,
+	LPCWSTR lpFaceName,
+	FONTENUMPROCW  FontFunc,
+	LPARAM  lParam
+	)
+{
+#if 0
+  return NtGdiEnumFonts ( hDC, lpFaceName, FontFunc, lParam );
+#else
+  return EnumFontFamiliesW( hDC, lpFaceName, FontFunc, lParam );
+#endif
+}
+
+/*
+ * @unimplemented
+ */
+int
+STDCALL
+EnumFontsA (
+	HDC  hDC,
+	LPCSTR lpFaceName,
+	FONTENUMPROCA  FontFunc,
+	LPARAM  lParam
+	)
+{
+#if 0
+  NTSTATUS Status;
+  LPWSTR lpFaceNameW;
+  int rc = 0;
+
+  Status = HEAP_strdupA2W ( &lpFaceNameW, lpFaceName );
+  if (!NT_SUCCESS (Status))
+    SetLastError (RtlNtStatusToDosError(Status));
+  else
+    {
+      rc = NtGdiEnumFonts ( hDC, lpFaceNameW, FontFunc, lParam );
+
+      HEAP_free ( lpFaceNameW );
+    }
+  return rc;
+#else
+  return EnumFontFamiliesA( hDC, lpFaceName, FontFunc, lParam );
+#endif
+}
+
+
+
+