Merge pull request #88 from lioncash/relative-includes

Relative includes
2025-07-23 22:29:39 -06:00 · 2014-02-20 02:08:44 +01:00
parent afba0d736d 24ba058404
commit 6d8df311a3
908 changed files with 4955 additions and 5275 deletions
--- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp
+++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp
@ -2,16 +2,17 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VideoCommon.h"
-#include "TextureDecoder.h"
+#include "Core/Core.h"
+#include "Core/HW/Memmap.h"

-#include "BPMemLoader.h"
-#include "EfbCopy.h"
-#include "Rasterizer.h"
-#include "SWPixelEngine.h"
-#include "Tev.h"
-#include "HW/Memmap.h"
-#include "Core.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbCopy.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SWPixelEngine.h"
+#include "VideoBackends/Software/Tev.h"
+
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoCommon.h"


 void InitBPMemory()
--- a/Source/Core/VideoBackends/Software/BPMemLoader.h
+++ b/Source/Core/VideoBackends/Software/BPMemLoader.h
@ -5,8 +5,8 @@
 #pragma once


-#include "Common.h"
-#include "BPMemory.h"
+#include "Common/Common.h"
+#include "VideoCommon/BPMemory.h"

 void InitBPMemory();
 void SWBPWritten(int address, int newvalue);
--- a/Source/Core/VideoBackends/Software/CPMemLoader.cpp
+++ b/Source/Core/VideoBackends/Software/CPMemLoader.cpp
@ -2,10 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VideoCommon.h"
-
-#include "CPMemLoader.h"
-#include "HW/Memmap.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoCommon/VideoCommon.h"


 void SWLoadCPReg(u32 sub_cmd, u32 value)
--- a/Source/Core/VideoBackends/Software/CPMemLoader.h
+++ b/Source/Core/VideoBackends/Software/CPMemLoader.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common.h"
-#include "CPMemory.h"
+#include "Common/Common.h"
+#include "VideoCommon/CPMemory.h"

 void SWLoadCPReg(u32 sub_cmd, u32 value);
--- a/Source/Core/VideoBackends/Software/Clipper.cpp
+++ b/Source/Core/VideoBackends/Software/Clipper.cpp
@ -35,12 +35,12 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "Clipper.h"
-#include "Rasterizer.h"
-#include "NativeVertexFormat.h"
-#include "XFMemLoader.h"
-#include "BPMemLoader.h"
-#include "SWStatistics.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/XFMemLoader.h"


 namespace Clipper
--- a/Source/Core/VideoBackends/Software/Clipper.h
+++ b/Source/Core/VideoBackends/Software/Clipper.h
@ -4,10 +4,9 @@

 #pragma once

