diff --git a/src/video_core/macro.cpp b/src/video_core/macro.cpp
index daa6f6c242..3fe69be4dd 100644
--- a/src/video_core/macro.cpp
+++ b/src/video_core/macro.cpp
@@ -11,25 +11,16 @@
 
 #include <fstream>
 #ifdef ARCHITECTURE_x86_64
-
+// xbyak hates human beings
 #ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wno-conversion"
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wshadow"
 #endif
 #ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wno-conversion"
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wshadow"
 #endif
-
 #include <xbyak/xbyak.h>
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 #endif
 
 #include "common/assert.h"