diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c
index 972b45688ea..4d7b10c8551 100644
--- a/reactos/dll/win32/gdi32/objects/text.c
+++ b/reactos/dll/win32/gdi32/objects/text.c
@@ -43,7 +43,7 @@ TextOutW(
 	LPCWSTR  lpString,
 	int  cbString)
 {
-  return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL);
+  return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cbString, NULL, 0);
 }
 
 
@@ -350,7 +350,7 @@ ExtTextOutW(
 	CONST INT	*lpDx
 	)
 {
-  return NtGdiExtTextOut(hdc, X, Y, fuOptions, lprc, lpString, cbCount, lpDx);
+  return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cbCount, (LPINT)lpDx, 0);
 }
 
 
diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h
index 217392dea35..f3a49008d1a 100644
--- a/reactos/include/reactos/win32k/ntgdibad.h
+++ b/reactos/include/reactos/win32k/ntgdibad.h
@@ -108,18 +108,6 @@ NtGdiEnumFonts(HDC  hDC,
                    FONTENUMPROCW  FontFunc,
                    LPARAM  lParam);
 
-/* Use NtGdiExtTextOutW with 0, 0 at the end. */
-BOOL
-STDCALL
-NtGdiExtTextOut(HDC  hdc,
-                     int  X,
-                     int  Y,
-                     UINT  fuOptions,
-                     CONST RECT  *lprc,
-                     LPCWSTR  lpString,
-                     UINT  cbCount,
-                     CONST INT  *lpDx);
-
 /* Should be done in user-mode. */
 BOOL
 STDCALL
@@ -163,13 +151,6 @@ NtGdiOffsetWindowOrgEx (
 	LPPOINT	Point
 	);
 
-/* Use NtGdiPolyTextOutW with 0 at the end. */
-BOOL
-STDCALL
-NtGdiPolyTextOut(HDC  hDC,
-                      CONST LPPOLYTEXTW txt,
-                      int  Count);
-
 /* Should be done in user-mode. */
 BOOL
 STDCALL
diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c
index 5d127dc080b..10b20f69400 100644
--- a/reactos/subsystems/win32/win32k/ntuser/desktop.c
+++ b/reactos/subsystems/win32/win32k/ntuser/desktop.c
@@ -1509,7 +1509,7 @@ NtUserPaintDesktop(HDC hDC)
          align_old = NtGdiSetTextAlign(hDC, TA_RIGHT);
          mode_old = NtGdiSetBkMode(hDC, TRANSPARENT);
 
-         NtGdiExtTextOut(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL);
+         NtGdiExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0);
 
          NtGdiSetBkMode(hDC, mode_old);
          NtGdiSetTextAlign(hDC, align_old);
diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c
index 71c1b2596fb..ccec504ede4 100644
--- a/reactos/subsystems/win32/win32k/ntuser/painting.c
+++ b/reactos/subsystems/win32/win32k/ntuser/painting.c
@@ -1609,9 +1609,9 @@ UserDrawCaptionText(HDC hDc,
 
    //FIXME: If string doesn't fit to rc, truncate it and add ellipsis.
 
-   NtGdiExtTextOut(hDc, lpRc->left,
+   NtGdiExtTextOutW(hDc, lpRc->left,
       lpRc->top, 0, NULL, Text->Buffer,
-      Text->Length/sizeof(WCHAR), NULL);
+      Text->Length/sizeof(WCHAR), NULL, 0);
 
    NtGdiSetTextColor(hDc, OldTextColor);
    NtGdiSelectFont(hDc, hOldFont);
diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c
index 146cb63fc21..0e95b93c361 100644
--- a/reactos/subsystems/win32/win32k/objects/text.c
+++ b/reactos/subsystems/win32/win32k/objects/text.c
@@ -1523,16 +1523,18 @@ NtGdiGlyphCacheSet(
    return GlyphCopy;
 }
 
-BOOL STDCALL
-NtGdiExtTextOut(
-   HDC hDC,
-   INT XStart,
-   INT YStart,
-   UINT fuOptions,
-   CONST RECT *lprc,
-   LPCWSTR UnsafeString,
-   UINT Count,
-   CONST INT *UnsafeDx)
+BOOL
+APIENTRY
+NtGdiExtTextOutW(
+    IN HDC hDC,
+    IN INT XStart,
+    IN INT YStart,
+    IN UINT fuOptions,
+    IN OPTIONAL LPRECT lprc,
+    IN LPWSTR UnsafeString,
+    IN INT Count,
+    IN OPTIONAL LPINT UnsafeDx,
+    IN DWORD dwCodePage)
 {
    /*
     * FIXME:
@@ -3998,16 +4000,6 @@ NtGdiGetTextMetricsW(
   return TRUE;
 }
 
-BOOL
-STDCALL
-NtGdiPolyTextOut(HDC  hDC,
-                      CONST LPPOLYTEXTW  txt,
-                      int  Count)
-{
-  UNIMPLEMENTED;
-  return FALSE;
-}
-
 BOOL
 STDCALL
 NtGdiRemoveFontResource(LPCWSTR  FileName)
diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c
index d313063685b..cd141ae2618 100644
--- a/reactos/subsystems/win32/win32k/stubs/stubs.c
+++ b/reactos/subsystems/win32/win32k/stubs/stubs.c
@@ -2023,28 +2023,6 @@ NtGdiEudcLoadUnloadLink(
     return FALSE;
 }
 
-
- /*
- * @unimplemented
- */
-BOOL
-APIENTRY
-NtGdiExtTextOutW(
-    IN HDC hdc,
-    IN INT x,
-    IN INT y,
-    IN UINT flOpts,
-    IN OPTIONAL LPRECT prcl,
-    IN LPWSTR pwsz,
-    IN INT cwc,
-    IN OPTIONAL LPINT pdx,
-    IN DWORD dwCodePage)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
-
  /*
  * @unimplemented
  */
diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db
index c47ff42c011..6f1e090cf46 100644
--- a/reactos/subsystems/win32/win32k/w32ksvc.db
+++ b/reactos/subsystems/win32/win32k/w32ksvc.db
@@ -721,14 +721,12 @@ NtGdiAddFontResource                    2
 NtGdiCreateDIBitmap                     6
 NtGdiCreateScalableFontResource         4
 NtGdiEnumFonts                          4
-NtGdiExtTextOut                         8
 NtGdiGetAspectRatioFilterEx             2
 NtGdiGetFontFamilyInfo                  4
 NtGdiGetFontLanguageInfo                1
 NtGdiGetTextExtentPoint32               4
 NtGdiOffsetViewportOrgEx                4
 NtGdiOffsetWindowOrgEx                  4
-NtGdiPolyTextOut                        3
 NtGdiRemoveFontResource                 1
 #
 # ReactOS only system calls