diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 6f113c3..871db95 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -53,7 +53,6 @@ private:
 #ifdef __APPLE__
 // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
 // This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
-#if defined __i386__ && defined __GNUC__
 #undef STACKALIGN
 #define STACKALIGN __attribute__((__force_align_arg_pointer__))
 #endif
diff --git a/Source/Core/Common/Src/CommonTypes.h b/Source/Core/Common/Src/CommonTypes.h
index 3eb131c..a8dd206 100644
--- a/Source/Core/Common/Src/CommonTypes.h
+++ b/Source/Core/Common/Src/CommonTypes.h
@@ -10,6 +10,7 @@
 #ifndef _COMMONTYPES_H_
 #define _COMMONTYPES_H_
 
+#include <cinttypes>
 #include <cstdint>
 #include <cstddef>