diff --git a/include/freerdp/client/rdpgfx.h b/include/freerdp/client/rdpgfx.h
index d1c69b112..b7f391053 100644
--- a/include/freerdp/client/rdpgfx.h
+++ b/include/freerdp/client/rdpgfx.h
@@ -30,46 +30,51 @@
 
 typedef struct _rdpgfx_client_context RdpgfxClientContext;
 
-typedef UINT (*pcRdpgfxResetGraphics)(RdpgfxClientContext* context,
-				      const RDPGFX_RESET_GRAPHICS_PDU* resetGraphics);
-typedef UINT (*pcRdpgfxStartFrame)(RdpgfxClientContext* context,
-				   const RDPGFX_START_FRAME_PDU* startFrame);
-typedef UINT (*pcRdpgfxEndFrame)(RdpgfxClientContext* context,
-				 const RDPGFX_END_FRAME_PDU* endFrame);
-typedef UINT (*pcRdpgfxSurfaceCommand)(RdpgfxClientContext* context,
-				       const RDPGFX_SURFACE_COMMAND* cmd);
-typedef UINT (*pcRdpgfxDeleteEncodingContext)(RdpgfxClientContext* context,
-					      const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext);
-typedef UINT (*pcRdpgfxCreateSurface)(RdpgfxClientContext* context,
-				      const RDPGFX_CREATE_SURFACE_PDU* createSurface);
-typedef UINT (*pcRdpgfxDeleteSurface)(RdpgfxClientContext* context,
-				      const RDPGFX_DELETE_SURFACE_PDU* deleteSurface);
-typedef UINT (*pcRdpgfxSolidFill)(RdpgfxClientContext* context,
-				  const RDPGFX_SOLID_FILL_PDU* solidFill);
-typedef UINT (*pcRdpgfxSurfaceToSurface)(RdpgfxClientContext* context,
-					 const RDPGFX_SURFACE_TO_SURFACE_PDU* surfaceToSurface);
-typedef UINT (*pcRdpgfxSurfaceToCache)(RdpgfxClientContext* context,
-				       const RDPGFX_SURFACE_TO_CACHE_PDU* surfaceToCache);
-typedef UINT (*pcRdpgfxCacheToSurface)(RdpgfxClientContext* context,
-				       const RDPGFX_CACHE_TO_SURFACE_PDU* cacheToSurface);
-typedef UINT (*pcRdpgfxCacheImportOffer)(RdpgfxClientContext* context,
-					 const RDPGFX_CACHE_IMPORT_OFFER_PDU* cacheImportOffer);
-typedef UINT (*pcRdpgfxCacheImportReply)(RdpgfxClientContext* context,
-					 const RDPGFX_CACHE_IMPORT_REPLY_PDU* cacheImportReply);
-typedef UINT (*pcRdpgfxEvictCacheEntry)(RdpgfxClientContext* context,
-					const RDPGFX_EVICT_CACHE_ENTRY_PDU* evictCacheEntry);
-typedef UINT (*pcRdpgfxMapSurfaceToOutput)(RdpgfxClientContext* context,
-					   const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput);
-typedef UINT (*pcRdpgfxMapSurfaceToWindow)(RdpgfxClientContext* context,
-					   const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow);
+typedef UINT(*pcRdpgfxResetGraphics)(RdpgfxClientContext* context,
+                                     const RDPGFX_RESET_GRAPHICS_PDU* resetGraphics);
+typedef UINT(*pcRdpgfxStartFrame)(RdpgfxClientContext* context,
+                                  const RDPGFX_START_FRAME_PDU* startFrame);
+typedef UINT(*pcRdpgfxEndFrame)(RdpgfxClientContext* context,
+                                const RDPGFX_END_FRAME_PDU* endFrame);
+typedef UINT(*pcRdpgfxSurfaceCommand)(RdpgfxClientContext* context,
+                                      const RDPGFX_SURFACE_COMMAND* cmd);
+typedef UINT(*pcRdpgfxDeleteEncodingContext)(RdpgfxClientContext* context,
+        const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext);
+typedef UINT(*pcRdpgfxCreateSurface)(RdpgfxClientContext* context,
+                                     const RDPGFX_CREATE_SURFACE_PDU* createSurface);
+typedef UINT(*pcRdpgfxDeleteSurface)(RdpgfxClientContext* context,
+                                     const RDPGFX_DELETE_SURFACE_PDU* deleteSurface);
+typedef UINT(*pcRdpgfxSolidFill)(RdpgfxClientContext* context,
+                                 const RDPGFX_SOLID_FILL_PDU* solidFill);
+typedef UINT(*pcRdpgfxSurfaceToSurface)(RdpgfxClientContext* context,
+                                        const RDPGFX_SURFACE_TO_SURFACE_PDU* surfaceToSurface);
+typedef UINT(*pcRdpgfxSurfaceToCache)(RdpgfxClientContext* context,
+                                      const RDPGFX_SURFACE_TO_CACHE_PDU* surfaceToCache);
+typedef UINT(*pcRdpgfxCacheToSurface)(RdpgfxClientContext* context,
+                                      const RDPGFX_CACHE_TO_SURFACE_PDU* cacheToSurface);
+typedef UINT(*pcRdpgfxCacheImportOffer)(RdpgfxClientContext* context,
+                                        const RDPGFX_CACHE_IMPORT_OFFER_PDU* cacheImportOffer);
+typedef UINT(*pcRdpgfxCacheImportReply)(RdpgfxClientContext* context,
+                                        const RDPGFX_CACHE_IMPORT_REPLY_PDU* cacheImportReply);
+typedef UINT(*pcRdpgfxEvictCacheEntry)(RdpgfxClientContext* context,
+                                       const RDPGFX_EVICT_CACHE_ENTRY_PDU* evictCacheEntry);
+typedef UINT(*pcRdpgfxMapSurfaceToOutput)(RdpgfxClientContext* context,
+        const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput);
+typedef UINT(*pcRdpgfxMapSurfaceToWindow)(RdpgfxClientContext* context,
+        const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow);
 
