diff --git a/avx2_double.hh b/avx2_double.hh
index cd01530..82a82bc 100644
--- a/avx2_double.hh
+++ b/avx2_double.hh
@@ -1338,8 +1338,8 @@ inline SIMD<float, 16> vshuf(SIMD<float, 16> a, SIMD<uint32_t, 16> b)
 	SIMD<float, 16> tmp;
 	for (int i = 0; i < 2; ++i)
 		tmp.m[i] = _mm256_or_ps(
-			_mm256_and_ps(_mm256_permutevar8x32_ps(a.m[0], b.m[i]), _mm256_cmpgt_epi32(_mm256_set1_epi32(8), b.m[i])),
-			_mm256_and_ps(_mm256_permutevar8x32_ps(a.m[1], _mm256_sub_epi32(b.m[i], _mm256_set1_epi32(8))), _mm256_cmpgt_epi32(b.m[i], _mm256_set1_epi32(7))));
+			_mm256_and_ps(_mm256_permutevar8x32_ps(a.m[0], b.m[i]), (__m256)_mm256_cmpgt_epi32(_mm256_set1_epi32(8), b.m[i])),
+			_mm256_and_ps(_mm256_permutevar8x32_ps(a.m[1], _mm256_sub_epi32(b.m[i], _mm256_set1_epi32(8))), (__m256)_mm256_cmpgt_epi32(b.m[i], _mm256_set1_epi32(7))));
 	return tmp;
 }
 
diff --git a/tests/bch_encoder_test.cc b/tests/bch_encoder_test.cc
index 13136c8..bfd3cf1 100644
--- a/tests/bch_encoder_test.cc
+++ b/tests/bch_encoder_test.cc
@@ -4,6 +4,7 @@ Test for the Bose Chaudhuri Hocquenghem Encoder
 Copyright 2018 Ahmet Inan <inan@aicodix.de>
 */
 
+#include <cstdint>
 #include <cassert>
 #include <iostream>
 #include "bitman.hh"
diff --git a/tests/crc_test.cc b/tests/crc_test.cc
index ec88d1c..a7a5166 100644
--- a/tests/crc_test.cc
+++ b/tests/crc_test.cc
@@ -4,6 +4,7 @@ Test for the Cyclic redundancy check
 Copyright 2018 Ahmet Inan <inan@aicodix.de>
 */
 
+#include <cstdint>
 #include <cassert>
 #include <iostream>
 #include <bitset>
diff --git a/tests/gf_test.cc b/tests/gf_test.cc
index 4c9c214..091d683 100644
--- a/tests/gf_test.cc
+++ b/tests/gf_test.cc
@@ -4,6 +4,7 @@ Test for the Galois field arithmetic
 Copyright 2018 Ahmet Inan <inan@aicodix.de>
 */
 
+#include <cstdint>
 #include <cassert>
 #include <iostream>
 #include "galois_field.hh"
diff --git a/tests/rs_encoder_test.cc b/tests/rs_encoder_test.cc
index 16f3bd5..88497cc 100644
--- a/tests/rs_encoder_test.cc
+++ b/tests/rs_encoder_test.cc
@@ -4,6 +4,7 @@ Test for the Reed Solomon Encoder
 Copyright 2018 Ahmet Inan <inan@aicodix.de>
 */
 
+#include <cstdint>
 #include <cassert>
 #include <iostream>
 #include "galois_field.hh"