44 files changed, 201 insertions, 211 deletions

diff --git a/src/common/atomic.h b/src/common/atomic.h
index 883bc14fb..ff2fb23d3 100644
--- a/src/common/atomic.h
+++ b/src/common/atomic.h
@@ -7,12 +7,12 @@
 
 #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
 
diff --git a/src/common/atomic_gcc.h b/src/common/atomic_gcc.h
index 2eb38697b..953c82c6c 100644
--- a/src/common/atomic_gcc.h
+++ b/src/common/atomic_gcc.h
@@ -5,7 +5,7 @@
 #ifndef _ATOMIC_GCC_H_
 #define _ATOMIC_GCC_H_
 
-#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."
diff --git a/src/common/atomic_win32.h b/src/common/atomic_win32.h
index 760b16d4d..f8ec80520 100644
--- a/src/common/atomic_win32.h
+++ b/src/common/atomic_win32.h
@@ -5,7 +5,7 @@
 #ifndef _ATOMIC_WIN32_H_
 #define _ATOMIC_WIN32_H_
 
-#include "common.h"
+#include "common/common.h"
 #include <intrin.h>
 #include <Windows.h>
 
diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp
index 787263f79..25d34a21a 100644
--- a/src/common/break_points.cpp
+++ b/src/common/break_points.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "common.h"
-#include "debug_interface.h"
-#include "break_points.h"
+#include "common/common.h"
+#include "common/debug_interface.h"
+#include "common/break_points.h"
 
 #include <sstream>
 #include <algorithm>
diff --git a/src/common/break_points.h b/src/common/break_points.h
index dc771ba01..46df34665 100644
--- a/src/common/break_points.h
+++ b/src/common/break_points.h
@@ -8,7 +8,7 @@
 #include <vector>
 #include <string>
 
-#include "common.h"
+#include "common/common.h"
 
 class DebugInterface;
 
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index 68c2943ab..a41205857 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -41,8 +41,8 @@
 #endif
 #endif
 
-#include "common.h"
-#include "file_util.h"
+#include "common/common.h"
+#include "common/file_util.h"
 //#include "../ext/snappy/snappy-c.h"
 
 #if defined(IOS) || defined(MACGNUSTD)
diff --git a/src/common/common.h b/src/common/common.h
index 3b71d9b3d..8795c8a0e 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -43,12 +43,12 @@ private:
 };
 #endif
 
-#include "log.h"
-#include "common_types.h"
-#include "msg_handler.h"
-#include "common_funcs.h"
-#include "common_paths.h"
-#include "platform.h"
+#include "common/log.h"
+#include "common/common_types.h"
+#include "common/msg_handler.h"
+#include "common/common_funcs.h"
+#include "common/common_paths.h"
+#include "common/platform.h"
 
 #ifdef __APPLE__
 // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index f9033fa57..32d735a09 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -147,72 +147,71 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="src\atomic.h" />
