diff --git a/client/X11/xf_disp.c b/client/X11/xf_disp.c
index 835f56e4b..c1b711b2c 100644
--- a/client/X11/xf_disp.c
+++ b/client/X11/xf_disp.c
@@ -146,8 +146,9 @@ static void xf_disp_OnGraphicsReset(rdpContext* context, GraphicsResetEventArgs*
 	}
 }
 
-static void xf_disp_OnTimer(rdpContext* context, TimerEventArgs* e)
+static void xf_disp_OnTimer(void* voidContext, TimerEventArgs* e)
 {
+	rdpContext* context = (rdpContext *)voidContext;
 	xfContext *xfc = (xfContext *)context;
 	xfDispContext *xfDisp = xfc->xfDisp;
 	rdpSettings *settings = context->settings;
diff --git a/libfreerdp/gdi/video.c b/libfreerdp/gdi/video.c
index 7e7929d15..de58b77aa 100644
--- a/libfreerdp/gdi/video.c
+++ b/libfreerdp/gdi/video.c
@@ -140,8 +140,9 @@ void gdi_video_control_uninit(rdpGdi* gdi, VideoClientContext* video)
 	gdi->video = NULL;
 }
 
-static void gdi_video_timer(rdpContext *ctx, TimerEventArgs* timer)
+static void gdi_video_timer(void *voidContext, TimerEventArgs* timer)
 {
+	rdpContext *ctx = (rdpContext *)voidContext;
 	rdpGdi* gdi = ctx->gdi;
 
 	if (gdi && gdi->video)
@@ -150,10 +151,10 @@ static void gdi_video_timer(rdpContext *ctx, TimerEventArgs* timer)
 
 void gdi_video_data_init(rdpGdi* gdi, VideoClientContext* video)
 {
-	PubSub_SubscribeTimer(gdi->context->pubSub, (pTimerEventHandler)gdi_video_timer);
+	PubSub_SubscribeTimer(gdi->context->pubSub, gdi_video_timer);
 }
 
 void gdi_video_data_uninit(rdpGdi* gdi, VideoClientContext* context)
 {
-	PubSub_UnsubscribeTimer(gdi->context->pubSub, (pTimerEventHandler)gdi_video_timer);
+	PubSub_UnsubscribeTimer(gdi->context->pubSub, gdi_video_timer);
 }