Merge pull request #88 from lioncash/relative-includes

Relative includes

CMakeLists.txt

@@ -472,16 +472,7 @@ endif()
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
-include_directories(Source/Core/AudioCommon)
-include_directories(Source/Core/Common)
-include_directories(Source/Core/Core)
-include_directories(Source/Core/DebuggerUICommon)
-include_directories(Source/Core/DebuggerWX)
-include_directories(Source/Core/DiscIO)
-include_directories(Source/Core/DolphinWX)
-include_directories(Source/Core/InputCommon)
-include_directories(Source/Core/VideoCommon)
-include_directories(Source/Core/VideoUICommon)
+include_directories(Source/Core)
 
 ########################################
 # Process externals and setup their include directories

Source/Core/AudioCommon/AOSoundStream.cpp

@@ -5,8 +5,8 @@
 #include <functional>
 #include <string.h>
 
-#include "AOSoundStream.h"
-#include "Mixer.h"
+#include "AudioCommon/AOSoundStream.h"
+#include "AudioCommon/Mixer.h"
 
 #if defined(HAVE_AO) && HAVE_AO
 

Source/Core/AudioCommon/AOSoundStream.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "SoundStream.h"
-#include "Thread.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Thread.h"
 
 #if defined(HAVE_AO) && HAVE_AO
 #include <ao/ao.h>

Source/Core/AudioCommon/AlsaSoundStream.cpp

@@ -4,9 +4,9 @@
 
 #include <functional>
 
-#include "Common.h"
-#include "Thread.h"
-#include "AlsaSoundStream.h"
+#include "AudioCommon/AlsaSoundStream.h"
+#include "Common/Common.h"
+#include "Common/Thread.h"
 
 #define FRAME_COUNT_MIN 256
 #define BUFFER_SIZE_MAX 8192

Source/Core/AudioCommon/AlsaSoundStream.h

@@ -8,10 +8,9 @@
 #include <alsa/asoundlib.h>
 #endif
 
