diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c
index 8e4aadafa9e..a18ddaf194c 100644
--- a/dlls/gdi/enhmetafile.c
+++ b/dlls/gdi/enhmetafile.c
@@ -229,7 +229,7 @@ static inline BOOL is_dib_monochrome( const BITMAPINFO* info )
     }
     else  /* assume BITMAPINFOHEADER */
     {
-        RGBQUAD *rgb = info->bmiColors;
+        const RGBQUAD *rgb = info->bmiColors;
 
         /* Check if the first color is black */
         if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) &&
@@ -1162,28 +1162,28 @@ BOOL WINAPI PlayEnhMetaFileRecord(
     case EMR_POLYBEZIER:
       {
         PEMRPOLYBEZIER lpPolyBez = (PEMRPOLYBEZIER)mr;
-        PolyBezier(hdc, (const LPPOINT)lpPolyBez->aptl, (UINT)lpPolyBez->cptl);
+        PolyBezier(hdc, (const POINT*)lpPolyBez->aptl, (UINT)lpPolyBez->cptl);
         break;
       }
 
     case EMR_POLYGON:
       {
         PEMRPOLYGON lpPoly = (PEMRPOLYGON)mr;
-        Polygon( hdc, (const LPPOINT)lpPoly->aptl, (UINT)lpPoly->cptl );
+        Polygon( hdc, (const POINT*)lpPoly->aptl, (UINT)lpPoly->cptl );
         break;
       }
 
     case EMR_POLYLINE:
       {
         PEMRPOLYLINE lpPolyLine = (PEMRPOLYLINE)mr;
-        Polyline(hdc, (const LPPOINT)lpPolyLine->aptl, (UINT)lpPolyLine->cptl);
+        Polyline(hdc, (const POINT*)lpPolyLine->aptl, (UINT)lpPolyLine->cptl);
         break;
       }
 
     case EMR_POLYBEZIERTO:
       {
         PEMRPOLYBEZIERTO lpPolyBezierTo = (PEMRPOLYBEZIERTO)mr;
-        PolyBezierTo( hdc, (const LPPOINT)lpPolyBezierTo->aptl,
+        PolyBezierTo( hdc, (const POINT*)lpPolyBezierTo->aptl,
 		      (UINT)lpPolyBezierTo->cptl );
         break;
       }
@@ -1191,7 +1191,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
     case EMR_POLYLINETO:
       {
         PEMRPOLYLINETO lpPolyLineTo = (PEMRPOLYLINETO)mr;
-        PolylineTo( hdc, (const LPPOINT)lpPolyLineTo->aptl,
+        PolylineTo( hdc, (const POINT*)lpPolyLineTo->aptl,
 		    (UINT)lpPolyLineTo->cptl );
         break;
       }
@@ -1478,7 +1478,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
       {
         PEMRPOLYDRAW lpPolyDraw = (PEMRPOLYDRAW)mr;
         PolyDraw( hdc,
-                  (const LPPOINT)lpPolyDraw->aptl,
+                  (const POINT*)lpPolyDraw->aptl,
                   lpPolyDraw->abTypes,
                   (INT)lpPolyDraw->cptl );
 
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 2cdcdf0dbfb..a5e657f2abf 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -1121,7 +1121,7 @@ void* MSVCRT___RTDynamicCast(void *cppobj, int unknown,
         int i;
         const rtti_object_locator *obj_locator = get_obj_locator( cppobj );
         const rtti_object_hierarchy *obj_bases = obj_locator->type_hierarchy;
-        const rtti_base_descriptor **base_desc = obj_bases->base_classes->bases;
+        const rtti_base_descriptor * const* base_desc = obj_bases->base_classes->bases;
 
         if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator);
 
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 1aaedb4704f..d97522a5cf2 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -154,7 +154,7 @@ static inline DWORD SAFEARRAY_GetHiddenDWORD(SAFEARRAY* psa)
 /* Get the number of cells in a SafeArray */
 static ULONG SAFEARRAY_GetCellCount(const SAFEARRAY *psa)
 {
-  SAFEARRAYBOUND* psab = psa->rgsabound;
+  const SAFEARRAYBOUND* psab = psa->rgsabound;
   USHORT cCount = psa->cDims;
   ULONG ulNumCells = 1;