diff --git a/client/TracyCallstack.cpp b/client/TracyCallstack.cpp
index 26211aec..94a5afd4 100644
--- a/client/TracyCallstack.cpp
+++ b/client/TracyCallstack.cpp
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "TracyCallstack.hpp"
 
 #ifdef TRACY_HAS_CALLSTACK
diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index f38e631b..be4a769c 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -775,10 +775,10 @@ void Profiler::CalibrateDelay()
     auto mindiff = std::numeric_limits<int64_t>::max();
     for( int i=0; i<Iterations * 10; i++ )
     {
-        const auto t0 = GetTime();
-        const auto t1 = GetTime();
-        const auto dt = t1 - t0;
-        if( dt > 0 && dt < mindiff ) mindiff = dt;
+        const auto t0i = GetTime();
+        const auto t1i = GetTime();
+        const auto dti = t1i - t0i;
+        if( dti > 0 && dti < mindiff ) mindiff = dti;
     }
 
     m_resolution = mindiff;
diff --git a/client/concurrentqueue.h b/client/concurrentqueue.h
index 227c0d3b..76bd734e 100644
--- a/client/concurrentqueue.h
+++ b/client/concurrentqueue.h
@@ -1713,8 +1713,8 @@ private:
 	///////////////////////////
 	struct ExplicitProducer : public ProducerBase
 	{
-		explicit ExplicitProducer(ConcurrentQueue* parent) :
-			ProducerBase(parent, true),
+		explicit ExplicitProducer(ConcurrentQueue* _parent) :
+			ProducerBase(_parent, true),
 			blockIndex(nullptr),
 			pr_blockIndexSlotsUsed(0),
 			pr_blockIndexSize(EXPLICIT_INITIAL_INDEX_SIZE >> 1),
@@ -1722,7 +1722,7 @@ private:
 			pr_blockIndexEntries(nullptr),
 			pr_blockIndexRaw(nullptr)
 		{
-			size_t poolBasedIndexSize = details::ceil_to_pow_2(parent->initialBlockPoolSize) >> 1;
+			size_t poolBasedIndexSize = details::ceil_to_pow_2(_parent->initialBlockPoolSize) >> 1;
 			if (poolBasedIndexSize > pr_blockIndexSize) {
 				pr_blockIndexSize = poolBasedIndexSize;
 			}
@@ -2397,8 +2397,8 @@ private:
 	
 	struct ImplicitProducer : public ProducerBase
 	{			
-		ImplicitProducer(ConcurrentQueue* parent) :
-			ProducerBase(parent, false),
+		ImplicitProducer(ConcurrentQueue* _parent) :
+			ProducerBase(_parent, false),
 			nextBlockIndexCapacity(IMPLICIT_INITIAL_INDEX_SIZE),
 			blockIndex(nullptr)
 		{
diff --git a/client/tracy_rpmalloc.cpp b/client/tracy_rpmalloc.cpp
index cb9d75be..fdee7748 100644
--- a/client/tracy_rpmalloc.cpp
+++ b/client/tracy_rpmalloc.cpp
@@ -719,7 +719,8 @@ _memory_unmap_deferred(heap_t* heap, size_t wanted_count) {
 	do {
 		//Verify that we own the master span, otherwise re-defer to owner
 		void* next = span->next_span;
-		if (!found_span && SPAN_COUNT(span->flags) == wanted_count) {
+		size_t span_count = SPAN_COUNT(span->flags);
+		if (!found_span && span_count == wanted_count) {
 			assert(!SPAN_HAS_FLAG(span->flags, SPAN_FLAG_MASTER) || !SPAN_HAS_FLAG(span->flags, SPAN_FLAG_SUBSPAN));
 			found_span = span;
 		}
@@ -1522,9 +1523,7 @@ rpmalloc_initialize_config(const rpmalloc_config_t* config) {
 	if (config)
 		memcpy(&_memory_config, config, sizeof(rpmalloc_config_t));
 
-	int default_mapper = 0;
 	if (!_memory_config.memory_map || !_memory_config.memory_unmap) {
-		default_mapper = 1;
 		_memory_config.memory_map = _memory_map_os;
 		_memory_config.memory_unmap = _memory_unmap_os;
 	}
diff --git a/common/TracyAlloc.hpp b/common/TracyAlloc.hpp
index 8e57c8bd..3fde086e 100644
--- a/common/TracyAlloc.hpp
+++ b/common/TracyAlloc.hpp
@@ -1,6 +1,8 @@
 #ifndef __TRACYALLOC_HPP__
 #define __TRACYALLOC_HPP__
 
+#include <cstdlib>
+
 #ifdef TRACY_ENABLE
 #  include "../client/tracy_rpmalloc.hpp"
 #endif
diff --git a/common/TracySystem.cpp b/common/TracySystem.cpp
index 4e6b7ee8..bfe06266 100644
--- a/common/TracySystem.cpp
+++ b/common/TracySystem.cpp
@@ -69,17 +69,19 @@ void SetThreadName( std::thread::native_handle_type handle, const char* name )
     }
 #  endif
 #elif defined _GNU_SOURCE && !defined __EMSCRIPTEN__
-    const auto sz = strlen( name );
-    if( sz <= 15 )
     {
-        pthread_setname_np( handle, name );
-    }
-    else
-    {
-        char buf[16];
-        memcpy( buf, name, 15 );
-        buf[15] = '\0';
-        pthread_setname_np( handle, buf );
+        const auto sz = strlen( name );
+        if( sz <= 15 )
+        {
+            pthread_setname_np( handle, name );
+        }
+        else
+        {
+            char buf[16];
+            memcpy( buf, name, 15 );
+            buf[15] = '\0';
+            pthread_setname_np( handle, buf );
+        }
     }
 #endif
 #ifdef TRACY_COLLECT_THREAD_NAMES