diff --git a/Common/ColorConv.cpp b/Common/ColorConv.cpp
index 84fdb27f3e..e602745c26 100644
--- a/Common/ColorConv.cpp
+++ b/Common/ColorConv.cpp
@@ -137,7 +137,7 @@ void convert5551_dx9(u16* data, u32* out, int width, int l, int u) {
 
 
 
-void ConvertBGRA8888ToRGBA8888(u32 *dst, const u32 *src, const u32 numPixels) {
+void ConvertBGRA8888ToRGBA8888(u32 *dst, const u32 *src, u32 numPixels) {
 #ifdef _M_SSE
 	const __m128i maskGA = _mm_set1_epi32(0xFF00FF00);
 
@@ -170,7 +170,7 @@ void ConvertBGRA8888ToRGBA8888(u32 *dst, const u32 *src, const u32 numPixels) {
 	}
 }
 
-void ConvertRGBA8888ToRGBA5551(u16 *dst, const u32 *src, const u32 numPixels) {
+void ConvertRGBA8888ToRGBA5551(u16 *dst, const u32 *src, u32 numPixels) {
 #if _M_SSE >= 0x401
 	const __m128i maskAG = _mm_set1_epi32(0x8000F800);
 	const __m128i maskRB = _mm_set1_epi32(0x00F800F8);
@@ -212,7 +212,7 @@ void ConvertRGBA8888ToRGBA5551(u16 *dst, const u32 *src, const u32 numPixels) {
 	}
 }
 
-void ConvertBGRA8888ToRGBA5551(u16 *dst, const u32 *src, const u32 numPixels) {
+void ConvertBGRA8888ToRGBA5551(u16 *dst, const u32 *src, u32 numPixels) {
 #if _M_SSE >= 0x401
 	const __m128i maskAG = _mm_set1_epi32(0x8000F800);
 	const __m128i maskRB = _mm_set1_epi32(0x00F800F8);
@@ -254,31 +254,31 @@ void ConvertBGRA8888ToRGBA5551(u16 *dst, const u32 *src, const u32 numPixels) {
 	}
 }
 
-void ConvertBGRA8888ToRGB565(u16 *dst, const u32 *src, const u32 numPixels) {
+void ConvertBGRA8888ToRGB565(u16 *dst, const u32 *src, u32 numPixels) {
 	for (u32 i = 0; i < numPixels; i++) {
 		dst[i] = BGRA8888toRGB565(src[i]);
 	}
 }
 
-void ConvertBGRA8888ToRGBA4444(u16 *dst, const u32 *src, const u32 numPixels) {
+void ConvertBGRA8888ToRGBA4444(u16 *dst, const u32 *src, u32 numPixels) {
 	for (u32 i = 0; i < numPixels; i++) {
 		dst[i] = BGRA8888toRGBA4444(src[i]);
 	}
 }
 
-void ConvertRGBA8888ToRGB565(u16 *dst, const u32 *src, const u32 numPixels) {
+void ConvertRGBA8888ToRGB565(u16 *dst, const u32 *src, u32 numPixels) {
 	for (u32 x = 0; x < numPixels; ++x) {
 		dst[x] = RGBA8888toRGB565(src[x]);
 	}
 }
 
-void ConvertRGBA8888ToRGBA4444(u16 *dst, const u32 *src, const u32 numPixels) {
+void ConvertRGBA8888ToRGBA4444(u16 *dst, const u32 *src, u32 numPixels) {
 	for (u32 x = 0; x < numPixels; ++x) {
 		dst[x] = RGBA8888toRGBA4444(src[x]);
 	}
 }
 
-void ConvertRGBA565ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
+void ConvertRGBA565ToRGBA8888(u32 *dst32, const u16 *src, u32 numPixels) {
 #ifdef _M_SSE
 	const __m128i mask5 = _mm_set1_epi16(0x001f);
 	const __m128i mask6 = _mm_set1_epi16(0x003f);
@@ -332,7 +332,7 @@ void ConvertRGBA565ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
 	}
 }
 
-void ConvertRGBA5551ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
+void ConvertRGBA5551ToRGBA8888(u32 *dst32, const u16 *src, u32 numPixels) {
 #ifdef _M_SSE
 	const __m128i mask5 = _mm_set1_epi16(0x001f);
 	const __m128i mask8 = _mm_set1_epi16(0x00ff);
@@ -386,7 +386,7 @@ void ConvertRGBA5551ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels)
 	}
 }
 
-void ConvertRGBA4444ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
+void ConvertRGBA4444ToRGBA8888(u32 *dst32, const u16 *src, u32 numPixels) {
 #ifdef _M_SSE
 	const __m128i mask4 = _mm_set1_epi16(0x000f);
 
@@ -435,7 +435,7 @@ void ConvertRGBA4444ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels)
 	}
 }
 
-void ConvertABGR565ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
+void ConvertABGR565ToRGBA8888(u32 *dst32, const u16 *src, u32 numPixels) {
 	u8 *dst = (u8 *)dst32;
 	for (u32 x = 0; x < numPixels; x++) {
 		u16 col = src[x];
@@ -446,7 +446,7 @@ void ConvertABGR565ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
 	}
 }
 
-void ConvertABGR1555ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
+void ConvertABGR1555ToRGBA8888(u32 *dst32, const u16 *src, u32 numPixels) {
 	u8 *dst = (u8 *)dst32;
 	for (u32 x = 0; x < numPixels; x++) {
 		u16 col = src[x];
@@ -457,7 +457,7 @@ void ConvertABGR1555ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels)
 	}
 }
 
-void ConvertABGR4444ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
+void ConvertABGR4444ToRGBA8888(u32 *dst32, const u16 *src, u32 numPixels) {
 	u8 *dst = (u8 *)dst32;
 	for (u32 x = 0; x < numPixels; x++) {
 		u16 col = src[x];
@@ -468,7 +468,7 @@ void ConvertABGR4444ToRGBA8888(u32 *dst32, const u16 *src, const u32 numPixels)
 	}
 }
 
-void ConvertRGBA4444ToBGRA8888(u32 *dst32, const u16 *src, const u32 numPixels) {
+void ConvertRGBA4444ToBGRA8888(u32 *dst32, const u16 *src, u32 numPixels) {
 	u8 *dst = (u8 *)dst32;
 	for (u32 x = 0; x < numPixels; x++) {
 		u16 c = src[x];
@@ -481,7 +481,7 @@ void ConvertRGBA4444ToBGRA8888(u32 *dst32, const u16 *src, const u32 numPixels)
 	}
 }
 
-void ConvertRGBA5551ToBGRA8888(u32 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGBA5551ToBGRA8888(u32 *dst, const u16 *src, u32 numPixels) {
 	for (u32 x = 0; x < numPixels; x++) {
 		u16 c = src[x];
 		u32 r = c & 0x001f;
@@ -494,7 +494,7 @@ void ConvertRGBA5551ToBGRA8888(u32 *dst, const u16 *src, const u32 numPixels) {
 	}
 }
 
-void ConvertRGB565ToBGRA8888(u32 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGB565ToBGRA8888(u32 *dst, const u16 *src, u32 numPixels) {
 	for (u32 x = 0; x < numPixels; x++) {
 		u16 c = src[x];
 		u32 r = c & 0x001f;
@@ -505,7 +505,7 @@ void ConvertRGB565ToBGRA8888(u32 *dst, const u16 *src, const u32 numPixels) {
 	}
 }
 
-void ConvertRGBA4444ToABGR4444Basic(u16 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGBA4444ToABGR4444Basic(u16 *dst, const u16 *src, u32 numPixels) {
 #ifdef _M_SSE
 	const __m128i mask0040 = _mm_set1_epi16(0x00F0);
 
@@ -549,7 +549,7 @@ void ConvertRGBA4444ToABGR4444Basic(u16 *dst, const u16 *src, const u32 numPixel
 	}
 }
 
-void ConvertRGBA5551ToABGR1555Basic(u16 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGBA5551ToABGR1555Basic(u16 *dst, const u16 *src, u32 numPixels) {
 #ifdef _M_SSE
 	const __m128i maskB = _mm_set1_epi16(0x003E);
 	const __m128i maskG = _mm_set1_epi16(0x07C0);
@@ -594,7 +594,7 @@ void ConvertRGBA5551ToABGR1555Basic(u16 *dst, const u16 *src, const u32 numPixel
 	}
 }
 
-void ConvertRGB565ToBGR565Basic(u16 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGB565ToBGR565Basic(u16 *dst, const u16 *src, u32 numPixels) {
 #ifdef _M_SSE
 	const __m128i maskG = _mm_set1_epi16(0x07E0);
 
diff --git a/Common/ColorConv.h b/Common/ColorConv.h
index 5750922ba2..11a5b6f013 100644
--- a/Common/ColorConv.h
+++ b/Common/ColorConv.h
@@ -106,37 +106,37 @@ void convert5551_dx9(u16* data, u32* out, int width, int l, int u);
 
 // "Complete" set of color conversion functions between the usual formats.
 
-typedef void (*Convert16bppTo16bppFunc)(u16 *dst, const u16 *src, const u32 numPixels);
-typedef void (*Convert16bppTo32bppFunc)(u32 *dst, const u16 *src, const u32 numPixels);
-typedef void (*Convert32bppTo16bppFunc)(u16 *dst, const u32 *src, const u32 numPixels);
-typedef void (*Convert32bppTo32bppFunc)(u32 *dst, const u32 *src, const u32 numPixels);
+typedef void (*Convert16bppTo16bppFunc)(u16 *dst, const u16 *src, u32 numPixels);
+typedef void (*Convert16bppTo32bppFunc)(u32 *dst, const u16 *src, u32 numPixels);
+typedef void (*Convert32bppTo16bppFunc)(u16 *dst, const u32 *src, u32 numPixels);
+typedef void (*Convert32bppTo32bppFunc)(u32 *dst, const u32 *src, u32 numPixels);
 
-void ConvertBGRA8888ToRGBA8888(u32 *dst, const u32 *src, const u32 numPixels);
+void ConvertBGRA8888ToRGBA8888(u32 *dst, const u32 *src, u32 numPixels);
 #define ConvertRGBA8888ToBGRA8888 ConvertBGRA8888ToRGBA8888
 
-void ConvertRGBA8888ToRGBA5551(u16 *dst, const u32 *src, const u32 numPixels);
-void ConvertRGBA8888ToRGB565(u16 *dst, const u32 *src, const u32 numPixels);
-void ConvertRGBA8888ToRGBA4444(u16 *dst, const u32 *src, const u32 numPixels);
+void ConvertRGBA8888ToRGBA5551(u16 *dst, const u32 *src, u32 numPixels);
+void ConvertRGBA8888ToRGB565(u16 *dst, const u32 *src, u32 numPixels);
+void ConvertRGBA8888ToRGBA4444(u16 *dst, const u32 *src, u32 numPixels);
 
-void ConvertBGRA8888ToRGBA5551(u16 *dst, const u32 *src, const u32 numPixels);
-void ConvertBGRA8888ToRGB565(u16 *dst, const u32 *src, const u32 numPixels);
-void ConvertBGRA8888ToRGBA4444(u16 *dst, const u32 *src, const u32 numPixels);
+void ConvertBGRA8888ToRGBA5551(u16 *dst, const u32 *src, u32 numPixels);
+void ConvertBGRA8888ToRGB565(u16 *dst, const u32 *src, u32 numPixels);
+void ConvertBGRA8888ToRGBA4444(u16 *dst, const u32 *src, u32 numPixels);
 
-void ConvertRGBA565ToRGBA8888(u32 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGBA5551ToRGBA8888(u32 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGBA4444ToRGBA8888(u32 *dst, const u16 *src, const u32 numPixels);
+void ConvertRGBA565ToRGBA8888(u32 *dst, const u16 *src, u32 numPixels);
+void ConvertRGBA5551ToRGBA8888(u32 *dst, const u16 *src, u32 numPixels);
+void ConvertRGBA4444ToRGBA8888(u32 *dst, const u16 *src, u32 numPixels);
 
-void ConvertABGR565ToRGBA8888(u32 *dst, const u16 *src, const u32 numPixels);
-void ConvertABGR1555ToRGBA8888(u32 *dst, const u16 *src, const u32 numPixels);
-void ConvertABGR4444ToRGBA8888(u32 *dst, const u16 *src, const u32 numPixels);
+void ConvertABGR565ToRGBA8888(u32 *dst, const u16 *src, u32 numPixels);
+void ConvertABGR1555ToRGBA8888(u32 *dst, const u16 *src, u32 numPixels);
+void ConvertABGR4444ToRGBA8888(u32 *dst, const u16 *src, u32 numPixels);
 
-void ConvertRGBA4444ToBGRA8888(u32 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGBA5551ToBGRA8888(u32 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGB565ToBGRA8888(u32 *dst, const u16 *src, const u32 numPixels);
+void ConvertRGBA4444ToBGRA8888(u32 *dst, const u16 *src, u32 numPixels);
+void ConvertRGBA5551ToBGRA8888(u32 *dst, const u16 *src, u32 numPixels);
+void ConvertRGB565ToBGRA8888(u32 *dst, const u16 *src, u32 numPixels);
 
-void ConvertRGBA4444ToABGR4444Basic(u16 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGBA5551ToABGR1555Basic(u16 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGB565ToBGR565Basic(u16 *dst, const u16 *src, const u32 numPixels);
+void ConvertRGBA4444ToABGR4444Basic(u16 *dst, const u16 *src, u32 numPixels);
+void ConvertRGBA5551ToABGR1555Basic(u16 *dst, const u16 *src, u32 numPixels);
+void ConvertRGB565ToBGR565Basic(u16 *dst, const u16 *src, u32 numPixels);
 
 #if defined(ARM64)
 #define ConvertRGBA4444ToABGR4444 ConvertRGBA4444ToABGR4444NEON
diff --git a/Common/ColorConvNEON.cpp b/Common/ColorConvNEON.cpp
index 3fedc5ac82..5d34bb5710 100644
--- a/Common/ColorConvNEON.cpp
+++ b/Common/ColorConvNEON.cpp
@@ -25,7 +25,7 @@
 
 // TODO: More NEON color conversion funcs.
 
-void ConvertRGBA4444ToABGR4444NEON(u16 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGBA4444ToABGR4444NEON(u16 *dst, const u16 *src, u32 numPixels) {
 	const uint16x8_t mask0040 = vdupq_n_u16(0x00F0);
 
 	if (((uintptr_t)dst & 15) == 0 && ((uintptr_t)src & 15) == 0) {
@@ -56,7 +56,7 @@ void ConvertRGBA4444ToABGR4444NEON(u16 *dst, const u16 *src, const u32 numPixels
 	}
 }
 
-void ConvertRGBA5551ToABGR1555NEON(u16 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGBA5551ToABGR1555NEON(u16 *dst, const u16 *src, u32 numPixels) {
 	const uint16x8_t maskB = vdupq_n_u16(0x003E);
 	const uint16x8_t maskG = vdupq_n_u16(0x07C0);
 
@@ -88,7 +88,7 @@ void ConvertRGBA5551ToABGR1555NEON(u16 *dst, const u16 *src, const u32 numPixels
 	}
 }
 
-void ConvertRGB565ToBGR565NEON(u16 *dst, const u16 *src, const u32 numPixels) {
+void ConvertRGB565ToBGR565NEON(u16 *dst, const u16 *src, u32 numPixels) {
 	const uint16x8_t maskG = vdupq_n_u16(0x07E0);
 
 	if (((uintptr_t)dst & 15) == 0 && ((uintptr_t)src & 15) == 0) {
diff --git a/Common/ColorConvNEON.h b/Common/ColorConvNEON.h
index 9b7ceb10e4..43002411cd 100644
--- a/Common/ColorConvNEON.h
+++ b/Common/ColorConvNEON.h
@@ -19,6 +19,6 @@
 
 #include "ColorConv.h"
 
-void ConvertRGBA4444ToABGR4444NEON(u16 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGBA5551ToABGR1555NEON(u16 *dst, const u16 *src, const u32 numPixels);
-void ConvertRGB565ToBGR565NEON(u16 *dst, const u16 *src, const u32 numPixels);
+void ConvertRGBA4444ToABGR4444NEON(u16 *dst, const u16 *src, u32 numPixels);
+void ConvertRGBA5551ToABGR1555NEON(u16 *dst, const u16 *src, u32 numPixels);
+void ConvertRGB565ToBGR565NEON(u16 *dst, const u16 *src, u32 numPixels);