4 files changed, 3 insertions, 25 deletions

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 4bbcc3571..daec8f0ff 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -38,9 +38,8 @@ template<> struct CompileTimeAssert<true> {};
 // helper macro to properly align structure members.
 // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121",
 // depending on the current source line to make sure variable names are unique.
-#define INSERT_PADDING_BYTES_HELPER1(x, y) x ## y
-#define INSERT_PADDING_BYTES_HELPER2(x, y) INSERT_PADDING_BYTES_HELPER1(x, y)
-#define INSERT_PADDING_BYTES(num_words) u8 INSERT_PADDING_BYTES_HELPER2(pad, __LINE__)[(num_words)]
+#define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)]
+#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)]
 
 #ifndef _MSC_VER
 
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index fe2c9e636..50c7cb5f9 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <algorithm>
 
 #include "common/hash.h"
 #if _M_SSE >= 0x402
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index df9aa0d71..75f524465 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -34,13 +34,6 @@ namespace GPU {
 // MMIO region 0x1EFxxxxx
 struct Regs {
 
-// helper macro to properly align structure members.
-// Calling INSERT_PADDING_WORDS will add a new member variable with a name like "pad121",
-// depending on the current source line to make sure variable names are unique.
-#define INSERT_PADDING_WORDS_HELPER1(x, y) x ## y
-#define INSERT_PADDING_WORDS_HELPER2(x, y) INSERT_PADDING_WORDS_HELPER1(x, y)
-#define INSERT_PADDING_WORDS(num_words) u32 INSERT_PADDING_WORDS_HELPER2(pad, __LINE__)[(num_words)]
-
 // helper macro to make sure the defined structures are of the expected size.
 #if defined(_MSC_VER)
 // TODO: MSVC does not support using sizeof() on non-static data members even though this
@@ -238,10 +231,6 @@ struct Regs {
 
     INSERT_PADDING_WORDS(0x9c3);
 
-#undef INSERT_PADDING_WORDS_HELPER1
-#undef INSERT_PADDING_WORDS_HELPER2
-#undef INSERT_PADDING_WORDS
-
     static inline size_t NumIds() {
         return sizeof(Regs) / sizeof(u32);
     }
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index e4a5ef78e..d03b811d3 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -39,13 +39,6 @@ namespace Pica {
 
 struct Regs {
 
-// helper macro to properly align structure members.
-// Calling INSERT_PADDING_WORDS will add a new member variable with a name like "pad121",
-// depending on the current source line to make sure variable names are unique.
-#define INSERT_PADDING_WORDS_HELPER1(x, y) x ## y
-#define INSERT_PADDING_WORDS_HELPER2(x, y) INSERT_PADDING_WORDS_HELPER1(x, y)
-#define INSERT_PADDING_WORDS(num_words) u32 INSERT_PADDING_WORDS_HELPER2(pad, __LINE__)[(num_words)];
-
     INSERT_PADDING_WORDS(0x10);
 
     u32 trigger_irq;
@@ -709,10 +702,6 @@ struct Regs {
 
     INSERT_PADDING_WORDS(0x22);
 
-#undef INSERT_PADDING_WORDS_HELPER1
-#undef INSERT_PADDING_WORDS_HELPER2
-#undef INSERT_PADDING_WORDS
-
     // Map register indices to names readable by humans
     // Used for debugging purposes, so performance is not an issue here
     static std::string GetCommandName(int index) {