diff --git a/public/client/TracyCallstack.cpp b/public/client/TracyCallstack.cpp
index e33181b2..c195ffae 100644
--- a/public/client/TracyCallstack.cpp
+++ b/public/client/TracyCallstack.cpp
@@ -67,8 +67,8 @@
 #  include "TracyProfiler.hpp"
 
 #  define DBGHELP_INIT TracyConcat( TRACY_DBGHELP_LOCK, Init() )
-#  define DBGHELP_LOCK TracyConcat( TRACY_DBGHELP_LOCK, Lock() );
-#  define DBGHELP_UNLOCK TracyConcat( TRACY_DBGHELP_LOCK, Unlock() );
+#  define DBGHELP_LOCK TracyConcat( TRACY_DBGHELP_LOCK, Lock() )
+#  define DBGHELP_UNLOCK TracyConcat( TRACY_DBGHELP_LOCK, Unlock() )
 
 extern "C"
 {
diff --git a/public/client/TracyRocprof.cpp b/public/client/TracyRocprof.cpp
index b8f9b298..c2983969 100644
--- a/public/client/TracyRocprof.cpp
+++ b/public/client/TracyRocprof.cpp
@@ -16,6 +16,7 @@
 #include <vector>
 
 #define ROCPROFILER_CALL( result, msg )                                                                                \
+    do                                                                                                                 \
     {                                                                                                                  \
         rocprofiler_status_t CHECKSTATUS = result;                                                                     \
         if( CHECKSTATUS != ROCPROFILER_STATUS_SUCCESS )                                                                \
@@ -28,7 +29,7 @@
                    << ")";                                                                                             \
             throw std::runtime_error( errmsg.str() );                                                                  \
         }                                                                                                              \
-    }
+    } while( false )
 
 namespace
 {
diff --git a/public/tracy/TracyD3D12.hpp b/public/tracy/TracyD3D12.hpp
index 7a5bfbb5..cd1f0903 100644
--- a/public/tracy/TracyD3D12.hpp
+++ b/public/tracy/TracyD3D12.hpp
@@ -54,11 +54,11 @@ using TracyD3D12Ctx = void*;
 #if TRACY_D3D12_DEBUG_LEVEL
 #   define TracyD3D12Debug(...) __VA_ARGS__
 #   ifdef _MSC_VER
-#       define TracyD3D12Break() if (IsDebuggerPresent()) __debugbreak()
+#       define TracyD3D12Break() do { if (IsDebuggerPresent()) __debugbreak(); } while(false)
 #   else
 #       define TracyD3D12Break() /* TODO */
 #   endif
-#   define TracyD3D12Assert(predicate, ...) if (predicate) {} else { __VA_ARGS__; TracyD3D12Break(); }
+#   define TracyD3D12Assert(predicate, ...) do { if (predicate) {} else { __VA_ARGS__; TracyD3D12Break(); } } while(false)
 #else
 #   define TracyD3D12Debug(...)
 #   define TracyD3D12Break()
diff --git a/public/tracy/TracyMetal.hmm b/public/tracy/TracyMetal.hmm
index 51eff5b5..fb3c1c00 100644
--- a/public/tracy/TracyMetal.hmm
+++ b/public/tracy/TracyMetal.hmm
@@ -89,7 +89,7 @@ using TracyMetalCtx = void;
 #endif//TRACY_METAL_DEBUG_MASK
 
 #if TRACY_METAL_DEBUG_MASK
-    #define TracyMetalDebugMasked(mask, ...) if constexpr (mask & TRACY_METAL_DEBUG_MASK) { __VA_ARGS__; }
+    #define TracyMetalDebugMasked(mask, ...) do { if constexpr (mask & TRACY_METAL_DEBUG_MASK) { __VA_ARGS__; } } while(false)
 #else
     #define TracyMetalDebugMasked(mask, ...)
 #endif
diff --git a/public/tracy/TracyOpenCL.hpp b/public/tracy/TracyOpenCL.hpp
index 27b65b88..4d937900 100644
--- a/public/tracy/TracyOpenCL.hpp
+++ b/public/tracy/TracyOpenCL.hpp
@@ -46,18 +46,18 @@ using TracyCLCtx = void*;
 
 #define TRACY_CL_TO_STRING_INDIRECT(T) #T
 #define TRACY_CL_TO_STRING(T) TRACY_CL_TO_STRING_INDIRECT(T)
-#define TRACY_CL_ASSERT(p) if(!(p)) {                                                         \
+#define TRACY_CL_ASSERT(p) do { if(!(p)) {                                                    \
     TracyMessageL( "TRACY_CL_ASSERT failed on " TracyFile ":" TRACY_CL_TO_STRING(TracyLine) );  \
     TRACY_ASSERT(false && "TRACY_CL_ASSERT failed");                                                \
-}
-#define TRACY_CL_CHECK_ERROR(err) if(err != CL_SUCCESS) {                    \
+} } while(false)
+#define TRACY_CL_CHECK_ERROR(err) do { if(err != CL_SUCCESS) {               \
     std::ostringstream oss;                                                  \
     oss << "TRACY_CL_CHECK_ERROR failed on " << TracyFile << ":" << TracyLine  \
         << ": error code " << err;                                           \
     auto msg = oss.str();                                                    \
     TracyMessage(msg.data(), msg.size());                                    \
     TRACY_ASSERT(false && "TRACY_CL_CHECK_ERROR failed");                          \
