diff --git a/FFmpegSource2/MatroskaParser.h b/FFmpegSource2/MatroskaParser.h
index 53dc49918..66647e1df 100644
--- a/FFmpegSource2/MatroskaParser.h
+++ b/FFmpegSource2/MatroskaParser.h
@@ -41,6 +41,8 @@
  * system
  */
 
+#include <stdint.h>
+
 #ifdef MPDLLBUILD
 #define	X __declspec(dllexport)
 #else
diff --git a/FFmpegSource2/utils.cpp b/FFmpegSource2/utils.cpp
index 9f6f94592..8ca3d07ff 100644
--- a/FFmpegSource2/utils.cpp
+++ b/FFmpegSource2/utils.cpp
@@ -21,7 +21,12 @@
 #include "utils.h"
 #include <string.h>
 #include <errno.h>
-#include <intrin.h>
+
+#ifdef _MSC_VER
+#	include <intrin.h>
+#else
+#	include <xmmintrin.h>
+#endif
 
 int GetCPUFlags() {
 	int CPUInfo[4];