diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index 7c8fa54f3a9..9fdedb34313 100644
--- a/dlls/gdi32/bitmap.c
+++ b/dlls/gdi32/bitmap.c
@@ -762,7 +762,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc )
  */
 static BOOL BITMAP_DeleteObject( HGDIOBJ handle )
 {
-    const DC_FUNCTIONS *funcs;
+    const struct gdi_dc_funcs *funcs;
     BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP );
 
     if (!bmp) return FALSE;
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index b50ea7050c8..74d374725a6 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -598,7 +598,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
 {
     HDC hdc;
     DC * dc;
-    const DC_FUNCTIONS *funcs;
+    const struct gdi_dc_funcs *funcs;
     WCHAR buf[300];
 
     GDI_CheckNotLock();
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 20993882959..2331e7cb57a 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -509,7 +509,7 @@ static INT dibdrv_SetROP2( PHYSDEV dev, INT rop )
     return next->funcs->pSetROP2( next, rop );
 }
 
-const DC_FUNCTIONS dib_driver =
+const struct gdi_dc_funcs dib_driver =
 {
     NULL,                               /* pAbortDoc */
     NULL,                               /* pAbortPath */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 8647b955813..565e0ad302b 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -138,7 +138,7 @@ static const struct gdi_dc_funcs *get_display_driver(void)
 /**********************************************************************
  *	     DRIVER_load_driver
  */
-const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name )
+const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name )
 {
     HMODULE module;
     struct graphics_driver *driver, *new_driver;
@@ -651,7 +651,7 @@ static BOOL nulldrv_wglUseFontBitmapsW( PHYSDEV dev, DWORD start, DWORD count, D
     return FALSE;
 }
 
-const DC_FUNCTIONS null_driver =
+const struct gdi_dc_funcs null_driver =
 {
     nulldrv_AbortDoc,                   /* pAbortDoc */
     nulldrv_AbortPath,                  /* pAbortPath */
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 292f505fbfa..56e3de86cd0 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
 static BOOL EMFDRV_DeleteDC( PHYSDEV dev );
 
-static const DC_FUNCTIONS EMFDRV_Funcs =
+static const struct gdi_dc_funcs EMFDRV_Funcs =
 {
     NULL,                            /* pAbortDoc */
     EMFDRV_AbortPath,                /* pAbortPath */
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 1fc8573e084..67bdd2c81fe 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -72,8 +72,6 @@ typedef struct tagGDIOBJHDR
     struct hdc_list *hdcs;
 } GDIOBJHDR;
 
-typedef struct gdi_dc_funcs DC_FUNCTIONS;
-
 /* It should not be necessary to access the contents of the GdiPath
  * structure directly; if you find that the exported functions don't
  * allow you to do what you want, then please place a new exported
@@ -198,7 +196,7 @@ typedef struct tagBITMAPOBJ
     GDIOBJHDR           header;
     BITMAP              bitmap;
     SIZE                size;   /* For SetBitmapDimension() */
-    const DC_FUNCTIONS *funcs; /* DC function table */
+    const struct gdi_dc_funcs *funcs; /* DC function table */
     /* For device-independent bitmaps: */
     DIBSECTION         *dib;
     RGBQUAD            *color_table;  /* DIB color table if <= 8bpp */
@@ -270,9 +268,9 @@ extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struc
                                BLENDFUNCTION blend ) DECLSPEC_HIDDEN;
 
 /* driver.c */
-extern const DC_FUNCTIONS null_driver DECLSPEC_HIDDEN;
-extern const DC_FUNCTIONS dib_driver DECLSPEC_HIDDEN;
-extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN;
+extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN;
+extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN;
+extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN;
 extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN;
 
 /* enhmetafile.c */
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index 0c93571075d..92680d33681 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -79,7 +79,7 @@ static INT MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap)
 }
 
 
-static const DC_FUNCTIONS MFDRV_Funcs =
+static const struct gdi_dc_funcs MFDRV_Funcs =
 {
     NULL,                            /* pAbortDoc */
     MFDRV_AbortPath,                 /* pAbortPath */