diff --git a/include/wingdi.h b/include/wingdi.h
index 844b10dfdcd..4a234c74573 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -2348,8 +2348,8 @@ INT32       WINAPI GetDeviceCaps32(HDC32,INT32);
 UINT16      WINAPI GetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
 UINT32      WINAPI GetDIBColorTable32(HDC32,UINT32,UINT32,RGBQUAD*);
 #define     GetDIBColorTable WINELIB_NAME(GetDIBColorTable)
-INT16       WINAPI GetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPSTR,LPBITMAPINFO,UINT16);
-INT32       WINAPI GetDIBits32(HDC32,HBITMAP32,UINT32,UINT32,LPSTR,LPBITMAPINFO,UINT32);
+INT16       WINAPI GetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPVOID,LPBITMAPINFO,UINT16);
+INT32       WINAPI GetDIBits32(HDC32,HBITMAP32,UINT32,UINT32,LPVOID,LPBITMAPINFO,UINT32);
 #define     GetDIBits WINELIB_NAME(GetDIBits)
 DWORD       WINAPI GetFontData32(HDC32,DWORD,DWORD,LPVOID,DWORD);
 #define     GetFontData WINELIB_NAME(GetFontData)
diff --git a/objects/dib.c b/objects/dib.c
index 62cd98c2482..a62f2bdd3bc 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -418,7 +418,7 @@ UINT32 WINAPI GetDIBColorTable32( HDC32 hdc, UINT32 startpos, UINT32 entries,
  *           GetDIBits16    (GDI.441)
  */
 INT16 WINAPI GetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
-                          UINT16 lines, LPSTR bits, BITMAPINFO * info,
+                          UINT16 lines, LPVOID bits, BITMAPINFO * info,
                           UINT16 coloruse )
 {
     return GetDIBits32( hdc, hbitmap, startscan, lines, bits, info, coloruse );
@@ -439,7 +439,7 @@ INT32 WINAPI GetDIBits32(
     HBITMAP32 hbitmap, /* [in]  Handle to bitmap */
     UINT32 startscan,  /* [in]  First scan line to set in dest bitmap */
     UINT32 lines,      /* [in]  Number of scan lines to copy */
-    LPSTR bits,        /* [out] Address of array for bitmap bits */
+    LPVOID bits,       /* [out] Address of array for bitmap bits */
     BITMAPINFO * info, /* [out] Address of structure with bitmap data */
     UINT32 coloruse)   /* [in]  RGB or palette index */
 {
@@ -488,7 +488,7 @@ INT32 WINAPI GetDIBits32(
 
     if (bits)
     {	
-	BYTE*	bbits = bits;
+	BYTE*	bbits = (BYTE*)bits;
 	int	pad, yend, xend = bmp->bitmap.bmWidth;
 
         TRACE(bitmap, "%u scanlines of (%i,%i) -> (%i,%i) starting from %u\n",