-}
+} } while(false)
 
 namespace tracy {
 
@@ -88,10 +88,10 @@ namespace tracy {
 
             cl_int err = CL_SUCCESS;
             cl_command_queue queue = clCreateCommandQueue(context, device, CL_QUEUE_PROFILING_ENABLE, &err);
-            TRACY_CL_CHECK_ERROR(err)
+            TRACY_CL_CHECK_ERROR(err);
             uint32_t dummyValue = 42;
             cl_mem dummyBuffer = clCreateBuffer(context, CL_MEM_WRITE_ONLY, sizeof(uint32_t), nullptr, &err);
-            TRACY_CL_CHECK_ERROR(err)
+            TRACY_CL_CHECK_ERROR(err);
             cl_event writeBufferEvent;
             TRACY_CL_CHECK_ERROR(clEnqueueWriteBuffer(queue, dummyBuffer, CL_FALSE, 0, sizeof(uint32_t), &dummyValue, 0, nullptr, &writeBufferEvent));
             TRACY_CL_CHECK_ERROR(clWaitForEvents(1, &writeBufferEvent));
diff --git a/public/tracy/TracyVulkan.hpp b/public/tracy/TracyVulkan.hpp
index f6874644..a2d3f253 100644
--- a/public/tracy/TracyVulkan.hpp
+++ b/public/tracy/TracyVulkan.hpp
@@ -491,11 +491,11 @@ private:
     void PopulateSymbolTable( VkInstance instance, PFN_vkGetInstanceProcAddr instanceProcAddr, PFN_vkGetDeviceProcAddr deviceProcAddr )
     {
 #define VK_GET_DEVICE_SYMBOL( name ) \
-        (PFN_##name)deviceProcAddr( m_device, #name );
+        (PFN_##name)deviceProcAddr( m_device, #name )
 #define VK_LOAD_DEVICE_SYMBOL( name ) \
         m_symbols.name = VK_GET_DEVICE_SYMBOL( name );
 #define VK_GET_INSTANCE_SYMBOL( name ) \
-        (PFN_##name)instanceProcAddr( instance, #name );
+        (PFN_##name)instanceProcAddr( instance, #name )
 #define VK_LOAD_INSTANCE_SYMBOL( name ) \
         m_symbols.name = VK_GET_INSTANCE_SYMBOL( name );
 
diff --git a/public/tracy/TracyWebGPU.hpp b/public/tracy/TracyWebGPU.hpp
index c4969e4c..da002a3b 100644
--- a/public/tracy/TracyWebGPU.hpp
+++ b/public/tracy/TracyWebGPU.hpp
@@ -75,11 +75,11 @@ using TracyWebGPUCtx = void*;
 #define TracyWebGPUDebug(...) __VA_ARGS__
 #if defined(_MSC_VER)
 extern "C" int32_t IsDebuggerPresent(void);
-#define TracyWebGPUBreak() if (IsDebuggerPresent()) __debugbreak()
+#define TracyWebGPUBreak() do { if (IsDebuggerPresent()) __debugbreak(); } while(false)
 #else
 #define TracyWebGPUBreak() ((void)0)
 #endif
-#define TracyWebGPUAssert(predicate, ...) if (predicate) {} else { __VA_ARGS__; TracyWebGPUBreak(); }
+#define TracyWebGPUAssert(predicate, ...) do { if (predicate) {} else { __VA_ARGS__; TracyWebGPUBreak(); } } while(false)
 #else
 #define TracyWebGPUDebug(...)
 #define TracyWebGPUBreak()