diff --git a/desmume/src/common.cpp b/desmume/src/common.cpp
index 66468f685..6ca3eb4ee 100644
--- a/desmume/src/common.cpp
+++ b/desmume/src/common.cpp
@@ -19,6 +19,10 @@
 
 #include "common.h"
 
+#ifndef _MSC_VER
+#include <stdint.h>
+#endif
+
 #include <string.h>
 #include <string>
 #include <stdarg.h>
diff --git a/desmume/src/render3D.cpp b/desmume/src/render3D.cpp
index 0c27e2392..6f571a9da 100644
--- a/desmume/src/render3D.cpp
+++ b/desmume/src/render3D.cpp
@@ -693,7 +693,7 @@ Render3DError Render3D_SSSE3::ClearFramebuffer(const GFX3D_State &renderState)
 					clearDepth_vec128 = _mm_and_si128(clearDepth_vec128, fogBufferBitMask_vec128);
 					clearDepth_vec128 = _mm_srli_epi16(clearDepth_vec128, 15);
 					
-					__m128 clearDepthFogBit_vec128 = _mm_shuffle_epi8(clearDepth_vec128, _mm_set_epi8(15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2, 0));
+					__m128i clearDepthFogBit_vec128 = _mm_shuffle_epi8(clearDepth_vec128, _mm_set_epi8(15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2, 0));
 					
 					clearDepth_vec128 = _mm_load_si128((__m128i *)(clearDepthBuffer + addr));
 					clearDepth_vec128 = _mm_and_si128(clearDepth_vec128, fogBufferBitMask_vec128);