diff --git a/src/MD5_std.c b/src/MD5_std.c
index c554ca790d..b7781bfb2f 100644
--- a/src/MD5_std.c
+++ b/src/MD5_std.c
@@ -695,38 +695,38 @@ MAYBE_INLINE_BODY void MD5_body(MD5_word x0[15], MD5_word x1[15],
 /* Round 3 */
 	HH (a0, b0, c0, d0, x0[ 5], S31, (u = AC33));	/* 33 */
 	HH (a1, b1, c1, d1, x1[ 5], S31, u);		/* 33 */
-	HH (d0, a0, b0, c0, x0[ 8], S32, (u = AC34));	/* 34 */
-	HH (d1, a1, b1, c1, x1[ 8], S32, u);		/* 34 */
+	HH2 (d0, a0, b0, c0, x0[ 8], S32, (u = AC34));	/* 34 */
+	HH2 (d1, a1, b1, c1, x1[ 8], S32, u);		/* 34 */
 	HH (c0, d0, a0, b0, x0[11], S33, (u = AC35));	/* 35 */
 	HH (c1, d1, a1, b1, x1[11], S33, u);		/* 35 */
-	HH (b0, c0, d0, a0, x0[14], S34, (u = AC36));	/* 36 */
-	HH (b1, c1, d1, a1, x1[14], S34, u);		/* 36 */
+	HH2 (b0, c0, d0, a0, x0[14], S34, (u = AC36));	/* 36 */
+	HH2 (b1, c1, d1, a1, x1[14], S34, u);		/* 36 */
 	HH (a0, b0, c0, d0, x0[ 1], S31, (u = AC37));	/* 37 */
 	HH (a1, b1, c1, d1, x1[ 1], S31, u);		/* 37 */
-	HH (d0, a0, b0, c0, x0[ 4], S32, (u = AC38));	/* 38 */
-	HH (d1, a1, b1, c1, x1[ 4], S32, u);		/* 38 */
+	HH2 (d0, a0, b0, c0, x0[ 4], S32, (u = AC38));	/* 38 */
+	HH2 (d1, a1, b1, c1, x1[ 4], S32, u);		/* 38 */
 	HH (c0, d0, a0, b0, x0[ 7], S33, (u = AC39));	/* 39 */
 	HH (c1, d1, a1, b1, x1[ 7], S33, u);		/* 39 */
-	HH (b0, c0, d0, a0, x0[10], S34, (u = AC40));	/* 40 */
-	HH (b1, c1, d1, a1, x1[10], S34, u);		/* 40 */
+	HH2 (b0, c0, d0, a0, x0[10], S34, (u = AC40));	/* 40 */
+	HH2 (b1, c1, d1, a1, x1[10], S34, u);		/* 40 */
 	HH (a0, b0, c0, d0, x0[13], S31, (u = AC41));	/* 41 */
 	HH (a1, b1, c1, d1, x1[13], S31, u);		/* 41 */
-	HH (d0, a0, b0, c0, x0[ 0], S32, (u = AC42));	/* 42 */
-	HH (d1, a1, b1, c1, x1[ 0], S32, u);		/* 42 */
+	HH2 (d0, a0, b0, c0, x0[ 0], S32, (u = AC42));	/* 42 */
+	HH2 (d1, a1, b1, c1, x1[ 0], S32, u);		/* 42 */
 	HH (c0, d0, a0, b0, x0[ 3], S33, (u = AC43));	/* 43 */
 	HH (c1, d1, a1, b1, x1[ 3], S33, u);		/* 43 */
-	HH (b0, c0, d0, a0, x0[ 6], S34, (u = AC44));	/* 44 */
-	HH (b1, c1, d1, a1, x1[ 6], S34, u);		/* 44 */
+	HH2 (b0, c0, d0, a0, x0[ 6], S34, (u = AC44));	/* 44 */
+	HH2 (b1, c1, d1, a1, x1[ 6], S34, u);		/* 44 */
 	HH (a0, b0, c0, d0, x0[ 9], S31, (u = AC45));	/* 45 */
 	HH (a1, b1, c1, d1, x1[ 9], S31, u);		/* 45 */
-	HH (d0, a0, b0, c0, x0[12], S32, (u = AC46));	/* 46 */
-	HH (d1, a1, b1, c1, x1[12], S32, u);		/* 46 */
+	HH2 (d0, a0, b0, c0, x0[12], S32, (u = AC46));	/* 46 */
+	HH2 (d1, a1, b1, c1, x1[12], S32, u);		/* 46 */
 	c0 += H (d0, a0, b0) + (u = AC47);
 	ROTATE_LEFT (c0, S33); c0 += d0;		/* 47 */
 	c1 += H (d1, a1, b1) + u;
 	ROTATE_LEFT (c1, S33); c1 += d1;		/* 47 */
-	HH (b0, c0, d0, a0, x0[ 2], S34, (u = AC48));	/* 48 */
-	HH (b1, c1, d1, a1, x1[ 2], S34, u);		/* 48 */
+	HH2 (b0, c0, d0, a0, x0[ 2], S34, (u = AC48));	/* 48 */
+	HH2 (b1, c1, d1, a1, x1[ 2], S34, u);		/* 48 */
 
 /* Round 4 */
 	II (a0, b0, c0, d0, x0[ 0], S41, (u = AC49));	/* 49 */