diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b8a4e8706..a723ae2626 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -460,6 +460,8 @@ add_library(Common STATIC
 	Common/ThreadSafeList.h
 	Common/Timer.cpp
 	Common/Timer.h
+	Common/TimeUtil.cpp
+	Common/TimeUtil.h
 )
 
 add_subdirectory(ext)
@@ -935,8 +937,6 @@ add_library(native STATIC
 	ext/native/base/linked_ptr.h
 	ext/native/base/stringutil.cpp
 	ext/native/base/stringutil.h
-	ext/native/base/timeutil.cpp
-	ext/native/base/timeutil.h
 	ext/native/data/base64.cpp
 	ext/native/data/base64.h
 	ext/native/data/compression.cpp
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index 40a9f61a06..cfe40b4cf4 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -417,6 +417,7 @@
     <ClInclude Include="ThreadSafeList.h" />
     <ClInclude Include="Thunk.h" />
     <ClInclude Include="Timer.h" />
+    <ClInclude Include="TimeUtil.h" />
     <ClInclude Include="Vulkan\VulkanContext.h" />
     <ClInclude Include="Vulkan\VulkanDebug.h" />
     <ClInclude Include="Vulkan\VulkanImage.h" />
@@ -513,6 +514,7 @@
     <ClCompile Include="ThreadPools.cpp" />
     <ClCompile Include="Thunk.cpp" />
     <ClCompile Include="Timer.cpp" />
+    <ClCompile Include="TimeUtil.cpp" />
     <ClCompile Include="Vulkan\VulkanContext.cpp" />
     <ClCompile Include="Vulkan\VulkanDebug.cpp" />
     <ClCompile Include="Vulkan\VulkanImage.cpp" />
diff --git a/ext/native/base/timeutil.cpp b/Common/TimeUtil.cpp
similarity index 98%
rename from ext/native/base/timeutil.cpp
rename to Common/TimeUtil.cpp
index c2446c3989..54832e853e 100644
--- a/ext/native/base/timeutil.cpp
+++ b/Common/TimeUtil.cpp
@@ -1,7 +1,7 @@
 #include <cstdio>
 
 #include "base/basictypes.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/ext/native/base/timeutil.h b/Common/TimeUtil.h
similarity index 100%
rename from ext/native/base/timeutil.h
rename to Common/TimeUtil.h
diff --git a/Common/Vulkan/VulkanMemory.cpp b/Common/Vulkan/VulkanMemory.cpp
index 062472c377..5a5cec031b 100644
--- a/Common/Vulkan/VulkanMemory.cpp
+++ b/Common/Vulkan/VulkanMemory.cpp
@@ -18,10 +18,10 @@
 // Additionally, Common/Vulkan/* , including this file, are also licensed
 // under the public domain.
 
-#include "base/timeutil.h"
 #include "math/math_util.h"
 
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 #include "Common/Vulkan/VulkanMemory.h"
 
 VulkanPushBuffer::VulkanPushBuffer(VulkanContext *vulkan, size_t size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memoryPropertyMask)
diff --git a/Core/Core.cpp b/Core/Core.cpp
index acb1ad44c6..6c1952d47e 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -24,7 +24,7 @@
 
 #include "base/NativeApp.h"
 #include "base/display.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "thread/threadutil.h"
 #include "profiler/profiler.h"
 
diff --git a/Core/FileLoaders/CachingFileLoader.cpp b/Core/FileLoaders/CachingFileLoader.cpp
index f161574916..4902af5a33 100644
--- a/Core/FileLoaders/CachingFileLoader.cpp
+++ b/Core/FileLoaders/CachingFileLoader.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 
 #include "thread/threadutil.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "Core/FileLoaders/CachingFileLoader.h"
 
 // Takes ownership of backend.
diff --git a/Core/FileLoaders/RamCachingFileLoader.cpp b/Core/FileLoaders/RamCachingFileLoader.cpp
index bc99ad80f0..e575b21b72 100644
--- a/Core/FileLoaders/RamCachingFileLoader.cpp
+++ b/Core/FileLoaders/RamCachingFileLoader.cpp
@@ -20,8 +20,8 @@
 #include <cstring>
 #include <cstdlib>
 
-#include "base/timeutil.h"
 #include "thread/threadutil.h"
+#include "Common/TimeUtil.h"
 #include "Core/FileLoaders/RamCachingFileLoader.h"
 
 #include "Common/Log.h"
diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
index d83c9e3fe5..b0b29575bb 100644
--- a/Core/HLE/HLE.cpp
+++ b/Core/HLE/HLE.cpp
@@ -20,11 +20,11 @@
 #include <vector>
 #include <string>
 
-#include "base/timeutil.h"
 #include "profiler/profiler.h"
 
 #include "Common/Log.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index 681e11e493..3a803c6d0a 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -31,9 +31,13 @@
 #endif
 
 #include <cstring>
-#include "util/text/parsers.h"
+
+#include "i18n/i18n.h"
 #include "thread/threadutil.h"
+#include "util/text/parsers.h"
+
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/HLE/sceKernelInterrupt.h"
@@ -41,7 +45,6 @@
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/Instance.h"
 #include "proAdhoc.h" 
-#include "i18n/i18n.h"
 
 uint16_t portOffset;
 uint32_t minSocketTimeoutUS;
diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
index e5d39745ee..74aa597446 100644
--- a/Core/HLE/proAdhoc.h
+++ b/Core/HLE/proAdhoc.h
@@ -41,7 +41,6 @@
 #include <thread>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "net/resolve.h"
 #include "Common/Serialize/Serializer.h"
 
diff --git a/Core/HLE/proAdhocServer.cpp b/Core/HLE/proAdhocServer.cpp
index 85d4f2d56a..ef507310ab 100644
--- a/Core/HLE/proAdhocServer.cpp
+++ b/Core/HLE/proAdhocServer.cpp
@@ -43,14 +43,16 @@
 #include <fcntl.h>
 #include <errno.h>
 //#include <sqlite3.h>
+
+#include "i18n/i18n.h"
 #include "thread/threadutil.h"
+
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/Util/PortManager.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/HLE/proAdhocServer.h"
-#include "i18n/i18n.h"
-
 
 // User Count
 uint32_t _db_user_count = 0;
diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
index 406c757635..01c07a5182 100644
--- a/Core/HLE/sceDisplay.cpp
+++ b/Core/HLE/sceDisplay.cpp
@@ -26,7 +26,6 @@
 #include <sys/time.h>
 #endif
 
-#include "base/timeutil.h"
 #include "i18n/i18n.h"
 #include "profiler/profiler.h"
 
@@ -35,6 +34,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/CoreParameter.h"
diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp
index 4577aa5d83..dbf0bebf34 100644
--- a/Core/HLE/sceFont.cpp
+++ b/Core/HLE/sceFont.cpp
@@ -1,6 +1,6 @@
 #include "sceFont.h"
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 
 #include <cmath>
 #include <vector>
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
index 05e5e663c0..8c559e689a 100644
--- a/Core/HLE/sceNetAdhoc.cpp
+++ b/Core/HLE/sceNetAdhoc.cpp
@@ -31,6 +31,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"
+#include "Common/TimeUtil.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/Util/PortManager.h"
 
diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp
index f9ad48aa7e..5fc8d372ce 100644
--- a/Core/HLE/sceRtc.cpp
+++ b/Core/HLE/sceRtc.cpp
@@ -24,10 +24,10 @@
 #endif
 
 #include <time.h>
-#include "base/timeutil.h"
 
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"
diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp
index 5075465589..d130079033 100644
--- a/Core/HW/StereoResampler.cpp
+++ b/Core/HW/StereoResampler.cpp
@@ -35,11 +35,11 @@
 #include <cstring>
 #include <atomic>
 
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
-#include "Common/Serialize/Serializer.h"
 #include "Common/MathUtil.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/HW/StereoResampler.h"
diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp
index d52c2ffebd..10b9720281 100644
--- a/Core/MIPS/MIPSAnalyst.cpp
+++ b/Core/MIPS/MIPSAnalyst.cpp
@@ -21,9 +21,9 @@
 #include <unordered_set>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "ext/cityhash/city.h"
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
index 42ec9b289b..8c5fb1fd0c 100644
--- a/Core/SaveState.cpp
+++ b/Core/SaveState.cpp
@@ -20,7 +20,6 @@
 #include <thread>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "base/stringutil.h"
 #include "i18n/i18n.h"
 #include "thread/threadutil.h"
@@ -29,6 +28,7 @@
 #include "Common/FileUtil.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 
 #include "Core/SaveState.h"
 #include "Core/Config.h"
diff --git a/Core/System.cpp b/Core/System.cpp
index f64754e22d..29fc5e0a30 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -32,13 +32,13 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
 #include "math/math_util.h"
 #include "thread/threadutil.h"
 #include "util/text/utf8.h"
 
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Common/GraphicsContext.h"
 #include "Core/MemFault.h"
 #include "Core/HDRemaster.h"
diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp
index f1ed937836..75218d13f1 100644
--- a/Core/Util/PortManager.cpp
+++ b/Core/Util/PortManager.cpp
@@ -29,7 +29,7 @@
 #include <cstring>
 #include <string>
 #include <thread>
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "i18n/i18n.h"
 #include "net/resolve.h"
 #include "thread/threadutil.h"
diff --git a/Core/WebServer.cpp b/Core/WebServer.cpp
index eab106add0..4697de3de0 100644
--- a/Core/WebServer.cpp
+++ b/Core/WebServer.cpp
@@ -20,13 +20,13 @@
 #include <thread>
 #include <unordered_map>
 #include "base/stringutil.h"
-#include "base/timeutil.h"
 #include "file/fd_util.h"
 #include "net/http_client.h"
 #include "net/http_server.h"
 #include "net/sinks.h"
 #include "thread/threadutil.h"
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Common/Log.h"
 #include "Core/Config.h"
 #include "Core/Debugger/WebSocket.h"
diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp
index 9ef488ffda..a1fd204c6a 100644
--- a/GPU/Common/PresentationCommon.cpp
+++ b/GPU/Common/PresentationCommon.cpp
@@ -21,11 +21,11 @@
 #include <cstdint>
 
 #include "base/display.h"
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
 #include "thin3d/thin3d.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/Host.h"
diff --git a/GPU/Common/TextureScalerCommon.cpp b/GPU/Common/TextureScalerCommon.cpp
index ca40ba50c9..4b9bf8f307 100644
--- a/GPU/Common/TextureScalerCommon.cpp
+++ b/GPU/Common/TextureScalerCommon.cpp
@@ -47,7 +47,7 @@
 //#define DEBUG_SCALER_OUTPUT
 
 #ifdef SCALING_MEASURE_TIME
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #endif
 
 /////////////////////////////////////// Helper Functions (mostly math for parallelization)
diff --git a/GPU/D3D11/DrawEngineD3D11.cpp b/GPU/D3D11/DrawEngineD3D11.cpp
index a4780b0b80..0e5b8444a7 100644
--- a/GPU/D3D11/DrawEngineD3D11.cpp
+++ b/GPU/D3D11/DrawEngineD3D11.cpp
@@ -17,10 +17,9 @@
 
 #include <algorithm>
 
-#include "base/timeutil.h"
-
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"
diff --git a/GPU/Directx9/DrawEngineDX9.cpp b/GPU/Directx9/DrawEngineDX9.cpp
index a10a6fca2d..376339c7d4 100644
--- a/GPU/Directx9/DrawEngineDX9.cpp
+++ b/GPU/Directx9/DrawEngineDX9.cpp
@@ -15,10 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "base/timeutil.h"
-
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"
diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp
index e245fe3112..215d80c07a 100644
--- a/GPU/GLES/DrawEngineGLES.cpp
+++ b/GPU/GLES/DrawEngineGLES.cpp
@@ -15,9 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "base/timeutil.h"
-
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"
diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp
index 58001193b8..58a344b55e 100644
--- a/GPU/GLES/ShaderManagerGLES.cpp
+++ b/GPU/GLES/ShaderManagerGLES.cpp
@@ -24,7 +24,6 @@
 #include <map>
 
 #include "math/dataconv.h"
-#include "base/timeutil.h"
 #include "gfx/gl_debug_log.h"
 #include "gfx_es2/gpu_features.h"
 #include "i18n/i18n.h"
@@ -36,6 +35,7 @@
 
 #include "Common/Log.h"
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/Host.h"
 #include "Core/Reporting.h"
diff --git a/GPU/GPU.cpp b/GPU/GPU.cpp
index 2a0bee4842..f731ee6cbb 100644
--- a/GPU/GPU.cpp
+++ b/GPU/GPU.cpp
@@ -17,7 +17,7 @@
 
 #include "ppsspp_config.h"
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "Common/GraphicsContext.h"
 #include "Core/Core.h"
 
diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 4b8d995983..32bcb5ec66 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -2,7 +2,6 @@
 #include <type_traits>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "profiler/profiler.h"
 
 #include "Common/ColorConv.h"
@@ -10,6 +9,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeList.h"
+#include "Common/TimeUtil.h"
 #include "Core/Reporting.h"
 #include "GPU/GeDisasm.h"
 #include "GPU/GPU.h"
diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp
index 963fa0f0a6..b241affff0 100644
--- a/GPU/Vulkan/DrawEngineVulkan.cpp
+++ b/GPU/Vulkan/DrawEngineVulkan.cpp
@@ -17,13 +17,13 @@
 
 #include <cassert>
 
-#include "base/timeutil.h"
 #include "math/dataconv.h"
 #include "profiler/profiler.h"
 #include "thin3d/VulkanRenderManager.h"
 
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"
diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
index c2ba043348..93488cfc55 100644
--- a/GPU/Vulkan/GPU_Vulkan.cpp
+++ b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -18,13 +18,13 @@
 
 #include <thread>
 
-#include "base/timeutil.h"
 #include "profiler/profiler.h"
 
 #include "Common/Log.h"
-#include "Common/Serialize/Serializer.h"
 #include "Common/FileUtil.h"
 #include "Common/GraphicsContext.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/TimeUtil.h"
 
 #include "Core/Config.h"
 #include "Core/Debugger/Breakpoints.h"
diff --git a/Qt/QtMain.h b/Qt/QtMain.h
index 9a69162919..50e0396734 100644
--- a/Qt/QtMain.h
+++ b/Qt/QtMain.h
@@ -23,7 +23,7 @@ QTM_USE_NAMESPACE
 #include <thread>
 
 #include "base/display.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "file/zip_read.h"
 #include "gfx/gl_common.h"
 #include "gfx_es2/gpu_features.h"
diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index 6c882b5681..878d2da2ce 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -22,7 +22,7 @@ SDLJoystick *joystick = NULL;
 #include <locale>
 
 #include "base/display.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "ext/glslang/glslang/Public/ShaderLang.h"
 #include "image/png_load.h"
 #include "input/input_state.h"
diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp
index a061af2056..8337d13576 100644
--- a/UI/BackgroundAudio.cpp
+++ b/UI/BackgroundAudio.cpp
@@ -1,14 +1,14 @@
 #include <string>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "file/chunk_file.h"
 #include "file/vfs.h"
 #include "ui/root.h"
 
+#include "Common/CommonTypes.h"
 #include "Common/Log.h"
 #include "Common/Serialize/SerializeFuncs.h"
-#include "Common/CommonTypes.h"
+#include "Common/TimeUtil.h"
 #include "Common/FixedSizeQueue.h"
 #include "Core/HW/SimpleAudioDec.h"
 #include "Core/HLE/__sceAudio.h"
diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/ComboKeyMappingScreen.cpp
index e309ba35b3..8741168179 100644
--- a/UI/ComboKeyMappingScreen.cpp
+++ b/UI/ComboKeyMappingScreen.cpp
@@ -16,12 +16,12 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "TouchControlVisibilityScreen.h"
+#include "UI/ComboKeyMappingScreen.h"
+
 #include "Core/Config.h"
 #include "i18n/i18n.h"
-#include "ComboKeyMappingScreen.h"
 #include "base/colorutil.h"
 #include "base/display.h"
-#include "base/timeutil.h"
 #include "file/path.h"
 #include "gfx_es2/draw_buffer.h"
 #include "gfx/texture_atlas.h"
@@ -31,6 +31,8 @@
 #include "ui/view.h"
 #include "ui/viewgroup.h"
 
+#include "Common/TimeUtil.h"
+
 void ComboKeyScreen::CreateViews() {
 	using namespace UI;
 	auto co = GetI18NCategory("Controls");
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 1d44551622..a6d5b600e1 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -20,7 +20,6 @@
 #include <algorithm>
 
 #include "base/display.h"
-#include "base/timeutil.h"
 #include "profiler/profiler.h"
 
 #include "gfx/texture_atlas.h"
@@ -38,6 +37,7 @@
 
 #include "Common/KeyMap.h"
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 
 #ifndef MOBILE_DEVICE
 #include "Core/AVIDump.h"
diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp
index 1fa929f5a4..a88130091a 100644
--- a/UI/GameInfoCache.cpp
+++ b/UI/GameInfoCache.cpp
@@ -22,7 +22,6 @@
 #include <memory>
 #include <algorithm>
 
-#include "base/timeutil.h"
 #include "base/stringutil.h"
 #include "file/file_util.h"
 #include "file/zip_read.h"
@@ -31,6 +30,7 @@
 
 #include "Common/FileUtil.h"
 #include "Common/StringUtils.h"
+#include "Common/TimeUtil.h"
 #include "Core/FileSystems/ISOFileSystem.h"
 #include "Core/FileSystems/DirectoryFileSystem.h"
 #include "Core/FileSystems/VirtualDiscFileSystem.h"
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index bcb0a293c5..7b2a2b8793 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -21,7 +21,7 @@
 
 #include "base/colorutil.h"
 #include "base/stringutil.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "math/curves.h"
 #include "net/resolve.h"
 #include "gfx_es2/gpu_features.h"
diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp
index ef3a1ad2be..59b3bd4ba7 100644
--- a/UI/GamepadEmu.cpp
+++ b/UI/GamepadEmu.cpp
@@ -16,19 +16,21 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <algorithm>
+
+#include "base/colorutil.h"
+#include "base/display.h"
+#include "base/NativeApp.h"
+#include "gfx/texture_atlas.h"
+#include "math/math_util.h"
+#include "ui/ui_context.h"
+
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/System.h"
 #include "Core/HLE/sceCtrl.h"
 #include "UI/GamepadEmu.h"
-#include "base/colorutil.h"
-#include "base/display.h"
-#include "base/NativeApp.h"
-#include "base/timeutil.h"
-#include "gfx/texture_atlas.h"
-#include "math/math_util.h"
-#include "ui/ui_context.h"
 
 static u32 GetButtonColor() {
 	return g_Config.iTouchButtonStyle != 0 ? 0xFFFFFF : 0xc0b080;
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index c444568214..ac90e768f2 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -21,7 +21,6 @@
 #include "ppsspp_config.h"
 #include "base/colorutil.h"
 #include "base/display.h"
-#include "base/timeutil.h"
 #include "file/path.h"
 #include "gfx/texture_atlas.h"
 #include "gfx_es2/draw_buffer.h"
@@ -34,6 +33,7 @@
 #include "util/text/utf8.h"
 
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/System.h"
 #include "Core/Host.h"
 #include "Core/Reporting.h"
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index e88e244829..5a01b65735 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -22,7 +22,6 @@
 
 #include "base/colorutil.h"
 #include "base/display.h"
-#include "base/timeutil.h"
 #include "gfx_es2/draw_buffer.h"
 #include "math/curves.h"
 #include "i18n/i18n.h"
@@ -32,6 +31,17 @@
 #include "ui/ui.h"
 #include "util/random/rng.h"
 #include "file/vfs.h"
+
+#include "Common/TimeUtil.h"
+#include "Common/FileUtil.h"
+#include "Core/Config.h"
+#include "Core/Host.h"
+#include "Core/System.h"
+#include "Core/MIPS/JitCommon/JitCommon.h"
+#include "Core/HLE/sceUtility.h"
+#include "GPU/GPUState.h"
+#include "GPU/Common/PostShader.h"
+
 #include "UI/ControlMappingScreen.h"
 #include "UI/DisplayLayoutScreen.h"
 #include "UI/EmuScreen.h"
@@ -39,14 +49,6 @@
 #include "UI/GameSettingsScreen.h"
 #include "UI/MainScreen.h"
 #include "UI/MiscScreens.h"
-#include "Core/Config.h"
-#include "Core/Host.h"
-#include "Core/System.h"
-#include "Core/MIPS/JitCommon/JitCommon.h"
-#include "Core/HLE/sceUtility.h"
-#include "Common/FileUtil.h"
-#include "GPU/GPUState.h"
-#include "GPU/Common/PostShader.h"
 
 #ifdef _MSC_VER
 #pragma execution_character_set("utf-8")
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 445d007269..91d0b7c86e 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -45,7 +45,7 @@
 
 #include "base/display.h"
 #include "base/stringutil.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "base/NativeApp.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp
index 66517ad1c0..f45fb125d8 100644
--- a/UI/OnScreenDisplay.cpp
+++ b/UI/OnScreenDisplay.cpp
@@ -1,12 +1,13 @@
 #include "UI/OnScreenDisplay.h"
 
 #include "base/colorutil.h"
-#include "base/timeutil.h"
 #include "gfx/texture_atlas.h"
 #include "gfx_es2/draw_buffer.h"
 
 #include "ui/ui_context.h"
 
+#include "Common/TimeUtil.h"
+
 OnScreenMessages osm;
 
 void OnScreenMessagesView::Draw(UIContext &dc) {
diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp
index 8029c39671..93e8410232 100644
--- a/UI/RemoteISOScreen.cpp
+++ b/UI/RemoteISOScreen.cpp
@@ -26,7 +26,6 @@
 #endif
 
 #include "base/stringutil.h"
-#include "base/timeutil.h"
 #include "file/path.h"
 // TODO: For text align flags, probably shouldn't be in gfx_es2/...
 #include "gfx_es2/draw_buffer.h"
@@ -36,6 +35,7 @@
 #include "net/resolve.h"
 #include "net/url.h"
 #include "Common/Common.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/WebServer.h"
 #include "UI/RemoteISOScreen.h"
diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp
index 0f3ce2a45f..59d227a60f 100644
--- a/UI/SavedataScreen.cpp
+++ b/UI/SavedataScreen.cpp
@@ -20,7 +20,6 @@
 
 #include "base/colorutil.h"
 #include "base/stringutil.h"
-#include "base/timeutil.h"
 #include "gfx_es2/draw_buffer.h"
 #include "i18n/i18n.h"
 #include "math/curves.h"
@@ -35,6 +34,7 @@
 #include "UI/PauseScreen.h"
 
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/Host.h"
 #include "Core/Config.h"
 #include "Core/Loaders.h"
diff --git a/UI/TextureUtil.cpp b/UI/TextureUtil.cpp
index dc0cfa2355..284a9b019d 100644
--- a/UI/TextureUtil.cpp
+++ b/UI/TextureUtil.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 
 #include "base/colorutil.h"
-#include "base/timeutil.h"
 #include "thin3d/thin3d.h"
 #include "image/zim_load.h"
 #include "image/png_load.h"
@@ -12,7 +11,9 @@
 #include "ui/view.h"
 #include "ui/ui_context.h"
 #include "gfx_es2/draw_buffer.h"
+
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 #include "UI/TextureUtil.h"
 #include "UI/GameInfoCache.h"
 
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj
index d07e29c0a5..3405d3666f 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@@ -423,6 +423,7 @@
     <ClInclude Include="..\..\Common\ThreadSafeList.h" />
     <ClInclude Include="..\..\Common\Thunk.h" />
     <ClInclude Include="..\..\Common\Timer.h" />
+    <ClInclude Include="..\..\Common\TimeUtil.h" />
     <ClInclude Include="..\..\Common\x64Analyzer.h" />
     <ClInclude Include="..\..\Common\x64Emitter.h" />
     <ClInclude Include="pch.h" />
@@ -460,6 +461,7 @@
     <ClCompile Include="..\..\Common\ThreadPools.cpp" />
     <ClCompile Include="..\..\Common\Thunk.cpp" />
     <ClCompile Include="..\..\Common\Timer.cpp" />
+    <ClCompile Include="..\..\Common\TimeUtil.cpp" />
     <ClCompile Include="..\..\Common\x64Analyzer.cpp" />
     <ClCompile Include="..\..\Common\x64Emitter.cpp" />
     <ClCompile Include="pch.cpp">
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters
index 5a670fd890..57775b7f87 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj.filters
+++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters
@@ -35,6 +35,7 @@
     <ClCompile Include="..\..\Common\ThreadPools.cpp" />
     <ClCompile Include="..\..\Common\Thunk.cpp" />
     <ClCompile Include="..\..\Common\Timer.cpp" />
+    <ClCompile Include="..\..\Common\TimeUtil.cpp" />
     <ClCompile Include="..\..\Common\x64Analyzer.cpp" />
     <ClCompile Include="..\..\Common\x64Emitter.cpp" />
     <ClCompile Include="..\..\Common\Crypto\md5.cpp">
@@ -91,6 +92,7 @@
     <ClInclude Include="..\..\Common\ThreadSafeList.h" />
     <ClInclude Include="..\..\Common\Thunk.h" />
     <ClInclude Include="..\..\Common\Timer.h" />
+    <ClInclude Include="..\..\Common\TimeUtil.h" />
     <ClInclude Include="..\..\Common\x64Analyzer.h" />
     <ClInclude Include="..\..\Common\x64Emitter.h" />
     <ClInclude Include="..\..\Common\Crypto\md5.h">
diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj
index cce36088aa..0fba453b04 100644
--- a/UWP/NativeUWP/NativeUWP.vcxproj
+++ b/UWP/NativeUWP/NativeUWP.vcxproj
@@ -389,7 +389,6 @@
     <ClInclude Include="..\..\ext\native\base\NKCodeFromQt.h" />
     <ClInclude Include="..\..\ext\native\base\NKCodeFromSDL.h" />
     <ClInclude Include="..\..\ext\native\base\stringutil.h" />
-    <ClInclude Include="..\..\ext\native\base\timeutil.h" />
     <ClInclude Include="..\..\ext\native\data\base64.h" />
     <ClInclude Include="..\..\ext\native\data\compression.h" />
     <ClInclude Include="..\..\ext\native\data\listable.h" />
@@ -479,7 +478,6 @@
     <ClCompile Include="..\..\ext\native\base\colorutil.cpp" />
     <ClCompile Include="..\..\ext\native\base\display.cpp" />
     <ClCompile Include="..\..\ext\native\base\stringutil.cpp" />
-    <ClCompile Include="..\..\ext\native\base\timeutil.cpp" />
     <ClCompile Include="..\..\ext\native\data\base64.cpp" />
     <ClCompile Include="..\..\ext\native\data\compression.cpp" />
     <ClCompile Include="..\..\ext\native\ext\cityhash\city.cpp" />
diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters
index 5e8aaecb8d..8835c898dd 100644
--- a/UWP/NativeUWP/NativeUWP.vcxproj.filters
+++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters
@@ -79,9 +79,6 @@
     <ClCompile Include="..\..\ext\native\base\stringutil.cpp">
       <Filter>base</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\native\base\timeutil.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\native\thin3d\thin3d.cpp">
       <Filter>thin3d</Filter>
     </ClCompile>
@@ -505,9 +502,6 @@
     <ClInclude Include="..\..\ext\native\base\stringutil.h">
       <Filter>base</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\native\base\timeutil.h">
-      <Filter>base</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\native\thin3d\thin3d.h">
       <Filter>thin3d</Filter>
     </ClInclude>
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
index 5711ae0b29..373f164eaf 100644
--- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp
@@ -5,14 +5,7 @@
 #include <mutex>
 
 #include "base/basictypes.h"
-#include "Common/FileUtil.h"
-#include "Common/Log.h"
-#include "Common/LogManager.h"
-#include "Core/System.h"
-#include "Core/Loaders.h"
-#include "Core/Config.h"
 #include "base/NativeApp.h"
-#include "base/timeutil.h"
 #include "input/input_state.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
@@ -23,7 +16,17 @@
 #include "thread/threadutil.h"
 #include "thin3d/thin3d_create.h"
 #include "util/text/utf8.h"
+
 #include "Common/DirectXHelper.h"
+#include "Common/FileUtil.h"
+#include "Common/Log.h"
+#include "Common/LogManager.h"
+#include "Common/TimeUtil.h"
+
+#include "Core/System.h"
+#include "Core/Loaders.h"
+#include "Core/Config.h"
+
 #include "NKCodeFromWindowsSystem.h"
 #include "XAudioSoundStream.h"
 #include "UWPHost.h"
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 83ce9471f7..2e314b0f14 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -2,7 +2,6 @@
 #include <atomic>
 #include <thread>
 
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
 #include "i18n/i18n.h"
 #include "input/input_state.h"
@@ -11,6 +10,7 @@
 #include "Common/Log.h"
 #include "Common/StringUtils.h"
 #include "Common/GraphicsContext.h"
+#include "Common/TimeUtil.h"
 #include "Windows/EmuThread.h"
 #include "Windows/W32Util/Misc.h"
 #include "Windows/MainWindow.h"
diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index 59f6820aa5..c802848273 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -35,7 +35,7 @@
 #include "base/display.h"
 #include "base/NativeApp.h"
 #include "base/stringutil.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "i18n/i18n.h"
 #include "input/input_state.h"
 #include "input/keycodes.h"
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index a0c5c6a5af..e6531bdd31 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -53,7 +53,6 @@ struct JNIEnv {};
 #include "base/stringutil.h"
 #include "base/display.h"
 #include "base/NativeApp.h"
-#include "base/timeutil.h"
 #include "thread/threadutil.h"
 #include "file/zip_read.h"
 #include "input/input_state.h"
@@ -68,6 +67,7 @@ struct JNIEnv {};
 
 #include "Common/Log.h"
 #include "Common/GraphicsContext.h"
+#include "Common/TimeUtil.h"
 #include "AndroidGraphicsContext.h"
 #include "AndroidVulkanContext.h"
 #include "AndroidEGLContext.h"
diff --git a/ext/native/Android.mk b/ext/native/Android.mk
index 0373665117..2699df0ff8 100644
--- a/ext/native/Android.mk
+++ b/ext/native/Android.mk
@@ -10,7 +10,6 @@ LOCAL_SRC_FILES :=\
     base/backtrace.cpp \
     base/buffer.cpp \
     base/display.cpp \
-    base/timeutil.cpp \
     base/colorutil.cpp \
     base/stringutil.cpp \
     data/base64.cpp \
diff --git a/ext/native/base/CMakeLists.txt b/ext/native/base/CMakeLists.txt
index 9915f73bec..7044873bbe 100644
--- a/ext/native/base/CMakeLists.txt
+++ b/ext/native/base/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(SRCS
   colorutil.cpp
-  timeutil.cpp
   ../thread/threadutil.cpp
   display.cpp
   buffer.cpp
@@ -11,9 +10,3 @@ add_library(base STATIC ${SRCS})
 if(UNIX)
   add_definitions(-fPIC)
 endif(UNIX)
-
-add_library(timeutil STATIC timeutil.cpp)
-
-if(UNIX)
-  add_definitions(-fPIC)
-endif(UNIX)
diff --git a/ext/native/base/buffer.cpp b/ext/native/base/buffer.cpp
index e603ff059f..86ccd22480 100644
--- a/ext/native/base/buffer.cpp
+++ b/ext/native/base/buffer.cpp
@@ -18,7 +18,7 @@
 #define MSG_NOSIGNAL 0x00
 #endif
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "file/fd_util.h"
 
 #include "Common/Log.h"
diff --git a/ext/native/file/path.cpp b/ext/native/file/path.cpp
index 2bcb7e1cdb..8025878c02 100644
--- a/ext/native/file/path.cpp
+++ b/ext/native/file/path.cpp
@@ -2,7 +2,7 @@
 #include <cstring>
 #include <set>
 #include "base/stringutil.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "file/path.h"
 #include "net/http_client.h"
 #include "net/url.h"
diff --git a/ext/native/input/gesture_detector.cpp b/ext/native/input/gesture_detector.cpp
index 40bbb3c784..d73f4f9090 100644
--- a/ext/native/input/gesture_detector.cpp
+++ b/ext/native/input/gesture_detector.cpp
@@ -2,7 +2,7 @@
 // TODO:
 // Zoom gesture a la http://www.zdnet.com/blog/burnette/how-to-use-multi-touch-in-android-2-part-6-implementing-the-pinch-zoom-gesture/1847
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "input/gesture_detector.h"
 
 const float estimatedInertiaDamping = 0.75f;
diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj
index afb7f0ffed..338f014265 100644
--- a/ext/native/native.vcxproj
+++ b/ext/native/native.vcxproj
@@ -389,7 +389,6 @@
     <ClInclude Include="base\display.h" />
     <ClInclude Include="base\NativeApp.h" />
     <ClInclude Include="base\stringutil.h" />
-    <ClInclude Include="base\timeutil.h" />
     <ClInclude Include="data\base64.h" />
     <ClInclude Include="data\compression.h" />
     <ClInclude Include="data\listable.h" />
@@ -516,7 +515,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="base\stringutil.cpp" />
-    <ClCompile Include="base\timeutil.cpp" />
     <ClCompile Include="data\base64.cpp" />
     <ClCompile Include="data\compression.cpp" />
     <ClCompile Include="ext\cityhash\city.cpp">
diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters
index 91a926358b..6f6f940372 100644
--- a/ext/native/native.vcxproj.filters
+++ b/ext/native/native.vcxproj.filters
@@ -80,9 +80,6 @@
     <ClInclude Include="math\math_util.h">
       <Filter>math</Filter>
     </ClInclude>
-    <ClInclude Include="base\timeutil.h">
-      <Filter>base</Filter>
-    </ClInclude>
     <ClInclude Include="input\gesture_detector.h">
       <Filter>input</Filter>
     </ClInclude>
@@ -397,9 +394,6 @@
     <ClCompile Include="gfx\texture_atlas.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
-    <ClCompile Include="base\timeutil.cpp">
-      <Filter>base</Filter>
-    </ClCompile>
     <ClCompile Include="input\gesture_detector.cpp">
       <Filter>input</Filter>
     </ClCompile>
diff --git a/ext/native/net/http_client.cpp b/ext/native/net/http_client.cpp
index 7ff05ec99e..a8658b2ad2 100644
--- a/ext/native/net/http_client.cpp
+++ b/ext/native/net/http_client.cpp
@@ -1,5 +1,5 @@
 #include "net/http_client.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 
 #ifndef _WIN32
 #include <arpa/inet.h>
diff --git a/ext/native/net/http_server.cpp b/ext/native/net/http_server.cpp
index 1520b05873..e509ee7c0b 100644
--- a/ext/native/net/http_server.cpp
+++ b/ext/native/net/http_server.cpp
@@ -1,4 +1,4 @@
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "ppsspp_config.h"
 
 #ifdef _WIN32
diff --git a/ext/native/net/resolve.cpp b/ext/native/net/resolve.cpp
index e1479541a5..a6e07c0635 100644
--- a/ext/native/net/resolve.cpp
+++ b/ext/native/net/resolve.cpp
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #endif
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 
 namespace net {
 
diff --git a/ext/native/profiler/profiler.cpp b/ext/native/profiler/profiler.cpp
index 60dffd5154..2538dbba2e 100644
--- a/ext/native/profiler/profiler.cpp
+++ b/ext/native/profiler/profiler.cpp
@@ -8,7 +8,7 @@
 
 #include <string.h>
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "gfx_es2/draw_buffer.h"
 #include "ppsspp_config.h"
 #include "profiler/profiler.h"
diff --git a/ext/native/thin3d/VulkanQueueRunner.cpp b/ext/native/thin3d/VulkanQueueRunner.cpp
index 6ce2eb4249..91767c164d 100644
--- a/ext/native/thin3d/VulkanQueueRunner.cpp
+++ b/ext/native/thin3d/VulkanQueueRunner.cpp
@@ -1,8 +1,8 @@
 #include <unordered_map>
 
-#include "base/timeutil.h"
 #include "DataFormat.h"
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 #include "VulkanQueueRunner.h"
 #include "VulkanRenderManager.h"
 
diff --git a/ext/native/thread/prioritizedworkqueue.cpp b/ext/native/thread/prioritizedworkqueue.cpp
index dcb233f38c..24a51c7c70 100644
--- a/ext/native/thread/prioritizedworkqueue.cpp
+++ b/ext/native/thread/prioritizedworkqueue.cpp
@@ -1,7 +1,7 @@
 #include <functional>
 #include <thread>
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "thread/prioritizedworkqueue.h"
 
 #include "Common/Log.h"
diff --git a/ext/native/ui/root.cpp b/ext/native/ui/root.cpp
index 928d34dbfe..394ee2aa28 100644
--- a/ext/native/ui/root.cpp
+++ b/ext/native/ui/root.cpp
@@ -3,11 +3,11 @@
 
 #include "ppsspp_config.h"
 
-#include "base/timeutil.h"
 #include "ui/root.h"
 #include "ui/viewgroup.h"
 
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 
 namespace UI {
 
diff --git a/ext/native/ui/screen.cpp b/ext/native/ui/screen.cpp
index 32a26196cc..696d1986b6 100644
--- a/ext/native/ui/screen.cpp
+++ b/ext/native/ui/screen.cpp
@@ -1,5 +1,4 @@
 #include "base/display.h"
-#include "base/timeutil.h"
 #include "input/input_state.h"
 #include "ui/root.h"
 #include "ui/screen.h"
@@ -7,6 +6,7 @@
 #include "ui/view.h"
 
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 
 ScreenManager::ScreenManager() {
 	uiContext_ = 0;
diff --git a/ext/native/ui/ui_tween.h b/ext/native/ui/ui_tween.h
index aad4fbfa5d..57e9f69116 100644
--- a/ext/native/ui/ui_tween.h
+++ b/ext/native/ui/ui_tween.h
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cstdint>
 #include <functional>
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "ui/view.h"
 
 namespace UI {
diff --git a/ext/native/ui/view.cpp b/ext/native/ui/view.cpp
index 577fd91e1c..f457a6b73c 100644
--- a/ext/native/ui/view.cpp
+++ b/ext/native/ui/view.cpp
@@ -2,7 +2,6 @@
 #include <mutex>
 
 #include "base/stringutil.h"
-#include "base/timeutil.h"
 #include "input/input_state.h"
 #include "input/keycodes.h"
 #include "gfx_es2/draw_buffer.h"
@@ -16,6 +15,8 @@
 #include "thin3d/thin3d.h"
 #include "base/NativeApp.h"
 
+#include "Common/TimeUtil.h"
+
 namespace UI {
 
 const float ITEM_HEIGHT = 64.f;
diff --git a/ext/native/ui/viewgroup.cpp b/ext/native/ui/viewgroup.cpp
index cf96bc8db3..1a13ac27e9 100644
--- a/ext/native/ui/viewgroup.cpp
+++ b/ext/native/ui/viewgroup.cpp
@@ -1,9 +1,9 @@
+#include <algorithm>
 #include <functional>
 #include <set>
 #include <mutex>
 
 #include "base/stringutil.h"
-#include "base/timeutil.h"
 #include "input/keycodes.h"
 #include "math/curves.h"
 #include "ui/ui_context.h"
@@ -14,8 +14,7 @@
 #include "gfx_es2/draw_buffer.h"
 
 #include "Common/Log.h"
-
-#include <algorithm>
+#include "Common/TimeUtil.h"
 
 namespace UI {
 
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index 4e0cee7457..bfa385b6a3 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -9,10 +9,13 @@
 #include <jni.h>
 #endif
 
+#include "base/NativeApp.h"
 #include "file/zip_read.h"
 #include "profiler/profiler.h"
+
 #include "Common/FileUtil.h"
 #include "Common/GraphicsContext.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/Core.h"
@@ -24,8 +27,6 @@
 #include "GPU/Common/FramebufferManagerCommon.h"
 #include "Log.h"
 #include "LogManager.h"
-#include "base/NativeApp.h"
-#include "base/timeutil.h"
 
 #include "Compare.h"
 #include "StubHost.h"
diff --git a/headless/SDLHeadlessHost.cpp b/headless/SDLHeadlessHost.cpp
index b81b47a51e..75b39e9c78 100644
--- a/headless/SDLHeadlessHost.cpp
+++ b/headless/SDLHeadlessHost.cpp
@@ -22,17 +22,6 @@
 #include <cassert>
 
 #include "headless/SDLHeadlessHost.h"
-
-#include "Common/FileUtil.h"
-#include "Common/GraphicsContext.h"
-
-#include "Core/CoreParameter.h"
-#include "Core/ConfigValues.h"
-#include "Core/System.h"
-#include "GPU/Common/GPUDebugInterface.h"
-#include "GPU/GPUState.h"
-
-#include "base/timeutil.h"
 #include "gfx/gl_common.h"
 #include "gfx_es2/gpu_features.h"
 #include "file/vfs.h"
@@ -40,6 +29,16 @@
 #include "thin3d/thin3d_create.h"
 #include "thin3d/GLRenderManager.h"
 
+#include "Common/FileUtil.h"
+#include "Common/GraphicsContext.h"
+#include "Common/TimeUtil.h"
+
+#include "Core/CoreParameter.h"
+#include "Core/ConfigValues.h"
+#include "Core/System.h"
+#include "GPU/Common/GPUDebugInterface.h"
+#include "GPU/GPUState.h"
+
 const bool WINDOW_VISIBLE = false;
 const int WINDOW_WIDTH = 480;
 const int WINDOW_HEIGHT = 272;
diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp
index 18b90d72bf..5d5e79dfc7 100644
--- a/headless/WindowsHeadlessHost.cpp
+++ b/headless/WindowsHeadlessHost.cpp
@@ -19,9 +19,15 @@
 
 #include "headless/WindowsHeadlessHost.h"
 
+#include "gfx/gl_common.h"
+#include "gfx_es2/gpu_features.h"
+#include "file/vfs.h"
+#include "file/zip_read.h"
+
+#include "Common/CommonWindows.h"
 #include "Common/Log.h"
 #include "Common/FileUtil.h"
-#include "Common/CommonWindows.h"
+#include "Common/TimeUtil.h"
 
 #include "Core/CoreParameter.h"
 #include "Core/System.h"
@@ -34,12 +40,6 @@
 #include "Windows/GPU/D3D11Context.h"
 #include "Windows/GPU/WindowsVulkanContext.h"
 
-#include "base/timeutil.h"
-#include "gfx/gl_common.h"
-#include "gfx_es2/gpu_features.h"
-#include "file/vfs.h"
-#include "file/zip_read.h"
-
 const bool WINDOW_VISIBLE = false;
 const int WINDOW_WIDTH = 480;
 const int WINDOW_HEIGHT = 272;
diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm
index d07e7a26e0..c410c8156d 100644
--- a/ios/PPSSPPUIApplication.mm
+++ b/ios/PPSSPPUIApplication.mm
@@ -13,7 +13,7 @@
 #import <GLKit/GLKit.h>
 
 #include "base/display.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "file/zip_read.h"
 #include "input/input_state.h"
 #include "net/resolve.h"
diff --git a/ios/ViewController.mm b/ios/ViewController.mm
index 4741c4373e..4d748b0a88 100644
--- a/ios/ViewController.mm
+++ b/ios/ViewController.mm
@@ -13,7 +13,7 @@
 #include <cassert>
 
 #include "base/display.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "file/zip_read.h"
 #include "input/input_state.h"
 #include "net/resolve.h"
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index c4ac5d2f4e..d9e90898eb 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -153,6 +153,7 @@ SOURCES_CXX += \
 	$(COMMONDIR)/MsgHandler.cpp \
 	$(COMMONDIR)/StringUtils.cpp \
 	$(COMMONDIR)/Timer.cpp \
+	$(COMMONDIR)/TimeUtil.cpp \
 	$(COMMONDIR)/ThreadPools.cpp
 
 
@@ -216,7 +217,6 @@ SOURCES_CXX += \
 	$(EXTDIR)/native/base/colorutil.cpp \
 	$(EXTDIR)/native/base/display.cpp \
 	$(EXTDIR)/native/base/stringutil.cpp \
-	$(EXTDIR)/native/base/timeutil.cpp \
 	$(EXTDIR)/native/data/compression.cpp \
 	$(EXTDIR)/native/json/json_reader.cpp \
 	$(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \
diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
index 2b61b9f550..13f4f2c8a4 100644
--- a/libretro/libretro.cpp
+++ b/libretro/libretro.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <stdlib.h>
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "Common/FileUtil.h"
 #include "Common/Serialize/Serializer.h"
 #include "Core/Config.h"
diff --git a/unittest/JitHarness.cpp b/unittest/JitHarness.cpp
index 1569048b18..6ab64de21e 100644
--- a/unittest/JitHarness.cpp
+++ b/unittest/JitHarness.cpp
@@ -17,8 +17,8 @@
 
 #include <algorithm>
 
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
+#include "Common/TimeUtil.h"
 #include "Core/ConfigValues.h"
 #include "Core/MIPS/JitCommon/JitCommon.h"
 #include "Core/MIPS/JitCommon/JitBlockCache.h"
diff --git a/unittest/TestVertexJit.cpp b/unittest/TestVertexJit.cpp
index 75e5985888..ac00dfd532 100644
--- a/unittest/TestVertexJit.cpp
+++ b/unittest/TestVertexJit.cpp
@@ -15,8 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "base/timeutil.h"
 #include "Common/Common.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "GPU/Common/VertexDecoderCommon.h"