diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h
index 9120fd1df..2fd9de22d 100644
--- a/client/X11/xf_window.h
+++ b/client/X11/xf_window.h
@@ -102,22 +102,22 @@ struct xf_app_window
 	UINT32 dwExStyle;
 	UINT32 showState;
 
-	UINT32 clientOffsetX;
-	UINT32 clientOffsetY;
+	INT32 clientOffsetX;
+	INT32 clientOffsetY;
 	UINT32 clientAreaWidth;
 	UINT32 clientAreaHeight;
 
-	UINT32 windowOffsetX;
-	UINT32 windowOffsetY;
-	UINT32 windowClientDeltaX;
-	UINT32 windowClientDeltaY;
+	INT32 windowOffsetX;
+	INT32 windowOffsetY;
+	INT32 windowClientDeltaX;
+	INT32 windowClientDeltaY;
 	UINT32 windowWidth;
 	UINT32 windowHeight;
 	UINT32 numWindowRects;
 	RECTANGLE_16* windowRects;
 
-	UINT32 visibleOffsetX;
-	UINT32 visibleOffsetY;
+	INT32 visibleOffsetX;
+	INT32 visibleOffsetY;
 	UINT32 numVisibilityRects;
 	RECTANGLE_16* visibilityRects;
 
diff --git a/include/freerdp/window.h b/include/freerdp/window.h
index c52c35c72..4a5b2b84f 100644
--- a/include/freerdp/window.h
+++ b/include/freerdp/window.h
@@ -174,22 +174,22 @@ struct _WINDOW_STATE_ORDER
 	UINT32 extendedStyle;
 	UINT32 showState;
 	RAIL_UNICODE_STRING titleInfo;
-	UINT32 clientOffsetX;
-	UINT32 clientOffsetY;
+	INT32 clientOffsetX;
+	INT32 clientOffsetY;
 	UINT32 clientAreaWidth;
 	UINT32 clientAreaHeight;
 	UINT32 RPContent;
 	UINT32 rootParentHandle;
-	UINT32 windowOffsetX;
-	UINT32 windowOffsetY;
-	UINT32 windowClientDeltaX;
-	UINT32 windowClientDeltaY;
+	INT32 windowOffsetX;
+	INT32 windowOffsetY;
+	INT32 windowClientDeltaX;
+	INT32 windowClientDeltaY;
 	UINT32 windowWidth;
 	UINT32 windowHeight;
 	UINT32 numWindowRects;
 	RECTANGLE_16* windowRects;
-	UINT32 visibleOffsetX;
-	UINT32 visibleOffsetY;
+	INT32 visibleOffsetX;
+	INT32 visibleOffsetY;
 	UINT32 numVisibilityRects;
 	RECTANGLE_16* visibilityRects;
 };