diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9befcd0ae..9dd662d69b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,13 +334,6 @@ add_library(rg_etc1 STATIC
 	native/ext/rg_etc1/rg_etc1.h)
 include_directories(native/ext/rg_etc1)
 
-add_library(cityhash STATIC
-	native/ext/cityhash/city.cpp
-	native/ext/cityhash/city.h
-	native/ext/cityhash/citycrc.h
-)
-include_directories(ext/cityhash)
-
 if(NOT USING_GLES2)
 	include_directories(${OPENGL_INCLUDE_DIR})
 
@@ -961,7 +954,7 @@ add_library(${CoreLibName} ${CoreLinkType}
 	$<TARGET_OBJECTS:GPU>
 	Globals.h
 	git-version.cpp)
-target_link_libraries(${CoreLibName} Common native kirk cityhash xbrz xxhash
+target_link_libraries(${CoreLibName} Common native kirk xbrz xxhash
 	${CoreExtraLibs} ${GLEW_LIBRARIES} ${OPENGL_LIBRARIES})
 setup_target_project(${CoreLibName} Core)
 
@@ -1296,7 +1289,6 @@ if(APPLE)
 	set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -D_NDEBUG")
 
 	# These can be fast even for debug.
-	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
 	set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3")
 	set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
 endif()
diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp
index 68d5ce7858..4e7d5325a8 100644
--- a/Core/HLE/sceJpeg.cpp
+++ b/Core/HLE/sceJpeg.cpp
@@ -18,9 +18,14 @@
 #include "Core/HLE/HLE.h"
 #include "Core/Reporting.h"
 #include "Common.h"
-#include "native/ext/cityhash/city.h"
 #include "native/ext/jpge/jpgd.h"
 
+//Uncomment if you want to dump JPEGs loaded through sceJpeg to a file
+//#define JPEG_DEBUG
+#ifdef JPEG_DEBUG
+#include "ext/xxhash.h"
+#endif
+
 #include <algorithm>
 
 static int mjpegWidth, mjpegHeight;
@@ -55,9 +60,6 @@ u32 convertYCbCrToABGR (int y, int cb, int cr) {
 	return 0xFF000000 | (b << 16) | (g << 8) | (r << 0);
 }
 
-//Uncomment if you want to dump JPEGs loaded through sceJpeg to a file
-//#define JPEG_DEBUG
-
 int sceJpegDecompressAllImage()
 {
 	ERROR_LOG_REPORT(ME, "UNIMPL sceJpegDecompressAllImage()");
@@ -193,8 +195,8 @@ int sceJpegGetOutputInfo(u32 jpegAddr, int jpegSize, u32 colourInfoAddr, int dht
 #ifdef JPEG_DEBUG
 		char jpeg_fname[256];
 		u8 *jpegBuf = Memory::GetPointer(jpegAddr);
-		uint32 jpeg_cityhash = CityHash32((const char *)jpegBuf, jpegSize);
-		sprintf(jpeg_fname, "Jpeg\\%X.jpg", jpeg_cityhash);
+		uint32 jpeg_xxhash = XXH32((const char *)jpegBuf, jpegSize, 0xC0108888);
+		sprintf(jpeg_fname, "Jpeg\\%X.jpg", jpeg_xxhash);
 		FILE *wfp = fopen(jpeg_fname, "wb");
 		if (!wfp) {
 			_wmkdir(L"Jpeg\\");
diff --git a/GPU/Directx9/TextureCacheDX9.cpp b/GPU/Directx9/TextureCacheDX9.cpp
index d5dd08f674..c8b217f2c0 100644
--- a/GPU/Directx9/TextureCacheDX9.cpp
+++ b/GPU/Directx9/TextureCacheDX9.cpp
@@ -29,7 +29,6 @@
 
 #include "ext/xxhash.h"
 #include "math/math_util.h"
-#include "native/ext/cityhash/city.h"
 
 extern int g_iNumVideos;
 
diff --git a/GPU/Directx9/TransformPipelineDX9.cpp b/GPU/Directx9/TransformPipelineDX9.cpp
index e90924c6fc..47b7dde2e9 100644
--- a/GPU/Directx9/TransformPipelineDX9.cpp
+++ b/GPU/Directx9/TransformPipelineDX9.cpp
@@ -26,7 +26,6 @@
 #include "Core/CoreTiming.h"
 
 #include "helper/dx_state.h"
-#include "native/ext/cityhash/city.h"
 #include "ext/xxhash.h"
 
 #include "GPU/Math3D.h"
diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp
index 81034c4961..e00d130ce9 100644
--- a/GPU/GLES/TextureCache.cpp
+++ b/GPU/GLES/TextureCache.cpp
@@ -29,7 +29,6 @@
 
 #include "ext/xxhash.h"
 #include "math/math_util.h"
-#include "native/ext/cityhash/city.h"
 #include "native/gfx_es2/gl_state.h"
 
 #ifdef _M_SSE
diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp
index 3f442aa9ee..4a0927ef91 100644
--- a/GPU/GLES/TransformPipeline.cpp
+++ b/GPU/GLES/TransformPipeline.cpp
@@ -75,7 +75,6 @@
 #include "Core/CoreTiming.h"
 
 #include "native/gfx_es2/gl_state.h"
-#include "native/ext/cityhash/city.h"
 #include "ext/xxhash.h"
 
 #include "GPU/Math3D.h"
diff --git a/Qt/Native.pro b/Qt/Native.pro
index 73d097cb13..9fb2290550 100755
--- a/Qt/Native.pro
+++ b/Qt/Native.pro
@@ -23,12 +23,6 @@ SOURCES += ../native/ext/rg_etc1/rg_etc1.cpp
 HEADERS += ../native/ext/rg_etc1/rg_etc1.h
 INCLUDEPATH += ../native/ext/rg_etc1
 
-# Cityhash
-
-SOURCES += ../native/ext/cityhash/city.cpp
-HEADERS += ../native/ext/cityhash/*.h
-INCLUDEPATH += ../native/ext/cityhash
-
 # JPGE
 SOURCES += ../native/ext/jpge/*.cpp
 HEADERS += ../native/ext/jpge/*.h