-    <ClInclude Include="src\atomic_gcc.h" />
-    <ClInclude Include="src\atomic_win32.h" />
-    <ClInclude Include="src\break_points.h" />
-    <ClInclude Include="src\chunk_file.h" />
-    <ClInclude Include="src\common.h" />
-    <ClInclude Include="src\common_funcs.h" />
-    <ClInclude Include="src\common_paths.h" />
-    <ClInclude Include="src\common_types.h" />
-    <ClInclude Include="src\console_listener.h" />
-    <ClInclude Include="src\cpu_detect.h" />
-    <ClInclude Include="src\debug_interface.h" />
-    <ClInclude Include="src\emu_window.h" />
-    <ClInclude Include="src\extended_trace.h" />
-    <ClInclude Include="src\fifo_queue.h" />
-    <ClInclude Include="src\file_search.h" />
-    <ClInclude Include="src\file_util.h" />
-    <ClInclude Include="src\fixed_size_queue.h" />
-    <ClInclude Include="src\hash.h" />
-    <ClInclude Include="src\linear_disk_cache.h" />
-    <ClInclude Include="src\log.h" />
-    <ClInclude Include="src\log_manager.h" />
-    <ClInclude Include="src\math_util.h" />
-    <ClInclude Include="src\memory_util.h" />
-    <ClInclude Include="src\mem_arena.h" />
-    <ClInclude Include="src\msg_handler.h" />
-    <ClInclude Include="src\platform.h" />
-    <ClInclude Include="src\scm_rev.h" />
-    <ClInclude Include="src\std_condition_variable.h" />
-    <ClInclude Include="src\std_mutex.h" />
-    <ClInclude Include="src\std_thread.h" />
-    <ClInclude Include="src\string_util.h" />
-    <ClInclude Include="src\swap.h" />
-    <ClInclude Include="src\thread.h" />
-    <ClInclude Include="src\thunk.h" />
-    <ClInclude Include="src\timer.h" />
-    <ClInclude Include="src\utf8.h" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\break_points.cpp" />
-    <ClCompile Include="src\console_listener.cpp" />
-    <ClCompile Include="src\extended_trace.cpp" />
-    <ClCompile Include="src\file_search.cpp" />
-    <ClCompile Include="src\file_util.cpp" />
-    <ClCompile Include="src\hash.cpp" />
-    <ClCompile Include="src\log_manager.cpp" />
-    <ClCompile Include="src\math_util.cpp" />
-    <ClCompile Include="src\memory_util.cpp" />
-    <ClCompile Include="src\mem_arena.cpp" />
-    <ClCompile Include="src\misc.cpp" />
-    <ClCompile Include="src\msg_handler.cpp" />
-    <ClCompile Include="src\string_util.cpp" />
-    <ClCompile Include="src\thread.cpp" />
-    <ClCompile Include="src\timer.cpp" />
-    <ClCompile Include="src\utf8.cpp" />
-    <ClCompile Include="src\version.cpp" />
+    <ClInclude Include="atomic.h" />
+    <ClInclude Include="atomic_gcc.h" />
+    <ClInclude Include="atomic_win32.h" />
+    <ClInclude Include="break_points.h" />
+    <ClInclude Include="chunk_file.h" />
+    <ClInclude Include="common.h" />
+    <ClInclude Include="common_funcs.h" />
+    <ClInclude Include="common_paths.h" />
+    <ClInclude Include="common_types.h" />
+    <ClInclude Include="console_listener.h" />
+    <ClInclude Include="cpu_detect.h" />
+    <ClInclude Include="debug_interface.h" />
+    <ClInclude Include="emu_window.h" />
+    <ClInclude Include="extended_trace.h" />
+    <ClInclude Include="fifo_queue.h" />
+    <ClInclude Include="file_search.h" />
+    <ClInclude Include="file_util.h" />
+    <ClInclude Include="fixed_size_queue.h" />
+    <ClInclude Include="hash.h" />
+    <ClInclude Include="linear_disk_cache.h" />
+    <ClInclude Include="log.h" />
+    <ClInclude Include="log_manager.h" />
+    <ClInclude Include="math_util.h" />
+    <ClInclude Include="memory_util.h" />
+    <ClInclude Include="mem_arena.h" />
+    <ClInclude Include="msg_handler.h" />
+    <ClInclude Include="platform.h" />
+    <ClInclude Include="std_condition_variable.h" />
+    <ClInclude Include="std_mutex.h" />
+    <ClInclude Include="std_thread.h" />
+    <ClInclude Include="string_util.h" />
+    <ClInclude Include="swap.h" />
+    <ClInclude Include="thread.h" />
+    <ClInclude Include="thunk.h" />
+    <ClInclude Include="timer.h" />
+    <ClInclude Include="utf8.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <ClCompile Include="break_points.cpp" />
+    <ClCompile Include="console_listener.cpp" />
+    <ClCompile Include="extended_trace.cpp" />
+    <ClCompile Include="file_search.cpp" />
+    <ClCompile Include="file_util.cpp" />
+    <ClCompile Include="hash.cpp" />
+    <ClCompile Include="log_manager.cpp" />
+    <ClCompile Include="math_util.cpp" />
+    <ClCompile Include="memory_util.cpp" />
+    <ClCompile Include="mem_arena.cpp" />
+    <ClCompile Include="misc.cpp" />
+    <ClCompile Include="msg_handler.cpp" />
+    <ClCompile Include="string_util.cpp" />
+    <ClCompile Include="thread.cpp" />
+    <ClCompile Include="timer.cpp" />
+    <ClCompile Include="utf8.cpp" />
+    <ClCompile Include="version.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index ccc15d613..3bdaa973f 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -1,64 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="src\break_points.cpp" />
-    <ClCompile Include="src\console_listener.cpp" />
-    <ClCompile Include="src\extended_trace.cpp" />
-    <ClCompile Include="src\file_search.cpp" />
-    <ClCompile Include="src\file_util.cpp" />
-    <ClCompile Include="src\hash.cpp" />
-    <ClCompile Include="src\log_manager.cpp" />
-    <ClCompile Include="src\math_util.cpp" />
-    <ClCompile Include="src\memory_util.cpp" />
-    <ClCompile Include="src\mem_arena.cpp" />
-    <ClCompile Include="src\misc.cpp" />
-    <ClCompile Include="src\msg_handler.cpp" />
-    <ClCompile Include="src\string_util.cpp" />
-    <ClCompile Include="src\thread.cpp" />
-    <ClCompile Include="src\timer.cpp" />
-    <ClCompile Include="src\version.cpp" />
-    <ClCompile Include="src\utf8.cpp" />
+    <ClInclude Include="atomic.h" />
+    <ClInclude Include="atomic_gcc.h" />
+    <ClInclude Include="atomic_win32.h" />
+    <ClInclude Include="break_points.h" />
+    <ClInclude Include="chunk_file.h" />
+    <ClInclude Include="common.h" />
+    <ClInclude Include="common_funcs.h" />
+    <ClInclude Include="common_paths.h" />
+    <ClInclude Include="common_types.h" />
+    <ClInclude Include="console_listener.h" />
+    <ClInclude Include="cpu_detect.h" />
+    <ClInclude Include="debug_interface.h" />
+    <ClInclude Include="emu_window.h" />
+    <ClInclude Include="extended_trace.h" />
+    <ClInclude Include="fifo_queue.h" />
+    <ClInclude Include="file_search.h" />
+    <ClInclude Include="file_util.h" />
+    <ClInclude Include="fixed_size_queue.h" />
+    <ClInclude Include="hash.h" />
+    <ClInclude Include="linear_disk_cache.h" />
+    <ClInclude Include="log.h" />
+    <ClInclude Include="log_manager.h" />
+    <ClInclude Include="math_util.h" />
+    <ClInclude Include="mem_arena.h" />
+    <ClInclude Include="memory_util.h" />
+    <ClInclude Include="msg_handler.h" />
+    <ClInclude Include="platform.h" />
+    <ClInclude Include="std_condition_variable.h" />
+    <ClInclude Include="std_mutex.h" />
+    <ClInclude Include="std_thread.h" />
+    <ClInclude Include="string_util.h" />
+    <ClInclude Include="swap.h" />
+    <ClInclude Include="thread.h" />
+    <ClInclude Include="thunk.h" />
+    <ClInclude Include="timer.h" />
+    <ClInclude Include="utf8.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\atomic.h" />
-    <ClInclude Include="src\break_points.h" />
-    <ClInclude Include="src\chunk_file.h" />
-    <ClInclude Include="src\common.h" />
-    <ClInclude Include="src\common_funcs.h" />
-    <ClInclude Include="src\common_paths.h" />
-    <ClInclude Include="src\common_types.h" />
-    <ClInclude Include="src\console_listener.h" />
-    <ClInclude Include="src\cpu_detect.h" />
-    <ClInclude Include="src\debug_interface.h" />
-    <ClInclude Include="src\extended_trace.h" />
-    <ClInclude Include="src\fifo_queue.h" />
-    <ClInclude Include="src\file_search.h" />
-    <ClInclude Include="src\file_util.h" />
-    <ClInclude Include="src\fixed_size_queue.h" />
-    <ClInclude Include="src\hash.h" />
-    <ClInclude Include="src\linear_disk_cache.h" />
-    <ClInclude Include="src\log.h" />
-    <ClInclude Include="src\log_manager.h" />
-    <ClInclude Include="src\math_util.h" />
-    <ClInclude Include="src\memory_util.h" />
-    <ClInclude Include="src\mem_arena.h" />
-    <ClInclude Include="src\msg_handler.h" />
-    <ClInclude Include="src\scm_rev.h" />
-    <ClInclude Include="src\std_condition_variable.h" />
-    <ClInclude Include="src\std_mutex.h" />
-    <ClInclude Include="src\std_thread.h" />
-    <ClInclude Include="src\string_util.h" />
-    <ClInclude Include="src\thread.h" />
-    <ClInclude Include="src\thunk.h" />
-    <ClInclude Include="src\timer.h" />
-    <ClInclude Include="src\atomic_gcc.h" />
-    <ClInclude Include="src\atomic_win32.h" />
-    <ClInclude Include="src\emu_window.h" />
-    <ClInclude Include="src\platform.h" />
-    <ClInclude Include="src\swap.h" />
-    <ClInclude Include="src\utf8.h" />
+    <ClCompile Include="break_points.cpp" />
+    <ClCompile Include="console_listener.cpp" />
+    <ClCompile Include="extended_trace.cpp" />
+    <ClCompile Include="file_search.cpp" />
+    <ClCompile Include="file_util.cpp" />
+    <ClCompile Include="hash.cpp" />
+    <ClCompile Include="log_manager.cpp" />
+    <ClCompile Include="math_util.cpp" />
+    <ClCompile Include="mem_arena.cpp" />
+    <ClCompile Include="memory_util.cpp" />
+    <ClCompile Include="misc.cpp" />
+    <ClCompile Include="msg_handler.cpp" />
+    <ClCompile Include="string_util.cpp" />
+    <ClCompile Include="thread.cpp" />
+    <ClCompile Include="timer.cpp" />
+    <ClCompile Include="utf8.cpp" />
+    <ClCompile Include="version.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index 9ccb87d82..252e93fa9 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -6,7 +6,7 @@
 #define _COMMON_PATHS_H_
 
 // 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 "/"
