diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h
index 4c9bfc047ee..a7717bc60dc 100644
--- a/dlls/gdi/gdi_private.h
+++ b/dlls/gdi/gdi_private.h
@@ -28,6 +28,9 @@
 #define METAFILE_MEMORY 1
 #define METAFILE_DISK   2
 
+/* extra stock object: default 1x1 bitmap for memory DCs */
+#define DEFAULT_BITMAP (STOCK_LAST+1)
+
 struct gdi_obj_funcs
 {
     HGDIOBJ (*pSelectObject)( HGDIOBJ handle, void *obj, HDC hdc );
diff --git a/dlls/x11drv/bitmap.c b/dlls/x11drv/bitmap.c
index 11851508050..9b08e6978f8 100644
--- a/dlls/x11drv/bitmap.c
+++ b/dlls/x11drv/bitmap.c
@@ -34,7 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
   /* GCs used for B&W and color bitmap operations */
 GC BITMAP_monoGC = 0, BITMAP_colorGC = 0;
-Pixmap BITMAP_stock_pixmap;   /* pixmap for the default stock bitmap */
+HBITMAP BITMAP_stock_bitmap = 0;   /* default stock bitmap */
+Pixmap BITMAP_stock_pixmap = 0;    /* pixmap for the default stock bitmap */
 
 /***********************************************************************
  *           X11DRV_BITMAP_Init
@@ -76,7 +77,7 @@ HBITMAP X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
     if(physDev->xrender)
         X11DRV_XRender_UpdateDrawable( physDev );
 
-    if (hbitmap == GetStockObject(DEFAULT_BITMAP))
+    if (hbitmap == BITMAP_stock_bitmap)
         physDev->drawable = BITMAP_stock_pixmap;
     else
         physDev->drawable = (Pixmap)bmp->physBitmap;
@@ -128,7 +129,7 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
         GDI_ReleaseObj( hbitmap );
 	return FALSE;
     }
-    if (hbitmap == GetStockObject(DEFAULT_BITMAP))
+    if (hbitmap == BITMAP_stock_bitmap)
     {
         ERR( "called for stock bitmap, please report\n" );
         GDI_ReleaseObj( hbitmap );
diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c
index 3a56741e7b0..2de187c8b2a 100644
--- a/dlls/x11drv/init.c
+++ b/dlls/x11drv/init.c
@@ -139,6 +139,7 @@ BOOL X11DRV_CreateDC( HDC hdc, X11DRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR de
 
     if (GetObjectType( hdc ) == OBJ_MEMDC)
     {
+        if (!BITMAP_stock_bitmap) BITMAP_stock_bitmap = GetCurrentObject( hdc, OBJ_BITMAP );
         physDev->drawable  = BITMAP_stock_pixmap;
         physDev->depth     = 1;
     }
diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h
index 2183bb95467..b1e8aeb3cda 100644
--- a/dlls/x11drv/x11drv.h
+++ b/dlls/x11drv/x11drv.h
@@ -111,6 +111,7 @@ typedef struct
 
   /* GCs used for B&W and color bitmap operations */
 extern GC BITMAP_monoGC, BITMAP_colorGC;
+extern HBITMAP BITMAP_stock_bitmap;  /* default stock bitmap */
 extern Pixmap BITMAP_stock_pixmap;   /* pixmap for the default stock bitmap */
 
 #define BITMAP_GC(bmp) \
diff --git a/include/gdi.h b/include/gdi.h
index a5e5c7109f7..0faae82a4ed 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -65,9 +65,6 @@ typedef struct tagGDIOBJHDR
     struct hdc_list *hdcs;
 } GDIOBJHDR;
 
-/* extra stock object: default 1x1 bitmap for memory DCs */
-#define DEFAULT_BITMAP (STOCK_LAST+1)
-
 /* bitmap object */
 
 typedef struct tagBITMAPOBJ