-#include "Common.h"
-#include "NativeVertexFormat.h"
-#include "ChunkFile.h"
-
+#include "Common/ChunkFile.h"
+#include "Common/Common.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"

 namespace Clipper
 {
--- a/Source/Core/VideoBackends/Software/DebugUtil.cpp
+++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp
@ -2,19 +2,21 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/TextureSampler.h"
+
+#include "VideoCommon/ImageWrite.h"

-#include "DebugUtil.h"
-#include "BPMemLoader.h"
-#include "TextureSampler.h"
-#include "SWVideoConfig.h"
-#include "EfbInterface.h"
-#include "SWStatistics.h"
-#include "HwRasterizer.h"
-#include "StringUtil.h"
-#include "SWCommandProcessor.h"
-#include "ImageWrite.h"
-#include "FileUtil.h"

 namespace DebugUtil
 {
--- a/Source/Core/VideoBackends/Software/EfbCopy.cpp
+++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp
@ -2,18 +2,18 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "BPMemLoader.h"
-#include "EfbCopy.h"
-#include "EfbInterface.h"
-#include "SWRenderer.h"
-#include "TextureEncoder.h"
-#include "SWStatistics.h"
-#include "SWVideoConfig.h"
-#include "DebugUtil.h"
-#include "HwRasterizer.h"
-#include "SWCommandProcessor.h"
-#include "HW/Memmap.h"
-#include "Core.h"
+#include "Core/Core.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbCopy.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWRenderer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/TextureEncoder.h"

 static const float s_gammaLUT[] =
 {
--- a/Source/Core/VideoBackends/Software/EfbCopy.h
+++ b/Source/Core/VideoBackends/Software/EfbCopy.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common.h"
+#include "Common/Common.h"

 namespace EfbCopy
 {
--- a/Source/Core/VideoBackends/Software/EfbInterface.cpp
+++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp
@ -2,13 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
+#include "Common/Common.h"
+#include "Core/HW/Memmap.h"

-#include "EfbInterface.h"
-#include "BPMemLoader.h"
-#include "LookUpTables.h"
-#include "SWPixelEngine.h"
-#include "HW/Memmap.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/SWPixelEngine.h"
+
+#include "VideoCommon/LookUpTables.h"


 u8 efb[EFB_WIDTH*EFB_HEIGHT*6];
--- a/Source/Core/VideoBackends/Software/EfbInterface.h
+++ b/Source/Core/VideoBackends/Software/EfbInterface.h
@ -4,7 +4,7 @@

 #pragma once

-#include "VideoCommon.h"
+#include "VideoCommon/VideoCommon.h"

 namespace EfbInterface
 {
--- a/Source/Core/VideoBackends/Software/HwRasterizer.cpp
+++ b/Source/Core/VideoBackends/Software/HwRasterizer.cpp
@ -2,15 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
-#include "MemoryUtil.h"
+#include "Common/Common.h"
+#include "Common/MemoryUtil.h"

-#include <VideoCommon.h>
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"

-#include "BPMemLoader.h"
-#include "HwRasterizer.h"
-#include "NativeVertexFormat.h"
-#include "DebugUtil.h"
+#include "VideoCommon/VideoCommon.h"

 #define TEMP_SIZE (1024*1024*4)

--- a/Source/Core/VideoBackends/Software/HwRasterizer.h
+++ b/Source/Core/VideoBackends/Software/HwRasterizer.h
@ -6,8 +6,8 @@

 #include <map>

-#include "BPMemLoader.h"
-#include "../OGL/GLUtil.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/Software/BPMemLoader.h"

 struct OutputVertexData;

--- a/Source/Core/VideoBackends/Software/NativeVertexFormat.h
+++ b/Source/Core/VideoBackends/Software/NativeVertexFormat.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Vec3.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
+#include "VideoBackends/Software/Vec3.h"

 #ifdef WIN32
 #define LOADERDECL __cdecl
--- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
+++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
@ -2,21 +2,18 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
-
-#include "DataReader.h"
-
-#include "OpcodeDecoder.h"
-#include "BPMemLoader.h"
-#include "CPMemLoader.h"
-#include "XFMemLoader.h"
-#include "SWVertexLoader.h"
-#include "SWStatistics.h"
-#include "DebugUtil.h"
-#include "SWCommandProcessor.h"
-#include "CPMemLoader.h"
-#include "SWVideoConfig.h"
-#include "HW/Memmap.h"
+#include "Common/Common.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVertexLoader.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+#include "VideoCommon/DataReader.h"

 typedef void (*DecodingFunction)(u32);

--- a/Source/Core/VideoBackends/Software/OpcodeDecoder.h
+++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.h
@ -4,8 +4,8 @@

 #pragma once

-#include "CommonTypes.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"

 namespace OpcodeDecoder
 {
--- a/Source/Core/VideoBackends/Software/RasterFont.cpp
+++ b/Source/Core/VideoBackends/Software/RasterFont.cpp
@ -2,12 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "../OGL/GLUtil.h"
-
 #include <string.h>

-#include "RasterFont.h"
-// globals
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/Software/RasterFont.h"

 const GLubyte rasters[][13] = {
 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
--- a/Source/Core/VideoBackends/Software/Rasterizer.cpp
+++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp
@ -2,17 +2,17 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
+#include "Common/Common.h"

-#include "Rasterizer.h"
-#include "HwRasterizer.h"
-#include "EfbInterface.h"
-#include "BPMemLoader.h"
-#include "XFMemLoader.h"
-#include "Tev.h"
-#include "SWPixelEngine.h"
-#include "SWStatistics.h"
-#include "SWVideoConfig.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SWPixelEngine.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/Tev.h"
+#include "VideoBackends/Software/XFMemLoader.h"


 #define BLOCK_SIZE 2
--- a/Source/Core/VideoBackends/Software/Rasterizer.h
+++ b/Source/Core/VideoBackends/Software/Rasterizer.h
@ -4,8 +4,8 @@

 #pragma once

-#include "NativeVertexFormat.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"

 namespace Rasterizer
 {
--- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
@ -2,21 +2,22 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
-#include "Thread.h"
-#include "Atomic.h"
-#include "ConfigManager.h"
-#include "Core.h"
-#include "CoreTiming.h"
-#include "HW/Memmap.h"
-#include "HW/MMIO.h"
-#include "HW/ProcessorInterface.h"
+#include "Common/Atomic.h"
+#include "Common/ChunkFile.h"
+#include "Common/Common.h"
+#include "Common/MathUtil.h"
+#include "Common/Thread.h"

-#include "VideoBackend.h"
-#include "SWCommandProcessor.h"
-#include "ChunkFile.h"
-#include "MathUtil.h"
-#include "OpcodeDecoder.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"
+
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/VideoBackend.h"


 namespace SWCommandProcessor
--- a/Source/Core/VideoBackends/Software/SWCommandProcessor.h
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common.h"
+#include "Common/Common.h"

 class PointerWrap;
 namespace MMIO { class Mapping; }
--- a/Source/Core/VideoBackends/Software/SWPixelEngine.cpp
+++ b/Source/Core/VideoBackends/Software/SWPixelEngine.cpp
@ -2,20 +2,18 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-
 // http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!!

+#include "Common/ChunkFile.h"
+#include "Common/Common.h"

+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/MMIO.h"
+#include "Core/HW/ProcessorInterface.h"

-#include "Common.h"
-#include "ChunkFile.h"
-#include "CoreTiming.h"
-#include "ConfigManager.h"
-#include "HW/MMIO.h"
-#include "HW/ProcessorInterface.h"
-
-#include "SWPixelEngine.h"
-#include "SWCommandProcessor.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWPixelEngine.h"


 namespace SWPixelEngine
--- a/Source/Core/VideoBackends/Software/SWPixelEngine.h
+++ b/Source/Core/VideoBackends/Software/SWPixelEngine.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Common.h"
-#include "VideoCommon.h"
+#include "Common/Common.h"
+#include "VideoCommon/VideoCommon.h"

 class PointerWrap;
 namespace MMIO { class Mapping; }
--- a/Source/Core/VideoBackends/Software/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@ -2,17 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
-
-#include "../OGL/GLUtil.h"
-#include "Core.h"
-#include "ImageWrite.h"
-#include "RasterFont.h"
-#include "SWRenderer.h"
-#include "SWStatistics.h"
-#include "SWCommandProcessor.h"
-
-#include "OnScreenDisplay.h"
+#include "Common/Common.h"
+#include "Core/Core.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/Software/RasterFont.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWRenderer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoCommon/ImageWrite.h"
+#include "VideoCommon/OnScreenDisplay.h"

 static GLuint s_RenderTarget = 0;

--- a/Source/Core/VideoBackends/Software/SWRenderer.h
+++ b/Source/Core/VideoBackends/Software/SWRenderer.h
@ -4,9 +4,9 @@

 #pragma once

-#include "CommonTypes.h"
-#include "EfbInterface.h"
-#include "Thread.h"
+#include "Common/CommonTypes.h"
+#include "Common/Thread.h"
+#include "VideoBackends/Software/EfbInterface.h"

 namespace SWRenderer
 {
--- a/Source/Core/VideoBackends/Software/SWStatistics.cpp
+++ b/Source/Core/VideoBackends/Software/SWStatistics.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "SWStatistics.h"
+#include "VideoBackends/Software/SWStatistics.h"

 SWStatistics swstats;

--- a/Source/Core/VideoBackends/Software/SWStatistics.h
+++ b/Source/Core/VideoBackends/Software/SWStatistics.h
@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "CommonTypes.h"
-#include "SWVideoConfig.h"
+#include "Common/CommonTypes.h"
+#include "VideoBackends/Software/SWVideoConfig.h"

 #pragma once

--- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@ -2,22 +2,21 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
+#include "Common/Common.h"

-#include "SWVertexLoader.h"
-#include "VertexLoader_Position.h"
-#include "VertexLoader_Normal.h"
-#include "VertexLoader_Color.h"
-#include "VertexLoader_TextCoord.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/SetupUnit.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVertexLoader.h"
+#include "VideoBackends/Software/TransformUnit.h"
+#include "VideoBackends/Software/XFMemLoader.h"

-#include "CPMemLoader.h"
-#include "XFMemLoader.h"
-
-#include "TransformUnit.h"
-#include "SetupUnit.h"
-#include "SWStatistics.h"
-#include "VertexManagerBase.h"
-#include "DataReader.h"
+#include "VideoCommon/DataReader.h"
+#include "VideoCommon/VertexLoader_Color.h"
+#include "VideoCommon/VertexLoader_Normal.h"
+#include "VideoCommon/VertexLoader_Position.h"
+#include "VideoCommon/VertexLoader_TextCoord.h"
+#include "VideoCommon/VertexManagerBase.h"

 // Vertex loaders read these
 extern int tcIndex;
--- a/Source/Core/VideoBackends/Software/SWVertexLoader.h
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h
@ -4,11 +4,11 @@

 #pragma once

-#include "Common.h"
+#include "Common/ChunkFile.h"
+#include "Common/Common.h"

-#include "NativeVertexFormat.h"
-#include "CPMemLoader.h"
-#include "ChunkFile.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"

 class SetupUnit;

--- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp
+++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp
@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "FileUtil.h"
-#include "IniFile.h"
-#include "SWVideoConfig.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "VideoBackends/Software/SWVideoConfig.h"

 SWVideoConfig g_SWVideoConfig;

--- a/Source/Core/VideoBackends/Software/SWVideoConfig.h
+++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common.h"
+#include "Common/Common.h"

 #define STATISTICS 1

--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@ -2,39 +2,39 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

+#include "Common/Atomic.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/LogManager.h"

-#include "Common.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/VideoInterface.h"
+
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/HwRasterizer.h"
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/Rasterizer.h"
+#include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWPixelEngine.h"
+#include "VideoBackends/Software/SWRenderer.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVertexLoader.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/VideoBackend.h"
+#include "VideoBackends/Software/XFMemLoader.h"

 #if defined(HAVE_WX) && HAVE_WX
-#include "VideoConfigDialog.h"
+#include "VideoBackends/Software/VideoConfigDialog.h"
 #endif // HAVE_WX

-#include "../OGL/GLExtensions/GLExtensions.h"
-#include "Atomic.h"
-#include "SWCommandProcessor.h"
-#include "OpcodeDecoder.h"
-#include "SWVideoConfig.h"
-#include "SWPixelEngine.h"
-#include "BPMemLoader.h"
-#include "XFMemLoader.h"
-#include "Clipper.h"
-#include "Rasterizer.h"
-#include "SWRenderer.h"
-#include "HwRasterizer.h"
-#include "LogManager.h"
-#include "EfbInterface.h"
-#include "DebugUtil.h"
-#include "FileUtil.h"
-#include "VideoBackend.h"
-#include "Core.h"
-#include "OpcodeDecoder.h"
-#include "SWVertexLoader.h"
-#include "SWStatistics.h"
-#include "HW/VideoInterface.h"
-#include "HW/Memmap.h"
-#include "ConfigManager.h"
+#include "VideoCommon/OnScreenDisplay.h"

-#include "OnScreenDisplay.h"
 #define VSYNC_ENABLED 0

 static volatile u32 s_swapRequested = false;
--- a/Source/Core/VideoBackends/Software/SetupUnit.cpp
+++ b/Source/Core/VideoBackends/Software/SetupUnit.cpp
@ -2,12 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "SetupUnit.h"
-
-#include "CPMemLoader.h"
-#include "OpcodeDecoder.h"
-#include "SWStatistics.h"
-#include "Clipper.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/OpcodeDecoder.h"
+#include "VideoBackends/Software/SetupUnit.h"
+#include "VideoBackends/Software/SWStatistics.h"


 void SetupUnit::Init(u8 primitiveType)
--- a/Source/Core/VideoBackends/Software/SetupUnit.h
+++ b/Source/Core/VideoBackends/Software/SetupUnit.h
@ -4,9 +4,9 @@

 #pragma once

-#include "Common.h"
-#include "NativeVertexFormat.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
+#include "Common/Common.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"

 class SetupUnit
 {
--- a/Source/Core/VideoBackends/Software/Tev.cpp
+++ b/Source/Core/VideoBackends/Software/Tev.cpp
@ -2,19 +2,19 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
-
-#include "Tev.h"
-#include "EfbInterface.h"
-#include "TextureSampler.h"
-#include "XFMemLoader.h"
-#include "SWPixelEngine.h"
-#include "SWStatistics.h"
-#include "SWVideoConfig.h"
-#include "DebugUtil.h"
-
 #include <cmath>

+#include "Common/Common.h"
+
+#include "VideoBackends/Software/DebugUtil.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/SWPixelEngine.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoBackends/Software/Tev.h"
+#include "VideoBackends/Software/TextureSampler.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+
 #ifdef _DEBUG
 #define ALLOW_TEV_DUMPS 1
 #else
--- a/Source/Core/VideoBackends/Software/Tev.h
+++ b/Source/Core/VideoBackends/Software/Tev.h
@ -4,8 +4,8 @@

 #pragma once

-#include "BPMemLoader.h"
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
+#include "VideoBackends/Software/BPMemLoader.h"

 class Tev
 {
--- a/Source/Core/VideoBackends/Software/TextureEncoder.cpp
+++ b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "TextureEncoder.h"
-#include "EfbInterface.h"
-#include "BPMemLoader.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/EfbInterface.h"
+#include "VideoBackends/Software/TextureEncoder.h"

-#include "LookUpTables.h"
-#include "TextureDecoder.h"
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/TextureDecoder.h"


 namespace TextureEncoder
--- a/Source/Core/VideoBackends/Software/TextureEncoder.h
+++ b/Source/Core/VideoBackends/Software/TextureEncoder.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common.h"
+#include "Common/Common.h"

 namespace TextureEncoder
 {
--- a/Source/Core/VideoBackends/Software/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@ -2,14 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "TextureSampler.h"
-
-#include "BPMemLoader.h"
-#include "TextureDecoder.h"
-#include "HW/Memmap.h"
-
 #include <cmath>

+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/TextureSampler.h"
+#include "VideoCommon/TextureDecoder.h"
+
 #define ALLOW_MIPMAP 1

 namespace TextureSampler
--- a/Source/Core/VideoBackends/Software/TextureSampler.h
+++ b/Source/Core/VideoBackends/Software/TextureSampler.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common.h"
+#include "Common/Common.h"

 namespace TextureSampler
 {
--- a/Source/Core/VideoBackends/Software/TransformUnit.cpp
+++ b/Source/Core/VideoBackends/Software/TransformUnit.cpp
@ -2,17 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common.h"
+#include <cmath>

-#include <math.h>
-
-#include "TransformUnit.h"
-#include "XFMemLoader.h"
-#include "CPMemLoader.h"
-#include "BPMemLoader.h"
-#include "NativeVertexFormat.h"
-
-#include "Vec3.h"
+#include "Common/Common.h"
+#include "VideoBackends/Software/BPMemLoader.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
+#include "VideoBackends/Software/TransformUnit.h"
+#include "VideoBackends/Software/Vec3.h"
+#include "VideoBackends/Software/XFMemLoader.h"


 namespace TransformUnit
--- a/Source/Core/VideoBackends/Software/Vec3.h
+++ b/Source/Core/VideoBackends/Software/Vec3.h
@ -4,9 +4,10 @@

 #pragma once

-#include <stdlib.h>
-#include <math.h>
-#include "ChunkFile.h"
+#include <cmath>
+#include <cstdlib>
+
+#include "Common/ChunkFile.h"

 class Vec3
 {
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@ -1,6 +1,6 @@
 #pragma once

-#include "VideoBackendBase.h"
+#include "VideoCommon/VideoBackendBase.h"

 namespace MMIO { class Mapping; }

--- a/Source/Core/VideoBackends/Software/VideoConfigDialog.cpp
+++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.cpp
@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VideoConfigDiag.h"
-#include "VideoConfigDialog.h"

-#include "FileUtil.h"
-#include "Core.h"
+#include "Common/FileUtil.h"
+#include "Core/Core.h"
+#include "DolphinWX/VideoConfigDiag.h"
+#include "VideoBackends/Software/VideoConfigDialog.h"

 template <typename T>
 IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& setting, int minVal, int maxVal, long style) :
--- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h
+++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h
@ -4,22 +4,21 @@

 #pragma once

-#include <vector>
 #include <string>
-
-#include "SWVideoConfig.h"
-#include "VideoBackendBase.h"
-#include "ConfigManager.h"
-
-#include <wx/wx.h>
-#include <wx/textctrl.h>
+#include <vector>
 #include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
 #include <wx/checkbox.h>
+#include <wx/combobox.h>
 #include <wx/notebook.h>
 #include <wx/panel.h>
 #include <wx/spinctrl.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/wx.h>
+
+#include "Core/ConfigManager.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
+#include "VideoCommon/VideoBackendBase.h"

 class VideoConfigDialog : public wxDialog
 {
--- a/Source/Core/VideoBackends/Software/XFMemLoader.cpp
+++ b/Source/Core/VideoBackends/Software/XFMemLoader.cpp
@ -2,12 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "VideoCommon.h"
-
-#include "XFMemLoader.h"
-#include "CPMemLoader.h"
-#include "Clipper.h"
-#include "HW/Memmap.h"
+#include "Core/HW/Memmap.h"
+#include "VideoBackends/Software/Clipper.h"
+#include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/XFMemLoader.h"
+#include "VideoCommon/VideoCommon.h"

 XFRegisters swxfregs;

--- a/Source/Core/VideoBackends/Software/XFMemLoader.h
+++ b/Source/Core/VideoBackends/Software/XFMemLoader.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common.h"
+#include "Common/Common.h"

 /////////////
 // Lighting
--- a/Source/Core/VideoBackends/Software/stdafx.cpp
+++ b/Source/Core/VideoBackends/Software/stdafx.cpp
@ -2,4 +2,4 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "stdafx.h"
+#include "VideoBackends/Software/stdafx.h"