diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 510119581d..9f3ca3c261 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -87,13 +87,13 @@ set(GSdxSources
     Renderers/Common/GSOsdManager.cpp
     Renderers/Common/GSRenderer.cpp
     Renderers/Common/GSTexture.cpp
-    Renderers/Common/GSTextureCache.cpp
     Renderers/Common/GSVertexTrace.cpp
     Renderers/Null/GSDeviceNull.cpp
     Renderers/Null/GSRendererNull.cpp
     Renderers/Null/GSTextureNull.cpp
     Renderers/HW/GSHwHack.cpp
     Renderers/HW/GSRendererHW.cpp
+    Renderers/HW/GSTextureCache.cpp
     Renderers/SW/GSDrawScanline.cpp
     Renderers/SW/GSDrawScanlineCodeGenerator.cpp
     Renderers/SW/GSDrawScanlineCodeGenerator.x64.cpp
@@ -171,7 +171,6 @@ set(GSdxHeaders
     Renderers/Common/GSFunctionMap.h
     Renderers/Common/GSOsdManager.h
     Renderers/Common/GSRenderer.h
-    Renderers/Common/GSTextureCache.h
     Renderers/Common/GSTexture.h
     Renderers/Common/GSVertex.h
     Renderers/Common/GSVertexList.h
@@ -180,6 +179,7 @@ set(GSdxHeaders
     Renderers/Null/GSRendererNull.h
     Renderers/Null/GSTextureNull.h
     Renderers/HW/GSRendererHW.h
+    Renderers/HW/GSTextureCache.h
     Renderers/HW/GSVertexHW.h
     Renderers/SW/GSDrawScanlineCodeGenerator.h
     Renderers/SW/GSDrawScanline.h
diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj
index ee6143f6f3..0d88b07655 100644
--- a/plugins/GSdx/GSdx.vcxproj
+++ b/plugins/GSdx/GSdx.vcxproj
@@ -147,7 +147,7 @@
     <ClCompile Include="Renderers\Common\GSTexture.cpp" />
     <ClCompile Include="Renderers\DX11\GSTexture11.cpp" />
     <ClCompile Include="Renderers\OpenGL\GSTextureOGL.cpp" />
-    <ClCompile Include="Renderers\Common\GSTextureCache.cpp" />
+    <ClCompile Include="Renderers\HW\GSTextureCache.cpp" />
     <ClCompile Include="Renderers\DX11\GSTextureCache11.cpp" />
     <ClCompile Include="Renderers\OpenGL\GSTextureCacheOGL.cpp" />
     <ClCompile Include="Renderers\SW\GSTextureCacheSW.cpp" />
@@ -224,7 +224,7 @@
     <ClInclude Include="Renderers\Common\GSTexture.h" />
     <ClInclude Include="Renderers\DX11\GSTexture11.h" />
     <ClInclude Include="Renderers\OpenGL\GSTextureOGL.h" />
-    <ClInclude Include="Renderers\Common\GSTextureCache.h" />
+    <ClInclude Include="Renderers\HW\GSTextureCache.h" />
     <ClInclude Include="Renderers\DX11\GSTextureCache11.h" />
     <ClInclude Include="Renderers\OpenGL\GSTextureCacheOGL.h" />
     <ClInclude Include="Renderers\SW\GSTextureCacheSW.h" />
diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters
index a23f4a842e..e31d3f4aae 100644
--- a/plugins/GSdx/GSdx.vcxproj.filters
+++ b/plugins/GSdx/GSdx.vcxproj.filters
@@ -135,7 +135,7 @@
     <ClCompile Include="Renderers\OpenGL\GSTextureOGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Renderers\Common\GSTextureCache.cpp">
+    <ClCompile Include="Renderers\HW\GSTextureCache.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Renderers\DX11\GSTextureCache11.cpp">
@@ -398,7 +398,7 @@
     <ClInclude Include="Renderers\OpenGL\GSTextureOGL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Renderers\Common\GSTextureCache.h">
+    <ClInclude Include="Renderers\HW\GSTextureCache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Renderers\DX11\GSTextureCache11.h">
diff --git a/plugins/GSdx/Renderers/DX11/GSTextureCache11.h b/plugins/GSdx/Renderers/DX11/GSTextureCache11.h
index d5050472ea..52dedba984 100644
--- a/plugins/GSdx/Renderers/DX11/GSTextureCache11.h
+++ b/plugins/GSdx/Renderers/DX11/GSTextureCache11.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "Renderers/Common/GSTextureCache.h"
+#include "Renderers/HW/GSTextureCache.h"
 #include "GSDevice11.h"
 
 class GSTextureCache11 : public GSTextureCache
diff --git a/plugins/GSdx/Renderers/HW/GSRendererHW.h b/plugins/GSdx/Renderers/HW/GSRendererHW.h
index 497af63d14..53c03fbacb 100644
--- a/plugins/GSdx/Renderers/HW/GSRendererHW.h
+++ b/plugins/GSdx/Renderers/HW/GSRendererHW.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "Renderers/Common/GSTextureCache.h"
+#include "GSTextureCache.h"
 #include "Renderers/Common/GSFunctionMap.h"
 #include "GSState.h"
 
diff --git a/plugins/GSdx/Renderers/Common/GSTextureCache.cpp b/plugins/GSdx/Renderers/HW/GSTextureCache.cpp
similarity index 99%
rename from plugins/GSdx/Renderers/Common/GSTextureCache.cpp
rename to plugins/GSdx/Renderers/HW/GSTextureCache.cpp
index 7f401d70ca..4e2ee30d94 100644
--- a/plugins/GSdx/Renderers/Common/GSTextureCache.cpp
+++ b/plugins/GSdx/Renderers/HW/GSTextureCache.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "stdafx.h"
-#include "Renderers/Common/GSTextureCache.h"
+#include "GSTextureCache.h"
 #include "GSUtil.h"
 
 bool GSTextureCache::m_disable_partial_invalidation = false;
diff --git a/plugins/GSdx/Renderers/Common/GSTextureCache.h b/plugins/GSdx/Renderers/HW/GSTextureCache.h
similarity index 98%
rename from plugins/GSdx/Renderers/Common/GSTextureCache.h
rename to plugins/GSdx/Renderers/HW/GSTextureCache.h
index f97cd60480..189fb75135 100644
--- a/plugins/GSdx/Renderers/Common/GSTextureCache.h
+++ b/plugins/GSdx/Renderers/HW/GSTextureCache.h
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include "GSRenderer.h"
-#include "GSFastList.h"
-#include "GSDirtyRect.h"
+#include "Renderers/Common/GSRenderer.h"
+#include "Renderers/Common/GSFastList.h"
+#include "Renderers/Common/GSDirtyRect.h"
 
 class GSTextureCache
 {
diff --git a/plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.h b/plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.h
index b36b59f7f8..490dab2abb 100644
--- a/plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.h
+++ b/plugins/GSdx/Renderers/OpenGL/GSTextureCacheOGL.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Renderers/Common/GSTextureCache.h"
+#include "Renderers/HW/GSTextureCache.h"
 #include "GSDeviceOGL.h"
 
 class GSTextureCacheOGL final : public GSTextureCache