diff --git a/Source/Core/VideoCommon/Src/CPMemory.cpp b/Source/Core/VideoCommon/Src/CPMemory.cpp
index a51c2d1454..84d0d2d556 100644
--- a/Source/Core/VideoCommon/Src/CPMemory.cpp
+++ b/Source/Core/VideoCommon/Src/CPMemory.cpp
@@ -19,9 +19,10 @@
 #include "CPMemory.h"
 
 // CP state
+u8 *cached_arraybases[16];
+
 // STATE_TO_SAVE
 u32 arraybases[16];
-u8 *cached_arraybases[16];
 u32 arraystrides[16];
 TMatrixIndexA MatrixIndexA;
 TMatrixIndexB MatrixIndexB;
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp
index e161cf5b08..6cb4e42237 100644
--- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp
@@ -468,10 +468,8 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
 
 void TexDecoder_SetTexFmtOverlayOptions(bool enable, bool center)
 {
-#ifdef OVERLAY_TEXFMT
 	TexFmt_Overlay_Enable = enable;
 	TexFmt_Overlay_Center = center;
-#endif
 }
 
 PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt)