diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index 75f3877b762..0a6cf409b85 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -106,13 +106,13 @@
 412 stdcall RemoveWindowSubclass(long ptr long)
 413 stdcall DefSubclassProc(long long long long)
 414 stub -noname MirrorIcon
-415 stdcall -noname DrawTextWrap(long long long long long)
-416 stub -noname DrawTextExPrivWrap
-417 stdcall -noname ExtTextOutWrap(long long long long ptr wstr long ptr)
-418 stub -noname GetCharWidthWrap
-419 stdcall -noname GetTextExtentPointWrap(long long long long)
-420 stub -noname GetTextExtentPoint32Wrap
-421 stub -noname TextOutWrap
+415 stdcall -noname DrawTextWrap(long wstr long ptr long) user32.DrawTextW
+416 stdcall -noname DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW
+417 stdcall -noname ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW
+418 stdcall -noname GetCharWidthWrap(long long long long) gdi32.GetCharWidthW
+419 stdcall -noname GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW
+420 stdcall -noname GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W
+421 stdcall -noname TextOutWrap(long long long wstr long) gdi32.TextOutW
 
 # Functions imported by name
 
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index 6ac2e9ac2da..fabc4d59032 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -25,9 +25,6 @@
  *     These functions are used by EXPLORER.EXE, IEXPLORE.EXE and
  *     COMCTL32.DLL (internally).
  *
- * TODO
- *     - Add more functions.
- *     - Write some documentation.
  */
 #include "config.h"
 #include "wine/port.h"
@@ -2540,43 +2537,3 @@ DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, LPVOID lParam)
     DSA_EnumCallback (hdsa, enumProc, lParam);
     DSA_Destroy (hdsa);
 }
-
-
-/**************************************************************************
- * @ [COMCTL32.415]
- *
- * FIXME: What's this supposed to do?
- *        Parameter 1 is an HWND, you're on your own for the rest.
- */
-
-BOOL WINAPI DrawTextWrap( HWND hwnd, DWORD b, DWORD c, DWORD d, DWORD e)
-{
-
-   FIXME("(%p, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
-
-   return TRUE;
-}
-
-/**************************************************************************
- * @ [COMCTL32.417]
- *
- */
-BOOL WINAPI ExtTextOutWrap(HDC hdc, INT x, INT y, UINT flags, const RECT *lprect,
-                         LPCWSTR str, UINT count, const INT *lpDx)
-{
-    return ExtTextOutW(hdc, x, y, flags, lprect, str, count, lpDx);
-}
-
-/**************************************************************************
- * @ [COMCTL32.419]
- *
- * FIXME: What's this supposed to do?
- */
-
-BOOL WINAPI GetTextExtentPointWrap( DWORD a, DWORD b, DWORD c, DWORD d)
-{
-
-   FIXME("(%lx, %lx, %lx, %lx): stub!\n", a, b, c, d);
-
-   return TRUE;
-}