diff --git a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c
index cdedbe42b..6139d961c 100644
--- a/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c
+++ b/client/Android/Studio/freeRDPCore/src/main/cpp/android_freerdp.c
@@ -236,7 +236,7 @@ static void android_Pointer_Free(rdpContext* context, rdpPointer* pointer)
 	WINPR_ASSERT(context);
 }
 
-static BOOL android_Pointer_Set(rdpContext* context, const rdpPointer* pointer)
+static BOOL android_Pointer_Set(rdpContext* context, rdpPointer* pointer)
 {
 	WINPR_ASSERT(context);
 	WINPR_ASSERT(pointer);
diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m
index 473d9f971..0c6534a19 100644
--- a/client/Mac/MRDPView.m
+++ b/client/Mac/MRDPView.m
@@ -52,7 +52,7 @@
 
 static BOOL mf_Pointer_New(rdpContext *context, rdpPointer *pointer);
 static void mf_Pointer_Free(rdpContext *context, rdpPointer *pointer);
-static BOOL mf_Pointer_Set(rdpContext *context, const rdpPointer *pointer);
+static BOOL mf_Pointer_Set(rdpContext *context, rdpPointer *pointer);
 static BOOL mf_Pointer_SetNull(rdpContext *context);
 static BOOL mf_Pointer_SetDefault(rdpContext *context);
 static BOOL mf_Pointer_SetPosition(rdpContext *context, UINT32 x, UINT32 y);
@@ -1195,7 +1195,7 @@ void mf_Pointer_Free(rdpContext *context, rdpPointer *pointer)
 	}
 }
 
-BOOL mf_Pointer_Set(rdpContext *context, const rdpPointer *pointer)
+BOOL mf_Pointer_Set(rdpContext *context, rdpPointer *pointer)
 {
 	mfContext *mfc = (mfContext *)context;
 	MRDPView *view = (MRDPView *)mfc->view;
diff --git a/client/Wayland/wlf_pointer.c b/client/Wayland/wlf_pointer.c
index b0134e1b4..b4f1d44ab 100644
--- a/client/Wayland/wlf_pointer.c
+++ b/client/Wayland/wlf_pointer.c
@@ -66,10 +66,10 @@ static void wlf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
 		_aligned_free(ptr->data);
 }
 
-static BOOL wlf_Pointer_Set(rdpContext* context, const rdpPointer* pointer)
+static BOOL wlf_Pointer_Set(rdpContext* context, rdpPointer* pointer)
 {
 	wlfContext* wlf = (wlfContext*)context;
-	const wlfPointer* ptr = (const wlfPointer*)pointer;
+	wlfPointer* ptr = (wlfPointer*)pointer;
 	void* data;
 	UINT32 w, h, x, y;
 	size_t size;
diff --git a/client/Windows/wf_graphics.c b/client/Windows/wf_graphics.c
index b3ceb0ec4..7e76158b0 100644
--- a/client/Windows/wf_graphics.c
+++ b/client/Windows/wf_graphics.c
@@ -289,7 +289,7 @@ static BOOL wf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
 	return TRUE;
 }
 
-static BOOL wf_Pointer_Set(rdpContext* context, const rdpPointer* pointer)
+static BOOL wf_Pointer_Set(rdpContext* context, rdpPointer* pointer)
 {
 	HCURSOR hCur;
 	wfContext* wfc = (wfContext*)context;
diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c
index d3adc0f2c..608c247d5 100644
--- a/client/X11/xf_graphics.c
+++ b/client/X11/xf_graphics.c
@@ -445,19 +445,13 @@ static void xf_Pointer_Free(rdpContext* context, rdpPointer* pointer)
 #endif
 }
 
-static BOOL xf_Pointer_Set(rdpContext* context, const rdpPointer* pointer)
+static BOOL xf_Pointer_Set(rdpContext* context, rdpPointer* pointer)
 {
 #ifdef WITH_XCURSOR
-	union
-	{
-		const rdpPointer* cpv;
-		rdpPointer* pv;
-	} cnv;
 	xfContext* xfc = (xfContext*)context;
 	Window handle = xf_Pointer_get_window(xfc);
 
-	cnv.cpv = pointer;
-	xfc->pointer = cnv.pv;
+	xfc->pointer = pointer;
 
 	/* in RemoteApp mode, window can be null if none has had focus */
 
diff --git a/client/iOS/FreeRDP/ios_freerdp.m b/client/iOS/FreeRDP/ios_freerdp.m
index c68ada068..da01a1d2a 100644
--- a/client/iOS/FreeRDP/ios_freerdp.m
+++ b/client/iOS/FreeRDP/ios_freerdp.m
@@ -147,7 +147,7 @@ static void ios_Pointer_Free(rdpContext *context, rdpPointer *pointer)
 		return;
 }
 
-static BOOL ios_Pointer_Set(rdpContext *context, const rdpPointer *pointer)
+static BOOL ios_Pointer_Set(rdpContext *context, rdpPointer *pointer)
 {
 	if (!context)
 		return FALSE;
diff --git a/include/freerdp/graphics.h b/include/freerdp/graphics.h
index f788308da..8883cc00d 100644
--- a/include/freerdp/graphics.h
+++ b/include/freerdp/graphics.h
@@ -81,7 +81,7 @@ extern "C"
 
 	typedef BOOL (*pPointer_New)(rdpContext* context, rdpPointer* pointer);
 	typedef void (*pPointer_Free)(rdpContext* context, rdpPointer* pointer);
-	typedef BOOL (*pPointer_Set)(rdpContext* context, const rdpPointer* pointer);
+	typedef BOOL (*pPointer_Set)(rdpContext* context, rdpPointer* pointer);
 	typedef BOOL (*pPointer_SetNull)(rdpContext* context);
 	typedef BOOL (*pPointer_SetDefault)(rdpContext* context);
 	typedef BOOL (*pPointer_SetPosition)(rdpContext* context, UINT32 x, UINT32 y);