-#include "Common.h"
-#include "SoundStream.h"
-
-#include "Thread.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Common.h"
+#include "Common/Thread.h"
 
 class AlsaSound : public SoundStream
 {

Source/Core/AudioCommon/AudioCommon.cpp

@@ -2,21 +2,24 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "AudioCommon.h"
-#include "FileUtil.h"
-#include "Mixer.h"
-#include "NullSoundStream.h"
-#include "DSoundStream.h"
-#include "XAudio2_7Stream.h"
-#include "XAudio2Stream.h"
-#include "AOSoundStream.h"
-#include "AlsaSoundStream.h"
-#include "CoreAudioSoundStream.h"
-#include "OpenALStream.h"
-#include "PulseAudioStream.h"
-#include "OpenSLESStream.h"
-#include "../Core/Movie.h"
-#include "../Core/ConfigManager.h"
+
+#include "AudioCommon/AlsaSoundStream.h"
+#include "AudioCommon/AOSoundStream.h"
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/CoreAudioSoundStream.h"
+#include "AudioCommon/DSoundStream.h"
+#include "AudioCommon/Mixer.h"
+#include "AudioCommon/NullSoundStream.h"
+#include "AudioCommon/OpenALStream.h"
+#include "AudioCommon/OpenSLESStream.h"
+#include "AudioCommon/PulseAudioStream.h"
+#include "AudioCommon/XAudio2_7Stream.h"
+#include "AudioCommon/XAudio2Stream.h"
+
+#include "Common/FileUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Movie.h"
 
 // This shouldn't be a global, at least not here.
 SoundStream *soundStream = nullptr;

Source/Core/AudioCommon/AudioCommon.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "Common.h"
-#include "SoundStream.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Common.h"
 
 
 class CMixer;

Source/Core/AudioCommon/CoreAudioSoundStream.cpp

@@ -4,7 +4,7 @@
 
 #include <CoreServices/CoreServices.h>
 
-#include "CoreAudioSoundStream.h"
+#include "AudioCommon/CoreAudioSoundStream.h"
 
 OSStatus CoreAudioSound::callback(void *inRefCon,
 	AudioUnitRenderActionFlags *ioActionFlags,

Source/Core/AudioCommon/CoreAudioSoundStream.h

@@ -8,7 +8,7 @@
 #include <AudioUnit/AudioUnit.h>
 #endif
 
-#include "SoundStream.h"
+#include "AudioCommon/SoundStream.h"
 
 class CoreAudioSound : public SoundStream
 {

Source/Core/AudioCommon/DPL2Decoder.cpp

@@ -7,13 +7,14 @@
 //  * Copyright (c) 2004-2006 Milan Cutka
 //  * based on mplayer HRTF plugin by ylai
 
+#include <cmath>
+#include <cstdlib>
 #include <functional>
-#include <vector>
-#include <math.h>
-#include <stdlib.h>
 #include <string.h>
-#include "DPL2Decoder.h"
-#include "MathUtil.h"
+#include <vector>
+
+#include "AudioCommon/DPL2Decoder.h"
+#include "Common/MathUtil.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846

Source/Core/AudioCommon/DSoundStream.cpp

@@ -7,8 +7,8 @@
 
 #include <windows.h>
 
-#include "AudioCommon.h"
-#include "DSoundStream.h"
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/DSoundStream.h"
 
 bool DSound::CreateBuffer()
 {

Source/Core/AudioCommon/DSoundStream.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "SoundStream.h"
-#include "Thread.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Thread.h"
 
 #ifdef _WIN32
 #include <Windows.h>

Source/Core/AudioCommon/Mixer.cpp

@@ -2,18 +2,17 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Atomic.h"
-#include "Mixer.h"
-#include "AudioCommon.h"
-#include "CPUDetect.h"
-#include "../Core/Host.h"
-#include "ConfigManager.h"
-#include "HW/VideoInterface.h"
-
-#include "../Core/HW/AudioInterface.h"
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/Mixer.h"
+#include "Common/Atomic.h"
+#include "Common/CPUDetect.h"
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/VideoInterface.h"
 
 // UGLINESS
-#include "../Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PowerPC.h"
 
 #if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
 #include <tmmintrin.h>

Source/Core/AudioCommon/Mixer.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "WaveFile.h"
-#include "StdMutex.h"
+#include "AudioCommon/WaveFile.h"
+#include "Common/StdMutex.h"
 
 // 16 bit Stereo
 #define MAX_SAMPLES     (1024 * 2) // 64ms

Source/Core/AudioCommon/NullSoundStream.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "NullSoundStream.h"
-#include "../Core/HW/SystemTimers.h"
-#include "../Core/HW/AudioInterface.h"
+#include "AudioCommon/NullSoundStream.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/SystemTimers.h"
 
 void NullSound::SoundLoop()
 {

Source/Core/AudioCommon/NullSoundStream.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include "SoundStream.h"
+#include <cstdlib>
+#include "AudioCommon/SoundStream.h"
 
 #define BUF_SIZE (48000 * 4 / 32)
 

Source/Core/AudioCommon/OpenALStream.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "aldlist.h"
-#include "OpenALStream.h"
-#include "DPL2Decoder.h"
+#include "AudioCommon/aldlist.h"
+#include "AudioCommon/DPL2Decoder.h"
+#include "AudioCommon/OpenALStream.h"
 
 #if defined HAVE_OPENAL && HAVE_OPENAL
 

Source/Core/AudioCommon/OpenALStream.h

@@ -4,8 +4,11 @@
 
 #pragma once
 
-#include "SoundStream.h"
-#include "Thread.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Thread.h"
+#include "Core/Core.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/SystemTimers.h"
 
 #if defined HAVE_OPENAL && HAVE_OPENAL
 #ifdef _WIN32
@@ -21,9 +24,6 @@
 #include <AL/alext.h>
 #endif
 
-#include "Core.h"
-#include "HW/SystemTimers.h"
-#include "HW/AudioInterface.h"
 #include <soundtouch/SoundTouch.h>
 #include <soundtouch/STTypes.h>
 

Source/Core/AudioCommon/OpenSLESStream.cpp

@@ -3,13 +3,14 @@
 // Refer to the license.txt file included.
 
 #ifdef ANDROID
-#include "Common.h"
 #include <assert.h>
-#include "OpenSLESStream.h"
 
 #include <SLES/OpenSLES.h>
 #include <SLES/OpenSLES_Android.h>
 
+#include "AudioCommon/OpenSLESStream.h"
+#include "Common/Common.h"
+
 // engine interfaces
 static SLObjectItf engineObject;
 static SLEngineItf engineEngine;

Source/Core/AudioCommon/OpenSLESStream.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "Thread.h"
-#include "SoundStream.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Thread.h"
 
 class OpenSLESStream : public SoundStream
 {

Source/Core/AudioCommon/PulseAudioStream.cpp

@@ -4,10 +4,9 @@
 
 #include <functional>
 
-#include "Common.h"
-#include "Thread.h"
-
-#include "PulseAudioStream.h"
+#include "AudioCommon/PulseAudioStream.h"
+#include "Common/Common.h"
+#include "Common/Thread.h"
 
 namespace
 {

Source/Core/AudioCommon/PulseAudioStream.h

@@ -10,10 +10,9 @@
 
 #include <atomic>
 
-#include "Common.h"
-#include "SoundStream.h"
-
-#include "Thread.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Common.h"
+#include "Common/Thread.h"
 
 class PulseAudio : public SoundStream
 {

Source/Core/AudioCommon/SoundStream.h

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "Common.h"
-#include "Mixer.h"
-#include "WaveFile.h"
+#include "AudioCommon/Mixer.h"
+#include "AudioCommon/WaveFile.h"
+#include "Common/Common.h"
 
 class SoundStream
 {

Source/Core/AudioCommon/WaveFile.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "WaveFile.h"
-#include "../Core/ConfigManager.h"
+#include "AudioCommon/WaveFile.h"
+#include "Common/Common.h"
+#include "Core/ConfigManager.h"
 
 enum {BUF_SIZE = 32*1024};
 

Source/Core/AudioCommon/WaveFile.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
 
 class WaveFileWriter
 {

Source/Core/AudioCommon/XAudio2Stream.cpp

@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <xaudio2.h>
-#include "AudioCommon.h"
-#include "XAudio2Stream.h"
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/XAudio2Stream.h"
 
 #ifndef XAUDIO2_DLL
 #error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path.

Source/Core/AudioCommon/XAudio2Stream.h

@@ -9,8 +9,9 @@
 #pragma once
 
 #include <memory>
-#include "Thread.h"
-#include "SoundStream.h"
+
+#include "AudioCommon/SoundStream.h"
+#include "Common/Thread.h"
 
 #ifdef _WIN32
 

Source/Core/AudioCommon/XAudio2_7Stream.cpp

@@ -7,8 +7,8 @@
 // instead of other possible places. This may be accomplished by adding the path to
 // the AdditionalIncludeDirectories for this file via msbuild.
 
-#include "AudioCommon.h"
-#include "XAudio2_7Stream.h"
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/XAudio2_7Stream.h"
 
 #ifdef HAVE_DXSDK
 #include <dxsdkver.h>

Source/Core/AudioCommon/XAudio2_7Stream.h

@@ -13,8 +13,8 @@
 #pragma once
 
 #include <memory>
-#include "Thread.h"
-#include "SoundStream.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/Thread.h"
 
 #ifdef _WIN32
 

Source/Core/AudioCommon/aldlist.cpp

@@ -22,8 +22,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Common.h"
-#include "aldlist.h"
+#include "AudioCommon/aldlist.h"
+#include "Common/Common.h"
 #ifdef _WIN32
 #include "../../../Externals/OpenAL/include/al.h"
 #include "../../../Externals/OpenAL/include/alc.h"

Source/Core/AudioCommon/aldlist.h

@@ -1,12 +1,14 @@
 #pragma once
 
-#include "CommonTypes.h"
+#include <string>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+
 #ifdef _WIN32
 #pragma warning(disable: 4786)  //disable warning "identifier was truncated to
 								//'255' characters in the browser information"
 #endif
-#include <vector>
-#include <string>
 
 using namespace std;
 

Source/Core/AudioCommon/stdafx.cpp

@@ -2,4 +2,4 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "stdafx.h"
+#include "AudioCommon/stdafx.h"

Source/Core/Common/ArmCPUDetect.cpp

@@ -1,23 +1,10 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "CPUDetect.h"
-#include "FileUtil.h"
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "Common/FileUtil.h"
 
 // Only Linux platforms have /proc/cpuinfo
 #if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)

Source/Core/Common/ArmEmitter.cpp

@@ -1,27 +1,14 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-#include "ArmEmitter.h"
-#include "CPUDetect.h"
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <assert.h>
 #include <stdarg.h>
 
+#include "Common/ArmEmitter.h"
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+
 // For cache flushing on Symbian/iOS/Blackberry
 #ifdef __SYMBIAN32__
 #include <e32std.h>

Source/Core/Common/ArmEmitter.h

@@ -1,4 +1,4 @@
-// Copyright 2013 Dolphin Emulator Project
+// Copyright 2014 Dolphin Emulator Project
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
@@ -6,12 +6,14 @@
 
 #pragma once
 
-#include "Common.h"
-#include "MemoryUtil.h"
+#include <vector>
+
+#include "Common/Common.h"
+#include "Common/MemoryUtil.h"
+
 #if defined(__SYMBIAN32__) || defined(PANDORA)
 #include <signal.h>
 #endif
-#include <vector>
 
 #undef _IP
 #undef R0

Source/Core/Common/Atomic.h

@@ -6,11 +6,11 @@
 
 #ifdef _WIN32
 
-#include "Atomic_Win32.h"
+#include "Common/Atomic_Win32.h"
 
 #else
 
 // GCC-compatible compiler assumed!
-#include "Atomic_GCC.h"
+#include "Common/Atomic_GCC.h"
 
 #endif

Source/Core/Common/Atomic_GCC.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
 // Atomic operations are performed in a single step by the CPU. It is
 // impossible for other threads to see the operation "half-done."

Source/Core/Common/Atomic_Win32.h

@@ -4,10 +4,11 @@
 
 #pragma once
 
-#include "Common.h"
 #include <intrin.h>
 #include <Windows.h>
 
+#include "Common/Common.h"
+
 // Atomic operations are performed in a single step by the CPU. It is
 // impossible for other threads to see the operation "half-done."
 //

Source/Core/Common/BreakPoints.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "DebugInterface.h"
-#include "BreakPoints.h"
-#include "../Core/PowerPC/JitCommon/JitBase.h"
-
 #include <sstream>
 
+#include "Common/BreakPoints.h"
+#include "Common/Common.h"
+#include "Common/DebugInterface.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+
 bool BreakPoints::IsAddressBreakPoint(u32 _iAddress)
 {
 	for (const TBreakPoint& bp : m_BreakPoints)

Source/Core/Common/BreakPoints.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"
 
 class DebugInterface;
 

Source/Core/Common/CDUtils.cpp

@@ -1,13 +1,13 @@
 // Most of the code in this file was shamelessly ripped from libcdio With minor adjustments
 
-#include "CDUtils.h"
-#include "Common.h"
-#include "StringUtil.h"
-
 #include <memory> // for std::unique_ptr
+
+#include "Common/CDUtils.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+
 #ifdef _WIN32
 #include <windows.h>
-#include "StringUtil.h"
 #elif __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOBSD.h>

Source/Core/Common/CDUtils.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
 // Returns a pointer to an array of strings with the device names
 std::vector<std::string> cdio_get_devices();

Source/Core/Common/ChunkFile.h

@@ -13,16 +13,16 @@
 // - Zero backwards/forwards compatibility
 // - Serialization code for anything complex has to be manually written.
 
+#include <deque>
+#include <list>
 #include <map>
 #include <set>
-#include <vector>
-#include <list>
-#include <deque>
 #include <string>
 #include <type_traits>
+#include <vector>
 
-#include "Common.h"
-#include "FileUtil.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
 
 // ewww
 #if _LIBCPP_VERSION

Source/Core/Common/ColorUtil.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "ColorUtil.h"
+#include "Common/ColorUtil.h"
+#include "Common/Common.h"
 
 namespace ColorUtil
 {

Source/Core/Common/ColorUtil.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 namespace ColorUtil
 {
 

Source/Core/Common/Common.h

@@ -7,9 +7,9 @@
 // DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file
 // since it slows down the build a lot.
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 // SVN version number
 extern const char *scm_desc_str;
@@ -45,10 +45,6 @@ private:
 };
 #endif
 
-#include "Log.h"
-#include "CommonTypes.h"
-#include "MsgHandler.h"
-
 #ifdef __APPLE__
 // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
 // This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
@@ -172,4 +168,7 @@ enum EMUSTATE_CHANGE
 	EMUSTATE_CHANGE_STOP
 };
 
-#include "CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/CommonFuncs.h" // NOLINT: needs to be included after CommonTypes
+#include "Common/Log.h"
+#include "Common/MsgHandler.h"

Source/Core/Common/CommonFuncs.h

@@ -11,9 +11,10 @@
 #define SLEEP(x) usleep(x*1000)
 #endif
 
+#include <clocale>
 #include <cstddef>
 #include <type_traits>
-#include "Common.h"
+#include "Common/CommonTypes.h"
 
 // Will fail to compile on a non-array:
 // TODO: make this a function when constexpr is available

Source/Core/Common/CommonPaths.h

@@ -5,7 +5,7 @@
 #pragma once
 
 // Make sure we pick up USER_DIR if set in config.h
-#include "Common.h"
+#include "Common/Common.h"
 
 // Directory seperators, do we need this?
 #define DIR_SEP "/"

Source/Core/Common/CommonTypes.h

@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 
 #ifdef _WIN32
 

Source/Core/Common/Crypto/bn.cpp

@@ -2,10 +2,11 @@
 // Licensed under the terms of the GNU GPL, version 2
 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
+#include <cstdio>
 #include <string.h>
-#include <stdio.h>
-#include "../Common.h"
-#include "tools.h"
+
+#include "Common/Common.h"
+#include "Common/Crypto/tools.h"
 
 /*static void bn_print(char *name, u8 *a, u32 n)
 {

Source/Core/Common/Crypto/ec.cpp

@@ -6,13 +6,13 @@
 // Licensed under the terms of the GNU GPL, version 2
 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 #include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
 
-#include "../Common.h"
-#include "tools.h"
+#include "Common/Common.h"
+#include "Common/Crypto/tools.h"
 // y**2 + x*y = x**3 + x + b
 /*
 static u8 ec_b[30] =

Source/Core/Common/ExtendedTrace.cpp

@@ -14,10 +14,11 @@
 
 #if defined(WIN32)
 
+#include <cstdio>
 #include <windows.h>
-#include <stdio.h>
-#include "ExtendedTrace.h"
-#include "StringUtil.h"
+
+#include "Common/ExtendedTrace.h"
+#include "Common/StringUtil.h"
 using namespace std;
 
 #include <tchar.h>

Source/Core/Common/FPURoundMode.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"
 
 namespace FPURoundMode
 {

Source/Core/Common/FifoQueue.h

@@ -3,7 +3,7 @@
 // a simple lockless thread-safe,
 // single reader, single writer queue
 
-#include "Atomic.h"
+#include "Common/Atomic.h"
 
 namespace Common
 {

Source/Core/Common/FileSearch.cpp

@@ -2,9 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <algorithm>
+
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileSearch.h"
+#include "Common/StringUtil.h"
 
-#include "Common.h"
-#include "CommonPaths.h"
 #ifndef _WIN32
 #include <sys/types.h>
 #include <dirent.h>
@@ -12,11 +16,6 @@
 #include <windows.h>
 #endif
 
-#include <algorithm>
-
-#include "FileSearch.h"
-#include "StringUtil.h"
-
 
 CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)
 {

Source/Core/Common/FileUtil.cpp

@@ -2,36 +2,35 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <algorithm>
+#include <fcntl.h>
+#include <sys/stat.h>
 
-#include "CommonPaths.h"
-#include "FileUtil.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
 
 #ifdef _WIN32
-#include <windows.h>
-#include <shlobj.h>    // for SHGetFolderPath
-#include <shellapi.h>
 #include <commdlg.h>   // for GetSaveFileName
-#include <io.h>
 #include <direct.h>    // getcwd
+#include <io.h>
+#include <shellapi.h>
+#include <shlobj.h>    // for SHGetFolderPath
+#include <windows.h>
 #else
-#include <sys/param.h>
-#include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <libgen.h>
+#include <stdlib.h>
+#include <sys/param.h>
+#include <sys/types.h>
 #endif
-#include <fcntl.h>
 
 #if defined(__APPLE__)
+#include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CFURL.h>
-#include <CoreFoundation/CFBundle.h>
 #endif
 
-#include <algorithm>
-#include <sys/stat.h>
-
 #ifndef S_ISDIR
 #define S_ISDIR(m)  (((m)&S_IFMT) == S_IFDIR)
 #endif

Source/Core/Common/FileUtil.h

@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include <fstream>
 #include <cstdio>
+#include <fstream>
 #include <string>
-#include <vector>
 #include <string.h>
+#include <vector>
 
-#include "Common.h"
-#include "StringUtil.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
 
 // User directory indices for GetUserPath
 enum {

Source/Core/Common/Hash.cpp

@@ -3,9 +3,9 @@
 // Refer to the license.txt file included.
 
 
-#include "Hash.h"
+#include "Common/Hash.h"
 #if _M_SSE >= 0x402
-#include "CPUDetect.h"
+#include "Common/CPUDetect.h"
 #include <nmmintrin.h>
 #endif
 

Source/Core/Common/Hash.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
 u32 HashFletcher(const u8* data_u8, size_t length);  // FAST. Length & 1 == 0.
 u32 HashAdler32(const u8* data, size_t len);         // Fairly accurate, slightly slower

Source/Core/Common/IniFile.cpp

@@ -5,18 +5,17 @@
 
 // see IniFile.h
 
-#include <stdlib.h>
-#include <stdio.h>
-
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
+#include <fstream>
+#include <iostream>
 #include <string>
 #include <vector>
-#include <iostream>
-#include <fstream>
-#include <algorithm>
 
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "IniFile.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
 
 namespace {
 

Source/Core/Common/IniFile.h

@@ -5,11 +5,11 @@
 #pragma once
 
 #include <map>
-#include <string>
 #include <set>
+#include <string>
 #include <vector>
 
-#include "StringUtil.h"
+#include "Common/StringUtil.h"
 
 struct CaseInsensitiveStringCompare
 {

Source/Core/Common/LinearDiskCache.h

@@ -4,9 +4,11 @@
 
 #pragma once
 
-#include "Common.h"
 #include <fstream>
 
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+
 // On disk format:
 //header{
 // u32 'DCAC';

Source/Core/Common/LogManager.cpp

@@ -5,12 +5,12 @@
 #include <algorithm>
 
 #ifdef ANDROID
-#include "Host.h"
+#include "Core/Host.h"
 #endif
-#include "LogManager.h"
-#include "Timer.h"
-#include "Thread.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "Common/LogManager.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
 
 void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
 		const char *file, int line, const char* fmt, ...)

Source/Core/Common/LogManager.h

@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "Log.h"
-#include "StringUtil.h"
-#include "Thread.h"
-#include "FileUtil.h"
-
 #include <set>
 #include <string.h>
 
+#include "Common/FileUtil.h"
+#include "Common/Log.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+
 #define MAX_MESSAGES 8000
 #define MAX_MSGLEN  1024
 

Source/Core/Common/MathUtil.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "MathUtil.h"
-
 #include <cmath>
 #include <numeric>
 
+#include "Common/MathUtil.h"
+
 namespace MathUtil
 {
 

Source/Core/Common/MathUtil.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "Common.h"
-
 #include <vector>
-#include "FPURoundMode.h"
+
+#include "Common/Common.h"
+#include "Common/FPURoundMode.h"
 
 namespace MathUtil
 {

Source/Core/Common/MemArena.cpp

@@ -4,9 +4,9 @@
 
 #include <set>
 
-#include "MemoryUtil.h"
-#include "MemArena.h"
-#include "StringUtil.h"
+#include "Common/MemArena.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
 
 #ifdef _WIN32
 #include <windows.h>

Source/Core/Common/MemArena.h

@@ -8,7 +8,7 @@
 #include <windows.h>
 #endif
 
-#include "Common.h"
+#include "Common/Common.h"
 
 // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
 // Multiple views can mirror the same section of the block, which makes it very convenient for emulating

Source/Core/Common/MemoryUtil.cpp

@@ -3,9 +3,9 @@
 // Refer to the license.txt file included.
 
 
-#include "Common.h"
-#include "MemoryUtil.h"
-#include "StringUtil.h"
+#include "Common/Common.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
 
 #ifdef _WIN32
 #include <windows.h>

Source/Core/Common/Misc.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
+#include "Common/Common.h"
 
 // Neither Android nor OS X support TLS
 #if  defined(__APPLE__) || (ANDROID && __clang__)

Source/Core/Common/MsgHandler.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdio.h> // System
+#include <cstdio>
 
-#include "Common.h" // Local
-#include "StringUtil.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
 
 bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
 static MsgAlertHandler msg_handler = DefaultMsgHandler;

Source/Core/Common/NandPaths.cpp

@@ -2,11 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "NandPaths.h"
 #include <fstream>
 
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+
 namespace Common
 {
 

Source/Core/Common/NandPaths.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <string>
-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"
 
 #define TITLEID_SYSMENU 0x0000000100000002ull
 

Source/Core/Common/SDCardUtil.cpp

@@ -28,15 +28,15 @@
 // A simple and portable piece of code used to generate a blank FAT32 image file.
 // Modified for Dolphin.
 
-#include "SDCardUtil.h"
-#include "FileUtil.h"
-
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
 #include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <errno.h>
+
+#include "Common/FileUtil.h"
+#include "Common/SDCardUtil.h"
 
 #ifndef _WIN32
 #include <unistd.h> // for unlink()

Source/Core/Common/SDCardUtil.h

@@ -4,6 +4,6 @@
 
 #pragma once
 
-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"
 
 bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename);

Source/Core/Common/SettingsHandler.cpp

@@ -4,20 +4,20 @@
 
 // Thanks to Treeki for writing the original class - 29/01/2012
 
-#include "CommonPaths.h"
-#include "Timer.h"
-#include "SettingsHandler.h"
-
-#include <time.h>
+#include <ctime>
 
 #ifdef _WIN32
-#include <Windows.h>
 #include <mmsystem.h>
 #include <sys/timeb.h>
+#include <windows.h>
 #else
 #include <sys/time.h>
 #endif
 
+#include "Common/CommonPaths.h"
+#include "Common/SettingsHandler.h"
+#include "Common/Timer.h"
+
 SettingsHandler::SettingsHandler()
 {
 	Reset();

Source/Core/Common/SettingsHandler.h

@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"
 
 class SettingsHandler
 {

Source/Core/Common/StdConditionVariable.h

@@ -36,7 +36,7 @@
 
 // partial std::condition_variable implementation for win32/pthread
 
-#include "StdMutex.h"
+#include "Common/StdMutex.h"
 
 #if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
 #define USE_RVALUE_REFERENCES

Source/Core/Common/StringUtil.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <algorithm>
+#include <cstdio>
+#include <cstdlib>
 
-#include "CommonPaths.h"
-#include "StringUtil.h"
+#include "Common/CommonPaths.h"
+#include "Common/StringUtil.h"
 
 #ifdef _WIN32
 	#include <Windows.h>

Source/Core/Common/StringUtil.h

@@ -4,14 +4,13 @@
 
 #pragma once
 
-#include <stdarg.h>
-
-#include <vector>
-#include <string>
-#include <sstream>
+#include <cstdarg>
 #include <iomanip>
+#include <sstream>
+#include <string>
+#include <vector>
 
-#include "Common.h"
+#include "Common/Common.h"
 
 std::string StringFromFormat(const char* format, ...)
 #if !defined _WIN32

Source/Core/Common/SymbolDB.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "SymbolDB.h"
+#include "Common/SymbolDB.h"
 
 
 void SymbolDB::List()

Source/Core/Common/SymbolDB.h

@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
-#include "Common.h"
+#include "Common/Common.h"
 
 struct SCall
 {

Source/Core/Common/SysConf.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "FileUtil.h"
-#include "SysConf.h"
-
 #include <cinttypes>
 
+#include "Common/FileUtil.h"
+#include "Common/SysConf.h"
+
 SysConf::SysConf()
 	: m_IsValid(false)
 {

Source/Core/Common/SysConf.h

@@ -7,6 +7,8 @@
 #include <string>
 #include <vector>
 
+#include "Common/Common.h"
+
 // This class is meant to edit the values in a given Wii SYSCONF file
 // It currently does not add/remove/rearrange sections,
 // instead only modifies exiting sections' data

Source/Core/Common/Thread.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Thread.h"
-#include "Common.h"
+#include "Common/Common.h"
+#include "Common/Thread.h"
 
 #ifdef __APPLE__
 #include <mach/mach.h>

Source/Core/Common/Thread.h

@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "StdConditionVariable.h"
-#include "StdMutex.h"
-#include "StdThread.h"
+#include <cstdio>
+#include <cstring>
 
 // Don't include common.h here as it will break LogManager
-#include "CommonTypes.h"
-#include <stdio.h>
-#include <string.h>
+#include "Common/CommonTypes.h"
+#include "Common/StdConditionVariable.h"
+#include "Common/StdMutex.h"
+#include "Common/StdThread.h"
 
 // This may not be defined outside _WIN32
 #ifndef _WIN32

Source/Core/Common/Timer.cpp

@@ -2,19 +2,19 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <time.h>
 #include <cinttypes>
+#include <ctime>
 
 #ifdef _WIN32
-#include <Windows.h>
 #include <mmsystem.h>
 #include <sys/timeb.h>
+#include <windows.h>
 #else
 #include <sys/time.h>
 #endif
 
-#include "Timer.h"
-#include "StringUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Timer.h"
 
 namespace Common
 {

Source/Core/Common/Timer.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "CommonTypes.h"
 #include <string>
+#include "Common/CommonTypes.h"
 
 namespace Common
 {

Source/Core/Common/Version.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
 #include "scmrev.h"
+#include "Common/Common.h"
 
 #ifdef _DEBUG
 	#define BUILD_TYPE_STR "Debug "

Source/Core/Common/stdafx.cpp

@@ -2,4 +2,4 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "stdafx.h"
+#include "Common/stdafx.h"

Source/Core/Common/stdafx.h

@@ -18,7 +18,7 @@
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define _CRT_NONSTDC_NO_DEPRECATE 1
 */
-#include <windows.h>
 #include <tchar.h>
 #include <vector>
+#include <windows.h>
 

Source/Core/Common/x64ABI.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "x64ABI.h"
-#include "x64Emitter.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
 
 using namespace Gen;
 

Source/Core/Common/x64ABI.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
 // x86/x64 ABI:s, and helpers to help follow them when JIT-ing code.
 // All convensions return values in EAX (+ possibly EDX).

Source/Core/Common/x64Analyzer.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "x64Analyzer.h"
+#include "Common/x64Analyzer.h"
 
 bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info)
 {

Source/Core/Common/x64Analyzer.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"
 
 struct InstructionInfo
 {

Source/Core/Common/x64CPUDetect.cpp

@@ -2,8 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <memory.h>
-#include "Common.h"
+#include <memory>
+
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "Common/StringUtil.h"
 
 #ifdef _WIN32
 #define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
@@ -85,10 +88,6 @@ static unsigned long long _xgetbv(unsigned int index)
 
 #endif
 
-#include "Common.h"
-#include "CPUDetect.h"
-#include "StringUtil.h"
-
 CPUInfo cpu_info;
 
 CPUInfo::CPUInfo() {

Source/Core/Common/x64Emitter.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "CPUDetect.h"
-
 #include <cinttypes>
 
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+
 namespace Gen
 {
 

Source/Core/Common/x64Emitter.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "Common.h"
-#include "MemoryUtil.h"
+#include "Common/Common.h"
+#include "Common/MemoryUtil.h"
 
 namespace Gen
 {

Source/Core/Common/x64FPURoundMode.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "FPURoundMode.h"
-#include "CPUDetect.h"
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "Common/FPURoundMode.h"
 
 #ifndef _WIN32
 static const unsigned short FPU_ROUND_NEAR = 0 << 10;

Source/Core/Core/ARDecrypt.cpp

@@ -6,14 +6,14 @@
 // GCNcrypt - Gamecube AR Crypto Program
 // Copyright (C) 2003-2004 Parasyte
 
-
-#include "ARDecrypt.h"
 #include <algorithm>
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
+#include "Core/ARDecrypt.h"
+
 namespace ActionReplay
 {