diff --git a/client/TracyCallstack.h b/client/TracyCallstack.h
index 06c9a595..6a125010 100644
--- a/client/TracyCallstack.h
+++ b/client/TracyCallstack.h
@@ -6,9 +6,8 @@
 #endif
 
 #if defined _WIN32
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
-      !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#  else
+#  include "../common/TracyUwp.hpp"
+#  ifndef TRACY_UWP
 #    define TRACY_HAS_CALLSTACK 1
 #  endif
 #elif defined __ANDROID__
diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index fc3c3b8c..9723b301 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -9,11 +9,7 @@
 #  include <tlhelp32.h>
 #  include <inttypes.h>
 #  include <intrin.h>
-
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
-      !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#    define TRACY_ON_UWP
-#  endif
+#  include "../common/TracyUwp.hpp"
 #else
 #  include <sys/time.h>
 #  include <sys/param.h>
@@ -319,7 +315,7 @@ static void InitFailure( const char* msg )
     }
     else
     {
-#  if !defined TRACY_ON_UWP
+#  ifndef TRACY_UWP
         MessageBoxA( nullptr, msg, "Tracy Profiler initialization failure", MB_ICONSTOP );
 #  endif
     }
@@ -447,11 +443,12 @@ static const char* GetHostInfo()
     static char buf[1024];
     auto ptr = buf;
 #if defined _WIN32
-#  if defined TRACY_ON_UWP
-    ptr += sprintf(ptr, "OS: Windows 10\n");
+#  ifdef TRACY_UWP
+    auto GetVersion = &::GetVersionEx;
 #  else
-    t_RtlGetVersion RtlGetVersion = (t_RtlGetVersion)GetProcAddress( GetModuleHandleA( "ntdll.dll" ), "RtlGetVersion" );
-    if( !RtlGetVersion )
+    auto GetVersion = (t_RtlGetVersion)GetProcAddress( GetModuleHandleA( "ntdll.dll" ), "RtlGetVersion" );
+#  endif
+    if( !GetVersion )
     {
 #    ifdef __MINGW32__
         ptr += sprintf( ptr, "OS: Windows (MingW)\n" );
@@ -462,7 +459,7 @@ static const char* GetHostInfo()
     else
     {
         RTL_OSVERSIONINFOW ver = { sizeof( RTL_OSVERSIONINFOW ) };
-        RtlGetVersion( &ver );
+        GetVersion( &ver );
 
 #    ifdef __MINGW32__
         ptr += sprintf( ptr, "OS: Windows %i.%i.%i (MingW)\n", (int)ver.dwMajorVersion, (int)ver.dwMinorVersion, (int)ver.dwBuildNumber );
@@ -470,7 +467,6 @@ static const char* GetHostInfo()
         ptr += sprintf( ptr, "OS: Windows %i.%i.%i\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber );
 #    endif
     }
-#  endif
 #elif defined __linux__
     struct utsname utsName;
     uname( &utsName );
@@ -519,15 +515,15 @@ static const char* GetHostInfo()
     char hostname[512];
     gethostname( hostname, 512 );
 
-#  if defined TRACY_ON_UWP
-    ptr += sprintf(ptr, "Hostname: %s\n", hostname);
+#  ifdef TRACY_UWP
+    const char* user = "";
 #  else
     DWORD userSz = UNLEN+1;
     char user[UNLEN+1];
     GetUserNameA( user, &userSz );
+#  endif
 
     ptr += sprintf( ptr, "User: %s@%s\n", user, hostname );
-#  endif
 #else
     char hostname[_POSIX_HOST_NAME_MAX]{};
     char user[_POSIX_LOGIN_NAME_MAX]{};
@@ -722,7 +718,7 @@ static BroadcastMessage& GetBroadcastMessage( const char* procname, size_t pnsz,
     return msg;
 }
 
-#if defined _WIN32 && !defined TRACY_ON_UWP
+#if defined _WIN32 && !defined TRACY_UWP
 static DWORD s_profilerThreadId = 0;
 static char s_crashText[1024];
 
@@ -1397,7 +1393,7 @@ void Profiler::SpawnWorkerThreads()
     new(s_symbolThread) Thread( LaunchSymbolWorker, this );
 #endif
 
-#if defined _WIN32 && !defined TRACY_ON_UWP
+#if defined _WIN32 && !defined TRACY_UWP
     s_profilerThreadId = GetThreadId( s_thread->Handle() );
     m_exceptionHandler = AddVectoredExceptionHandler( 1, CrashFilter );
 #endif
@@ -1431,7 +1427,7 @@ Profiler::~Profiler()
 {
     m_shutdown.store( true, std::memory_order_relaxed );
 
-#if defined _WIN32 && !defined TRACY_ON_UWP
+#if defined _WIN32 && !defined TRACY_UWP
     if( m_crashHandlerInstalled ) RemoveVectoredExceptionHandler( m_exceptionHandler );
 #endif
 
@@ -3549,7 +3545,7 @@ void Profiler::ReportTopology()
     };
 
 #if defined _WIN32
-#  if defined TRACY_ON_UWP
+#  ifdef TRACY_UWP
     t_GetLogicalProcessorInformationEx _GetLogicalProcessorInformationEx = &::GetLogicalProcessorInformationEx;
 #  else
     t_GetLogicalProcessorInformationEx _GetLogicalProcessorInformationEx = (t_GetLogicalProcessorInformationEx)GetProcAddress( GetModuleHandleA( "kernel32.dll" ), "GetLogicalProcessorInformationEx" );
diff --git a/client/TracySysTrace.hpp b/client/TracySysTrace.hpp
index e1b50bee..8c663cd7 100644
--- a/client/TracySysTrace.hpp
+++ b/client/TracySysTrace.hpp
@@ -2,9 +2,8 @@
 #define __TRACYSYSTRACE_HPP__
 
 #if !defined TRACY_NO_SYSTEM_TRACING && ( defined _WIN32 || defined __linux__ )
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
-      !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#  else
+#  include "../common/TracyUwp.hpp"
+#  ifndef TRACY_UWP
 #    define TRACY_HAS_SYSTEM_TRACING
 #  endif
 #endif
diff --git a/common/TracySystem.cpp b/common/TracySystem.cpp
index 63b88691..b9754d33 100644
--- a/common/TracySystem.cpp
+++ b/common/TracySystem.cpp
@@ -10,11 +10,7 @@
 #  endif
 #  include <windows.h>
 #  include <malloc.h>
-
-#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
-      !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#    define TRACY_ON_UWP
-#  endif
+#  include "TracyUwp.hpp"
 #else
 #  include <pthread.h>
 #  include <string.h>
@@ -132,7 +128,7 @@ void ThreadNameMsvcMagic( const THREADNAME_INFO& info )
 TRACY_API void SetThreadName( const char* name )
 {
 #if defined _WIN32
-#  if defined TRACY_ON_UWP
+#  ifdef TRACY_UWP
     static auto _SetThreadDescription = &::SetThreadDescription;
 #  else
     static auto _SetThreadDescription = (t_SetThreadDescription)GetProcAddress( GetModuleHandleA( "kernel32.dll" ), "SetThreadDescription" );
@@ -200,7 +196,7 @@ TRACY_API const char* GetThreadName( uint32_t id )
     }
 #else
 #  if defined _WIN32
-#    if defined TRACY_ON_UWP
+#    ifdef TRACY_UWP
     static auto _GetThreadDescription = &::GetThreadDescription;
 #    else
     static auto _GetThreadDescription = (t_GetThreadDescription)GetProcAddress( GetModuleHandleA( "kernel32.dll" ), "GetThreadDescription" );
diff --git a/common/TracyUwp.hpp b/common/TracyUwp.hpp
new file mode 100644
index 00000000..7dce96b9
--- /dev/null
+++ b/common/TracyUwp.hpp
@@ -0,0 +1,11 @@
+#ifndef __TRACYUWP_HPP__
+#define __TRACYUWP_HPP__
+
+#ifdef _WIN32
+#  include <winapifamily.h>
+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#    define TRACY_UWP
+#  endif
+#endif
+
+#endif