diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 7194331..a6ccb20 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -25,7 +25,7 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }}
+          key: ${{ matrix.os }}-z64re-ccache-${{ matrix.type }}-${{ matrix.arch }}
       - name: Install Linux Dependencies
         if: runner.os == 'Linux'
         run: |
@@ -56,7 +56,7 @@ jobs:
         run: |
           git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
           cd N64RecompSource
-          git checkout 8dfed04919b7bfdd0fd34ff049eed7020dea0d71
+          git checkout 2a2df89349ff25a3afb3a09617deb3a166efe2f3
           git submodule update --init --recursive
           
           # enable ccache
@@ -130,7 +130,7 @@ jobs:
         run: |
           git clone https://github.com/Mr-Wiseguy/N64Recomp.git --recurse-submodules N64RecompSource
           cd N64RecompSource
-          git checkout 8dfed04919b7bfdd0fd34ff049eed7020dea0d71
+          git checkout 2a2df89349ff25a3afb3a09617deb3a166efe2f3
           git submodule update --init --recursive
 
           # enable ccache
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e281c1..1f470e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@ add_library(RecompiledFuncs STATIC)
 target_compile_options(RecompiledFuncs PRIVATE
     # -Wno-unused-but-set-variable
     -fno-strict-aliasing
+    -Wno-unused-variable
     -Wno-implicit-function-declaration
 )
 
@@ -61,6 +62,8 @@ add_library(PatchesLib STATIC)
 target_compile_options(PatchesLib PRIVATE
     # -Wno-unused-but-set-variable
     -fno-strict-aliasing
+    -Wno-unused-variable
+    -Wno-implicit-function-declaration
 )
 
 target_include_directories(PatchesLib PRIVATE
diff --git a/include/disable_warnings.h b/include/disable_warnings.h
deleted file mode 100644
index ff36f12..0000000
--- a/include/disable_warnings.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Wunused-variable"
-#pragma clang diagnostic ignored "-Wimplicit-function-declaration"
-#endif