diff --git a/libfreerdp/primitives/prim_alphaComp_opt.c b/libfreerdp/primitives/prim_alphaComp_opt.c
index 94daf27a1..5e1ca0ede 100644
--- a/libfreerdp/primitives/prim_alphaComp_opt.c
+++ b/libfreerdp/primitives/prim_alphaComp_opt.c
@@ -54,7 +54,8 @@ pstatus_t sse2_alphaComp_argb(
 	const UINT32* sptr1 = (const UINT32*) pSrc1;
 	const UINT32* sptr2 = (const UINT32*) pSrc2;
 	UINT32* dptr;
-	int linebytes, src1Jump, src2Jump, dstJump, y;
+	int linebytes, src1Jump, src2Jump, dstJump;
+	UINT32 y;
 	__m128i xmm0, xmm1;
 
 	if ((width <= 0) || (height <= 0)) return PRIMITIVES_SUCCESS;
diff --git a/libfreerdp/primitives/prim_colors_opt.c b/libfreerdp/primitives/prim_colors_opt.c
index a4f7240d2..c1d9fc2e2 100644
--- a/libfreerdp/primitives/prim_colors_opt.c
+++ b/libfreerdp/primitives/prim_colors_opt.c
@@ -77,7 +77,8 @@ static pstatus_t sse2_yCbCrToRGB_16s16s_P3P3(
 {
 	__m128i zero, max, r_cr, g_cb, g_cr, b_cb, c4096;
 	__m128i* y_buf, *cb_buf, *cr_buf, *r_buf, *g_buf, *b_buf;
-	int srcbump, dstbump, yp, imax;
+	UINT32 yp;
+	int srcbump, dstbump, imax;
 
 	if (((ULONG_PTR)(pSrc[0]) & 0x0f)
 	    || ((ULONG_PTR)(pSrc[1]) & 0x0f)
@@ -221,7 +222,7 @@ static pstatus_t sse2_yCbCrToRGB_16s8u_P3AC4R_BGRX(
 	const UINT32 step = sizeof(__m128i) / sizeof(INT16);
 	const UINT32 imax = (roi->width - pad) * sizeof(INT16) / sizeof(__m128i);
 	BYTE* d_buf = pDst;
-	int yp;
+	UINT32 yp;
 	const size_t dstPad = (dstStep - roi->width * 4);
 #ifdef DO_PREFETCH
 
@@ -410,7 +411,7 @@ static pstatus_t sse2_yCbCrToRGB_16s8u_P3AC4R_RGBX(
 	const UINT32 step = sizeof(__m128i) / sizeof(INT16);
 	const UINT32 imax = (roi->width - pad) * sizeof(INT16) / sizeof(__m128i);
 	BYTE* d_buf = pDst;
-	int yp;
+	UINT32 yp;
 	const size_t dstPad = (dstStep - roi->width * 4);
 #ifdef DO_PREFETCH
 
@@ -622,7 +623,8 @@ static pstatus_t sse2_RGBToYCbCr_16s16s_P3P3(
 {
 	__m128i min, max, y_r, y_g, y_b, cb_r, cb_g, cb_b, cr_r, cr_g, cr_b;
 	__m128i* r_buf, *g_buf, *b_buf, *y_buf, *cb_buf, *cr_buf;
-	int srcbump, dstbump, yp, imax;
+	UINT32 yp;
+	int srcbump, dstbump, imax;
 
 	if (((ULONG_PTR)(pSrc[0]) & 0x0f)
 	    || ((ULONG_PTR)(pSrc[1]) & 0x0f)
diff --git a/libfreerdp/primitives/test/TestPrimitivesColors.c b/libfreerdp/primitives/test/TestPrimitivesColors.c
index 94efee8fb..269c86ca0 100644
--- a/libfreerdp/primitives/test/TestPrimitivesColors.c
+++ b/libfreerdp/primitives/test/TestPrimitivesColors.c
@@ -29,7 +29,7 @@ static BOOL test_RGBToRGB_16s8u_P3AC4R_func(prim_size_t roi, DWORD DstFormat)
 	INT16* b;
 	BYTE* out1;
 	BYTE* out2;
-	int i;
+	UINT64 i;
 	BOOL failed = FALSE;
 	const INT16* ptrs[3];
 	const UINT32 rgbStride = roi.width * 2;