diff --git a/src/common/common_types.h b/src/common/common_types.h
index af1cd0e21..4289b88d3 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -62,7 +62,7 @@ typedef signed long long    s64;    ///< 64-bit signed int
 typedef float   f32;    ///< 32-bit floating point
 typedef double  f64;    ///< 64-bit floating point
 
-#include "swap.h"
+#include "common/swap.h"
 
 /// Union for fast 16-bit type casting
 union t16 {
diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp
index 270ad9ce9..b5f32d1bd 100644
--- a/src/common/console_listener.cpp
+++ b/src/common/console_listener.cpp
@@ -13,9 +13,9 @@
 #include <stdarg.h>
 #endif
 
-#include "common.h"
-#include "log_manager.h" // Common
-#include "console_listener.h" // Common
+#include "common/common.h"
+#include "common/log_manager.h" // Common
+#include "common/console_listener.h" // Common
 
 ConsoleListener::ConsoleListener()
 {
diff --git a/src/common/console_listener.h b/src/common/console_listener.h
index a2936050d..224d17017 100644
--- a/src/common/console_listener.h
+++ b/src/common/console_listener.h
@@ -5,7 +5,7 @@
 #ifndef _CONSOLELISTENER_H
 #define _CONSOLELISTENER_H
 
-#include "log_manager.h"
+#include "common/log_manager.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index f49367057..7f68c9237 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -25,7 +25,7 @@
 #ifndef CORE_EMUWINDOW_H_
 #define CORE_EMUWINDOW_H_
 
-#include "common.h"
+#include "common/common.h"
 
 //namespace input_common
 //{
diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp
index 9f717dba3..77425bd0d 100644
--- a/src/common/extended_trace.cpp
+++ b/src/common/extended_trace.cpp
@@ -16,8 +16,8 @@
 
 #include <windows.h>
 #include <stdio.h>
-#include "extended_trace.h"
-#include "string_util.h"
+#include "common/extended_trace.h"
+#include "common/string_util.h"
 using namespace std;
 
 #include <tchar.h>
diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h
index 57efcd839..4e80f53b4 100644
--- a/src/common/fifo_queue.h
+++ b/src/common/fifo_queue.h
@@ -5,7 +5,7 @@
 // a simple lockless thread-safe,
 // single reader, single writer queue
 
-#include "atomic.h"
+#include "common/atomic.h"
 
 namespace Common
 {
diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp
index 59f640109..a9d19477d 100644
--- a/src/common/file_search.cpp
+++ b/src/common/file_search.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 
-#include "common.h"
-#include "common_paths.h"
+#include "common/common.h"
+#include "common/common_paths.h"
 #ifndef _WIN32
 #include <sys/types.h>
 #include <dirent.h>
@@ -15,9 +15,8 @@
 #include <string>
 #include <algorithm>
 
-#include "file_search.h"
-
-#include "string_util.h"
+#include "common/file_search.h"
+#include "common/string_util.h"
 
 
 CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 8b47cb3e5..d36304d91 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -3,10 +3,10 @@
 // Refer to the license.txt file included.
 
 
-#include "common.h"
-#include "common_paths.h"
-#include "file_util.h"
-#include "string_util.h"
+#include "common/common.h"
+#include "common/common_paths.h"
+#include "common/file_util.h"
+#include "common/string_util.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -32,7 +32,7 @@
 #include <algorithm>
 #include <sys/stat.h>
 
-#include "string_util.h"
+#include "common/string_util.h"
 
 #ifndef S_ISDIR
 #define S_ISDIR(m)  (((m)&S_IFMT) == S_IFDIR)
diff --git a/src/common/file_util.h b/src/common/file_util.h
index f4ef949d8..5edb43f6a 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -12,8 +12,8 @@
 #include <vector>
 #include <string.h>
 
-#include "common.h"
-#include "string_util.h"
+#include "common/common.h"
+#include "common/string_util.h"
 
 // User directory indices for GetUserPath
 enum {
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 5303f07b5..d2ebc7341 100644
--- a/src/common/hash.cpp
+++ b/src/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 "cpu_detect.h"
+#include "common/cpu_detect.h"
 #include <nmmintrin.h>
 #endif
 
diff --git a/src/common/hash.h b/src/common/hash.h
index addfa4b5f..c69908415 100644
--- a/src/common/hash.h
+++ b/src/common/hash.h
@@ -6,7 +6,7 @@
 #ifndef _HASH_H_
 #define _HASH_H_
 
-#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
diff --git a/src/common/linear_disk_cache.h b/src/common/linear_disk_cache.h
index da5d6b9b4..a24687615 100644
--- a/src/common/linear_disk_cache.h
+++ b/src/common/linear_disk_cache.h
@@ -6,7 +6,7 @@
 #ifndef _LINEAR_DISKCACHE
 #define _LINEAR_DISKCACHE
 
-#include "common.h"
+#include "common/common.h"
 #include <fstream>
 
 // defined in Version.cpp
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index b5b034846..245760d0d 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -4,14 +4,11 @@
 
 #include <algorithm>
 
-#ifdef ANDROID
-#include "Host.h"
-#endif
-#include "log_manager.h"
-#include "console_listener.h"
-#include "timer.h"
-#include "thread.h"
-#include "file_util.h"
+#include "common/log_manager.h"
+#include "common/console_listener.h"
+#include "common/timer.h"
+#include "common/thread.h"
+#include "common/file_util.h"
 
 void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 
         const char *file, int line, const char* fmt, ...)
diff --git a/src/common/log_manager.h b/src/common/log_manager.h
index 579198ff6..580860b4d 100644
--- a/src/common/log_manager.h
+++ b/src/common/log_manager.h
@@ -5,10 +5,10 @@
 #ifndef _LOGMANAGER_H_
 #define _LOGMANAGER_H_
 
-#include "log.h"
-#include "string_util.h"
-#include "thread.h"
-#include "file_util.h"
+#include "common/log.h"
+#include "common/string_util.h"
+#include "common/thread.h"
+#include "common/file_util.h"
 
 #include <set>
 #include <string.h>
diff --git a/src/common/math_util.cpp b/src/common/math_util.cpp
index da90f8d74..82eceab00 100644
--- a/src/common/math_util.cpp
+++ b/src/common/math_util.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 
-#include "common.h"
-#include "math_util.h"
+#include "common/common.h"
+#include "common/math_util.h"
 
 #include <cmath>
 #include <numeric>
diff --git a/src/common/math_util.h b/src/common/math_util.h
index 4410c5e01..9167d2012 100644
--- a/src/common/math_util.h
+++ b/src/common/math_util.h
@@ -6,7 +6,7 @@
 #ifndef _MATH_UTIL_H_
 #define _MATH_UTIL_H_
 
-#include "common.h"
+#include "common/common.h"
 
 #include <vector>
 
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index 1a6fcf44d..b918eb568 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -17,12 +17,10 @@
 
 #include <string>
 
-#include "memory_util.h"
-#include "mem_arena.h"
+#include "common/memory_util.h"
+#include "common/mem_arena.h"
 
-#ifdef _WIN32
-//#include "CommonWindows.h"
-#else
+#ifndef _WIN32
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/common/mem_arena.h b/src/common/mem_arena.h
index 8bdf9f189..667efbea9 100644
--- a/src/common/mem_arena.h
+++ b/src/common/mem_arena.h
@@ -26,7 +26,7 @@
 #include <e32std.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 convient for emulating
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index cc6e77b35..71ef159c3 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -3,9 +3,9 @@
 // Refer to the license.txt file included.
 
 
-#include "common.h"
-#include "memory_util.h"
-#include "string_util.h"
+#include "common/common.h"
+#include "common/memory_util.h"
+#include "common/string_util.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 935805478..cf6df44e8 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "common.h"
+#include "common/common.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/common/msg_handler.cpp b/src/common/msg_handler.cpp
index 8e9fe218e..c1386cdaa 100644
--- a/src/common/msg_handler.cpp
+++ b/src/common/msg_handler.cpp
@@ -4,8 +4,8 @@
 
 #include <stdio.h> // System
 
-#include "common.h" // Local
-#include "string_util.h"
+#include "common/common.h" // Local
+#include "common/string_util.h"
 
 bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
 static MsgAlertHandler msg_handler = DefaultMsgHandler;
diff --git a/src/common/platform.h b/src/common/platform.h
index 84c6b6365..633f1d694 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -25,7 +25,7 @@
 #ifndef COMMON_PLATFORM_H_
 #define COMMON_PLATFORM_H_
 
-#include "common_types.h"
+#include "common/common_types.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Platform definitions
diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj
index d2d9b7fbb..6b81c9055 100644
--- a/src/common/scm_rev_gen.vcxproj
+++ b/src/common/scm_rev_gen.vcxproj
@@ -19,12 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <None Include="scm_rev_gen.js">
-    </None>
+    <ClInclude Include="force_rebuild.h" />
+    <ClInclude Include="scm_rev.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="force_rebuild.h" />
-    <ClInclude Include="src\scm_rev.h" />
+    <None Include="scm_rev_gen.js" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid>
diff --git a/src/common/std_condition_variable.h b/src/common/std_condition_variable.h
index cee7a9dcd..8964b4f6f 100644
--- a/src/common/std_condition_variable.h
+++ b/src/common/std_condition_variable.h
@@ -29,7 +29,7 @@
 
 // partial std::condition_variable implementation for win32/pthread
 
-#include "std_mutex.h"
+#include "common/std_mutex.h"
 
 #if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
 #define USE_RVALUE_REFERENCES
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 415dcbbc7..a99644f11 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -6,9 +6,9 @@
 #include <stdio.h>
 #include <algorithm>
 
-#include "common.h"
-#include "common_paths.h"
-#include "string_util.h"
+#include "common/common.h"
+#include "common/common_paths.h"
+#include "common/string_util.h"
 
 #ifdef _WIN32
     #include <Windows.h>
diff --git a/src/common/string_util.h b/src/common/string_util.h
index fcbae4715..6b7e84797 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -12,7 +12,7 @@
 #include <sstream>
 #include <iomanip>
 
-#include "common.h"
+#include "common/common.h"
 
 std::string StringFromFormat(const char* format, ...);
 // Cheap!
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 27dbf3f93..c70ee37cf 100644
--- a/src/common/thread.cpp
+++ b/src/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/thread.h"
+#include "common/common.h"
 
 #ifdef __APPLE__
 #include <mach/mach.h>
diff --git a/src/common/thread.h b/src/common/thread.h
index 6384a44a1..d72ac7b47 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -5,12 +5,12 @@
 #ifndef _THREAD_H_
 #define _THREAD_H_
 
-#include "std_condition_variable.h"
-#include "std_mutex.h"
-#include "std_thread.h"
+#include "common/std_condition_variable.h"
+#include "common/std_mutex.h"
+#include "common/std_thread.h"
 
 // Don't include common.h here as it will break LogManager
-#include "common_types.h"
+#include "common/common_types.h"
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/common/thunk.h b/src/common/thunk.h
index c9e6fd39f..2c2f23cd0 100644
--- a/src/common/thunk.h
+++ b/src/common/thunk.h
@@ -7,8 +7,7 @@
 
 #include <map>
 
-#include "common.h"
-#include "x64Emitter.h"
+#include "common/common.h"
 
 // This simple class creates a wrapper around a C/C++ function that saves all fp state
 // before entering it, and restores it upon exit. This is required to be able to selectively
diff --git a/src/common/timer.cpp b/src/common/timer.cpp
index 90604292e..f8e1fadca 100644
--- a/src/common/timer.cpp
+++ b/src/common/timer.cpp
@@ -12,9 +12,9 @@
 #include <sys/time.h>
 #endif
 
-#include "common.h"
-#include "timer.h"
-#include "string_util.h"
+#include "common/common.h"
+#include "common/timer.h"
+#include "common/string_util.h"
 
 namespace Common
 {
diff --git a/src/common/timer.h b/src/common/timer.h
index 20c86762a..cfa5cf609 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -5,7 +5,7 @@
 #ifndef _TIMER_H_
 #define _TIMER_H_
 
-#include "common.h"
+#include "common/common.h"
 #include <string>
 
 namespace Common
diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp
index 9aa8088ef..fe5270183 100644
--- a/src/common/utf8.cpp
+++ b/src/common/utf8.cpp
@@ -26,8 +26,8 @@
 #include <algorithm>
 #include <string>
 
-#include "common_types.h"
-#include "utf8.h"
+#include "common/common_types.h"
+#include "common/utf8.h"
 
 // is start of UTF sequence
 inline bool isutf(char c) {
diff --git a/src/common/utf8.h b/src/common/utf8.h
index 36cf75713..6479ec5ad 100644
--- a/src/common/utf8.h
+++ b/src/common/utf8.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "common_types.h"
+#include "common/common_types.h"
 #include <string>
 
 u32 u8_nextchar(const char *s, int *i);
diff --git a/src/common/version.cpp b/src/common/version.cpp
index 01890dbb6..f0df884d7 100644
--- a/src/common/version.cpp
+++ b/src/common/version.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "common.h"
-#include "scm_rev.h"
+#include "common/common.h"
+#include "common/scm_rev.h"
 
 #ifdef _DEBUG
     #define BUILD_TYPE_STR "Debug "