-typedef UINT (*pcRdpgfxSetSurfaceData)(RdpgfxClientContext* context, UINT16 surfaceId, void* pData);
-typedef void* (*pcRdpgfxGetSurfaceData)(RdpgfxClientContext* context, UINT16 surfaceId);
-typedef UINT (*pcRdpgfxGetSurfaceIds)(RdpgfxClientContext* context, UINT16** ppSurfaceIds, UINT16* count);
-typedef UINT (*pcRdpgfxSetCacheSlotData)(RdpgfxClientContext* context, UINT16 cacheSlot, void* pData);
-typedef void* (*pcRdpgfxGetCacheSlotData)(RdpgfxClientContext* context, UINT16 cacheSlot);
+typedef UINT(*pcRdpgfxSetSurfaceData)(RdpgfxClientContext* context,
+                                      UINT16 surfaceId, void* pData);
+typedef void* (*pcRdpgfxGetSurfaceData)(RdpgfxClientContext* context,
+                                        UINT16 surfaceId);
+typedef UINT(*pcRdpgfxGetSurfaceIds)(RdpgfxClientContext* context,
+                                     UINT16** ppSurfaceIds, UINT16* count);
+typedef UINT(*pcRdpgfxSetCacheSlotData)(RdpgfxClientContext* context,
+                                        UINT16 cacheSlot, void* pData);
+typedef void* (*pcRdpgfxGetCacheSlotData)(RdpgfxClientContext* context,
+        UINT16 cacheSlot);
 
-typedef UINT (*pcRdpgfxUpdateSurfaces)(RdpgfxClientContext* context);
+typedef UINT(*pcRdpgfxUpdateSurfaces)(RdpgfxClientContext* context);
 
 struct _rdpgfx_client_context
 {