diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c
index f46dd94dcf6..933ad0c682c 100644
--- a/dlls/gdi32/mfdrv/graphics.c
+++ b/dlls/gdi32/mfdrv/graphics.c
@@ -357,7 +357,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn)
  */
 BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn )
 {
-    METAFILEDRV_PDEVICE *mf;
+    struct metadc *mf;
     INT16 index;
     if (!(mf = get_metadc_ptr( hdc ))) return FALSE;
     index = MFDRV_CreateRegion( &mf->dev, hrgn );
@@ -372,7 +372,7 @@ BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn )
  */
 BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn )
 {
-    METAFILEDRV_PDEVICE *mf;
+    struct metadc *mf;
     INT16 index;
     if (!(mf = get_metadc_ptr( hdc ))) return FALSE;
     index = MFDRV_CreateRegion( &mf->dev, hrgn );
@@ -387,7 +387,7 @@ BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn )
  */
 BOOL METADC_FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush )
 {
-    METAFILEDRV_PDEVICE *mf;
+    struct metadc *mf;
     INT16 iRgn, iBrush;
 
     if (!(mf = get_metadc_ptr( hdc ))) return FALSE;
@@ -414,7 +414,7 @@ BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush )
  */
 BOOL METADC_FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, INT x, INT y )
 {
-    METAFILEDRV_PDEVICE *mf;
+    struct metadc *mf;
     INT16 iRgn, iBrush;
 
     if (!(mf = get_metadc_ptr( hdc ))) return FALSE;
@@ -433,7 +433,7 @@ BOOL METADC_FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, INT x, INT y )
  */
 BOOL METADC_ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT mode )
 {
-    METAFILEDRV_PDEVICE *metadc;
+    struct metadc *metadc;
     INT16 iRgn;
     INT ret;
 
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index c9fe51706f1..e841f0c0fc0 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -213,7 +213,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
 static DC *MFDRV_AllocMetaFile(void)
 {
     DC *dc;
-    METAFILEDRV_PDEVICE *physDev;
+    struct metadc *physDev;
 
     if (!(dc = alloc_dc_ptr( NTGDI_OBJ_METADC ))) return NULL;
 
@@ -267,7 +267,7 @@ static BOOL CDECL MFDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
  */
 static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev )
 {
-    METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
+    struct metadc *physDev = (struct metadc *)dev;
     DWORD index;
 
     HeapFree( GetProcessHeap(), 0, physDev->mh );
@@ -296,13 +296,13 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename )
 {
     HDC ret;
     DC *dc;
-    METAFILEDRV_PDEVICE *physDev;
+    struct metadc *physDev;
     HANDLE hFile;
 
     TRACE("%s\n", debugstr_w(filename) );
 
     if (!(dc = MFDRV_AllocMetaFile())) return 0;
-    physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
+    physDev = (struct metadc *)dc->physDev;
     physDev->mh->mtType = METAFILE_MEMORY;
     physDev->pen   = GetStockObject( BLACK_PEN );
     physDev->brush = GetStockObject( WHITE_BRUSH );
@@ -355,7 +355,7 @@ HDC WINAPI CreateMetaFileA(LPCSTR filename)
 static DC *MFDRV_CloseMetaFile( HDC hdc )
 {
     DC *dc;
-    METAFILEDRV_PDEVICE *physDev;
+    struct metadc *physDev;
     DWORD bytes_written;
 
     TRACE("(%p)\n", hdc );
@@ -372,7 +372,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
         release_dc_ptr( dc );
         return NULL;
     }
-    physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
+    physDev = (struct metadc *)dc->physDev;
 
     /* Construct the end of metafile record - this is documented
      * in SDK Knowledgebase Q99334.
@@ -412,10 +412,10 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
 HMETAFILE WINAPI CloseMetaFile(HDC hdc)
 {
     HMETAFILE hmf;
-    METAFILEDRV_PDEVICE *physDev;
+    struct metadc *physDev;
     DC *dc = MFDRV_CloseMetaFile(hdc);
     if (!dc) return 0;
-    physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
+    physDev = (struct metadc *)dc->physDev;
 
     /* Now allocate a global handle for the metafile */
 
@@ -436,7 +436,7 @@ BOOL MFDRV_WriteRecord( PHYSDEV dev, METARECORD *mr, DWORD rlen)
 {
     DWORD len, size;
     METAHEADER *mh;
-    METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
+    struct metadc *physDev = (struct metadc *)dev;
 
     len = physDev->mh->mtSize * 2 + rlen;
     /* reallocate memory if needed */
@@ -574,16 +574,16 @@ BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2,
     return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
 }
 
-METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc )
+struct metadc *get_metadc_ptr( HDC hdc )
 {
-    METAFILEDRV_PDEVICE *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC );
+    struct metadc *metafile = get_gdi_client_ptr( hdc, NTGDI_OBJ_METADC );
     if (!metafile) SetLastError( ERROR_INVALID_HANDLE );
     return metafile;
 }
 
 BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen )
 {
-    METAFILEDRV_PDEVICE *dev;
+    struct metadc *dev;
 
     if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
     return MFDRV_WriteRecord( &dev->dev, mr, rlen );
@@ -591,7 +591,7 @@ BOOL metadc_record( HDC hdc, METARECORD *mr, DWORD rlen )
 
 BOOL metadc_param1( HDC hdc, short func, short param )
 {
-    METAFILEDRV_PDEVICE *dev;
+    struct metadc *dev;
 
     if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
     return MFDRV_MetaParam1( &dev->dev, func, param );
@@ -599,7 +599,7 @@ BOOL metadc_param1( HDC hdc, short func, short param )
 
 BOOL metadc_param0( HDC hdc, short func )
 {
-    METAFILEDRV_PDEVICE *dev;
+    struct metadc *dev;
 
     if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
     return MFDRV_MetaParam0( &dev->dev, func );
@@ -607,7 +607,7 @@ BOOL metadc_param0( HDC hdc, short func )
 
 BOOL metadc_param2( HDC hdc, short func, short param1, short param2 )
 {
-    METAFILEDRV_PDEVICE *dev;
+    struct metadc *dev;
 
     if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
     return MFDRV_MetaParam2( &dev->dev, func, param1, param2 );
@@ -616,7 +616,7 @@ BOOL metadc_param2( HDC hdc, short func, short param1, short param2 )
 BOOL metadc_param4( HDC hdc, short func, short param1, short param2,
                     short param3, short param4 )
 {
-    METAFILEDRV_PDEVICE *dev;
+    struct metadc *dev;
 
     if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
     return MFDRV_MetaParam4( &dev->dev, func, param1, param2, param3, param4 );
@@ -642,7 +642,7 @@ BOOL metadc_param6( HDC hdc, short func, short param1, short param2,
                     short param3, short param4, short param5,
                     short param6 )
 {
-    METAFILEDRV_PDEVICE *dev;
+    struct metadc *dev;
 
     if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
     return MFDRV_MetaParam6( &dev->dev, func, param1, param2, param3,
@@ -653,7 +653,7 @@ BOOL metadc_param8( HDC hdc, short func, short param1, short param2,
                     short param3, short param4, short param5,
                     short param6, short param7, short param8)
 {
-    METAFILEDRV_PDEVICE *dev;
+    struct metadc *dev;
 
     if (!(dev = get_metadc_ptr( hdc ))) return FALSE;
     return MFDRV_MetaParam8( &dev->dev, func, param1, param2, param3,
diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h
index a8de68f9a50..b986855540e 100644
--- a/dlls/gdi32/mfdrv/metafiledrv.h
+++ b/dlls/gdi32/mfdrv/metafiledrv.h
@@ -31,7 +31,7 @@
 
 /* Metafile driver physical DC */
 
-typedef struct
+struct metadc
 {
     struct gdi_physdev dev;
     METAHEADER  *mh;           /* Pointer to metafile header */
@@ -41,7 +41,7 @@ typedef struct
     HPEN       pen;
     HBRUSH     brush;
     HFONT      font;
-} METAFILEDRV_PDEVICE;
+};
 
 #define HANDLE_LIST_INC 20
 
@@ -62,7 +62,7 @@ extern UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN;
 extern BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index ) DECLSPEC_HIDDEN;
 extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN;
 
-extern METAFILEDRV_PDEVICE *get_metadc_ptr( HDC hdc ) DECLSPEC_HIDDEN;
+extern struct metadc *get_metadc_ptr( HDC hdc ) DECLSPEC_HIDDEN;
 extern BOOL metadc_param0( HDC hdc, short func ) DECLSPEC_HIDDEN;
 extern BOOL metadc_param1( HDC hdc, short func, short param ) DECLSPEC_HIDDEN;
 extern BOOL metadc_param2( HDC hdc, short func, short param1, short param2 ) DECLSPEC_HIDDEN;
diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c
index a933c1814cf..34b58ebfe52 100644
--- a/dlls/gdi32/mfdrv/objects.c
+++ b/dlls/gdi32/mfdrv/objects.c
@@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile);
  */
 UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj )
 {
-    METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
+    struct metadc *physDev = (struct metadc *)dev;
     UINT16 index;
 
     for(index = 0; index < physDev->handles_size; index++)
@@ -63,7 +63,7 @@ UINT MFDRV_AddHandle( PHYSDEV dev, HGDIOBJ obj )
  */
 BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index )
 {
-    METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
+    struct metadc *physDev = (struct metadc *)dev;
     BOOL ret = FALSE;
 
     if (index < physDev->handles_size && physDev->handles[index])
@@ -80,7 +80,7 @@ BOOL MFDRV_RemoveHandle( PHYSDEV dev, UINT index )
  */
 static INT16 MFDRV_FindObject( PHYSDEV dev, HGDIOBJ obj )
 {
-    METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
+    struct metadc *physDev = (struct metadc *)dev;
     INT16 index;
 
     for(index = 0; index < physDev->handles_size; index++)
@@ -97,7 +97,7 @@ static INT16 MFDRV_FindObject( PHYSDEV dev, HGDIOBJ obj )
  */
 void METADC_DeleteObject( HDC hdc, HGDIOBJ obj )
 {
-    METAFILEDRV_PDEVICE *metadc = get_metadc_ptr( hdc );
+    struct metadc *metadc = get_metadc_ptr( hdc );
     METARECORD mr;
     INT16 index;
 
@@ -223,7 +223,7 @@ done:
  */
 static HBRUSH METADC_SelectBrush( HDC hdc, HBRUSH hbrush )
 {
-    METAFILEDRV_PDEVICE *metadc = get_metadc_ptr( hdc );
+    struct metadc *metadc = get_metadc_ptr( hdc );
     INT16 index;
     HBRUSH ret;
 
@@ -284,7 +284,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo
  */
 static HFONT METADC_SelectFont( HDC hdc, HFONT hfont )
 {
-    METAFILEDRV_PDEVICE *metadc = get_metadc_ptr( hdc );
+    struct metadc *metadc = get_metadc_ptr( hdc );
     LOGFONTW font;
     INT16 index;
     HFONT ret;
@@ -327,7 +327,7 @@ static UINT16 MFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen, LOGPEN16 *logpen)
  */
 static HPEN METADC_SelectPen( HDC hdc, HPEN hpen )
 {
-    METAFILEDRV_PDEVICE *metadc = get_metadc_ptr( hdc );
+    struct metadc *metadc = get_metadc_ptr( hdc );
     LOGPEN16 logpen;
     INT16 index;
     HPEN ret;
@@ -417,7 +417,7 @@ BOOL METADC_SelectPalette( HDC hdc, HPALETTE palette )
 {
 #define PALVERSION 0x0300
 
-    METAFILEDRV_PDEVICE *metadc;
+    struct metadc *metadc;
     PLOGPALETTE logPalette;
     WORD        wNumEntries = 0;
     BOOL        ret;