diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp
index aa51af0a6..87f943792 100644
--- a/renderdoc/android/android.cpp
+++ b/renderdoc/android/android.cpp
@@ -1124,7 +1124,7 @@ ExecuteResult AndroidRemoteServer::ExecuteAndInject(const char *a, const char *w
   rdcstr intentArgs = c && c[0] ? c : "";
 
   // we spin up a thread to Ping() every second, since starting a package can block for a long time.
-  volatile int32_t done = 0;
+  int32_t done = 0;
   Threading::ThreadHandle pingThread = Threading::CreateThread([&done, this]() {
     Threading::SetCurrentThreadName("Android Ping");
 
diff --git a/renderdoc/common/threading.h b/renderdoc/common/threading.h
index 49442df96..1366219ec 100644
--- a/renderdoc/common/threading.h
+++ b/renderdoc/common/threading.h
@@ -79,7 +79,7 @@ public:
   bool Trylock() { return Atomic::CmpExch32(&val, 0, 1) == 0; }
   void Unlock() { Atomic::CmpExch32(&val, 1, 0); }
 private:
-  volatile int32_t val = 0;
+  int32_t val = 0;
 };
 
 class ScopedSpinLock
diff --git a/renderdoc/core/replay_proxy.h b/renderdoc/core/replay_proxy.h
index cafc5c554..74e12e65a 100644
--- a/renderdoc/core/replay_proxy.h
+++ b/renderdoc/core/replay_proxy.h
@@ -696,8 +696,8 @@ private:
     RemoteExecution_ThreadActive = 2,
   };
 
-  volatile int32_t m_RemoteExecutionKill = 0;
-  volatile int32_t m_RemoteExecutionState = RemoteExecution_Inactive;
+  int32_t m_RemoteExecutionKill = 0;
+  int32_t m_RemoteExecutionState = RemoteExecution_Inactive;
 
   bool IsThreadIdle()
   {
diff --git a/renderdoc/core/resource_manager.cpp b/renderdoc/core/resource_manager.cpp
index f39f7a520..e14056658 100644
--- a/renderdoc/core/resource_manager.cpp
+++ b/renderdoc/core/resource_manager.cpp
@@ -29,7 +29,7 @@
 
 namespace ResourceIDGen
 {
-static volatile int64_t globalIDCounter = 1;
+static int64_t globalIDCounter = 1;
 
 ResourceId GetNewUniqueID()
 {
diff --git a/renderdoc/core/resource_manager.h b/renderdoc/core/resource_manager.h
index 91c15d866..c30a8e009 100644
--- a/renderdoc/core/resource_manager.h
+++ b/renderdoc/core/resource_manager.h
@@ -493,7 +493,7 @@ struct ResourceRecord
   bool DataWritten;
 
 protected:
-  volatile int32_t RefCount;
+  int32_t RefCount;
 
   byte *DataPtr;
   uint64_t DataOffset;
@@ -504,7 +504,7 @@ protected:
 
   int64_t GetID()
   {
-    static volatile int64_t globalIDCounter = 10;
+    static int64_t globalIDCounter = 10;
 
     return Atomic::Inc64(&globalIDCounter);
   }
diff --git a/renderdoc/driver/gl/cgl_hooks.cpp b/renderdoc/driver/gl/cgl_hooks.cpp
index d84130c9c..69a11cb8f 100644
--- a/renderdoc/driver/gl/cgl_hooks.cpp
+++ b/renderdoc/driver/gl/cgl_hooks.cpp
@@ -38,7 +38,7 @@ public:
   WrappedOpenGL driver;
   std::set<CGLContextObj> contexts;
 
-  volatile int32_t suppressed = 0;
+  int32_t suppressed = 0;
 } cglhook;
 
 CGLError GL_EXPORT_NAME(CGLCreateContext)(CGLPixelFormatObj pix, CGLContextObj share,
diff --git a/renderdoc/driver/gl/gl_manager.h b/renderdoc/driver/gl/gl_manager.h
index 03d7f9c0f..de31099e7 100644
--- a/renderdoc/driver/gl/gl_manager.h
+++ b/renderdoc/driver/gl/gl_manager.h
@@ -346,7 +346,7 @@ private:
   std::map<GLsync, ResourceId> m_SyncIDs;
   std::map<GLuint, GLsync> m_CurrentSyncs;
   std::map<ResourceId, rdcstr> m_Names;
-  volatile int64_t m_SyncName;
+  int64_t m_SyncName;
 
   struct FBOCache
   {
diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h
index 6c3767360..58e9006b3 100644
--- a/renderdoc/driver/vulkan/vk_core.h
+++ b/renderdoc/driver/vulkan/vk_core.h
@@ -294,7 +294,7 @@ private:
   CaptureState m_State;
   bool m_AppControlledCapture = false;
 
-  volatile int32_t m_ReuseEnabled = 1;
+  int32_t m_ReuseEnabled = 1;
 
   PerformanceTimer m_CaptureTimer;
 
@@ -761,7 +761,7 @@ private:
   rdcarray<VkResourceRecord *> m_ForcedReferences;
   Threading::CriticalSection m_ForcedReferencesLock;
 
-  volatile int64_t m_QueueCounter = 0;
+  int64_t m_QueueCounter = 0;
 
   rdcarray<VkResourceRecord *> GetForcedReferences()
   {
diff --git a/renderdoc/os/os_specific.cpp b/renderdoc/os/os_specific.cpp
index 7f1e631fe..08f7ef0a9 100644
--- a/renderdoc/os/os_specific.cpp
+++ b/renderdoc/os/os_specific.cpp
@@ -500,7 +500,7 @@ TEST_CASE("Test OS-specific functions", "[osspecific]")
 
   SECTION("Atomics")
   {
-    volatile int32_t value = 0;
+    int32_t value = 0;
 
     // check that thread atomics work on multiple overlapping threads
     Threading::ThreadHandle threads[numThreads];
diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h
index a639d7b24..4d3f95fa5 100644
--- a/renderdoc/os/os_specific.h
+++ b/renderdoc/os/os_specific.h
@@ -224,12 +224,12 @@ void Shutdown();
 
 namespace Atomic
 {
-int32_t Inc32(volatile int32_t *i);
-int32_t Dec32(volatile int32_t *i);
-int64_t Inc64(volatile int64_t *i);
-int64_t Dec64(volatile int64_t *i);
-int64_t ExchAdd64(volatile int64_t *i, int64_t a);
-int32_t CmpExch32(volatile int32_t *dest, int32_t oldVal, int32_t newVal);
+int32_t Inc32(int32_t *i);
+int32_t Dec32(int32_t *i);
+int64_t Inc64(int64_t *i);
+int64_t Dec64(int64_t *i);
+int64_t ExchAdd64(int64_t *i, int64_t a);
+int32_t CmpExch32(int32_t *dest, int32_t oldVal, int32_t newVal);
 };
 
 namespace Callstack
diff --git a/renderdoc/os/posix/linux/linux_hook.cpp b/renderdoc/os/posix/linux/linux_hook.cpp
index 7a594c8f9..ded7982b9 100644
--- a/renderdoc/os/posix/linux/linux_hook.cpp
+++ b/renderdoc/os/posix/linux/linux_hook.cpp
@@ -51,7 +51,7 @@ DLOPENPROC realdlopen = NULL;
 FORKPROC realfork = NULL;
 DLSYMPROC realdlsym = NULL;
 
-static volatile int32_t tlsbusyflag = 0;
+static int32_t tlsbusyflag = 0;
 
 __attribute__((visibility("default"))) void *dlopen(const char *filename, int flag)
 {
diff --git a/renderdoc/os/posix/posix_threading.cpp b/renderdoc/os/posix/posix_threading.cpp
index 0aaced195..924bb97de 100644
--- a/renderdoc/os/posix/posix_threading.cpp
+++ b/renderdoc/os/posix/posix_threading.cpp
@@ -41,32 +41,32 @@ time_t Timing::GetUTCTime()
 
 namespace Atomic
 {
-int32_t Inc32(volatile int32_t *i)
+int32_t Inc32(int32_t *i)
 {
   return __sync_add_and_fetch(i, int32_t(1));
 }
 
-int32_t Dec32(volatile int32_t *i)
+int32_t Dec32(int32_t *i)
 {
   return __sync_add_and_fetch(i, int32_t(-1));
 }
 
-int64_t Inc64(volatile int64_t *i)
+int64_t Inc64(int64_t *i)
 {
   return __sync_add_and_fetch(i, int64_t(1));
 }
 
-int64_t Dec64(volatile int64_t *i)
+int64_t Dec64(int64_t *i)
 {
   return __sync_add_and_fetch(i, int64_t(-1));
 }
 
-int64_t ExchAdd64(volatile int64_t *i, int64_t a)
+int64_t ExchAdd64(int64_t *i, int64_t a)
 {
   return __sync_add_and_fetch(i, int64_t(a));
 }
 
-int32_t CmpExch32(volatile int32_t *dest, int32_t oldVal, int32_t newVal)
+int32_t CmpExch32(int32_t *dest, int32_t oldVal, int32_t newVal)
 {
   return __sync_val_compare_and_swap(dest, oldVal, newVal);
 }
diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp
index 56c99d944..0acc5be4d 100644
--- a/renderdoc/os/win32/win32_hook.cpp
+++ b/renderdoc/os/win32/win32_hook.cpp
@@ -164,7 +164,7 @@ struct CachedHookData
 
   bool missedOrdinals;
 
-  volatile int32_t posthooking = 0;
+  int32_t posthooking = 0;
 
   void ApplyHooks(const char *modName, HMODULE module)
   {
diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp
index f04d44937..b196e8a21 100644
--- a/renderdoc/os/win32/win32_process.cpp
+++ b/renderdoc/os/win32/win32_process.cpp
@@ -1135,7 +1135,7 @@ struct GlobalHookData
     rdcwstr appinitDLLs;
   } dataNative, dataWow32;
 
-  volatile int32_t finished = 0;
+  int32_t finished = 0;
   Threading::ThreadHandle pipeThread = 0;
 };
 
diff --git a/renderdoc/os/win32/win32_threading.cpp b/renderdoc/os/win32/win32_threading.cpp
index 0d18de8d3..396c99fb8 100644
--- a/renderdoc/os/win32/win32_threading.cpp
+++ b/renderdoc/os/win32/win32_threading.cpp
@@ -54,32 +54,32 @@ time_t Timing::GetUTCTime()
 
 namespace Atomic
 {
-int32_t Inc32(volatile int32_t *i)
+int32_t Inc32(int32_t *i)
 {
   return (int32_t)InterlockedIncrement((volatile LONG *)i);
 }
 
-int32_t Dec32(volatile int32_t *i)
+int32_t Dec32(int32_t *i)
 {
   return (int32_t)InterlockedDecrement((volatile LONG *)i);
 }
 
-int64_t Inc64(volatile int64_t *i)
+int64_t Inc64(int64_t *i)
 {
   return (int64_t)InterlockedIncrement64((volatile LONG64 *)i);
 }
 
-int64_t Dec64(volatile int64_t *i)
+int64_t Dec64(int64_t *i)
 {
   return (int64_t)InterlockedDecrement64((volatile LONG64 *)i);
 }
 
-int64_t ExchAdd64(volatile int64_t *i, int64_t a)
+int64_t ExchAdd64(int64_t *i, int64_t a)
 {
   return (int64_t)InterlockedExchangeAdd64((volatile LONG64 *)i, a);
 }
 
-int32_t CmpExch32(volatile int32_t *dest, int32_t oldVal, int32_t newVal)
+int32_t CmpExch32(int32_t *dest, int32_t oldVal, int32_t newVal)
 {
   return (int32_t)InterlockedCompareExchange((volatile LONG *)dest, newVal, oldVal);
 }
diff --git a/renderdoc/replay/basic_types_tests.cpp b/renderdoc/replay/basic_types_tests.cpp
index b1673b4f6..5fa09e153 100644
--- a/renderdoc/replay/basic_types_tests.cpp
+++ b/renderdoc/replay/basic_types_tests.cpp
@@ -37,14 +37,14 @@
 
 #include "catch/catch.hpp"
 
-static volatile int32_t constructor = 0;
-static volatile int32_t moveConstructor = 0;
-static volatile int32_t valueConstructor = 0;
-static volatile int32_t copyConstructor = 0;
-static volatile int32_t destructor = 0;
-static volatile int32_t movedDestructor = 0;
-static volatile int32_t copyAssignment = 0;
-static volatile int32_t moveAssignment = 0;
+static int32_t constructor = 0;
+static int32_t moveConstructor = 0;
+static int32_t valueConstructor = 0;
+static int32_t copyConstructor = 0;
+static int32_t destructor = 0;
+static int32_t movedDestructor = 0;
+static int32_t copyAssignment = 0;
+static int32_t moveAssignment = 0;
 
 struct ConstructorCounter
 {
diff --git a/renderdoc/replay/replay_controller.h b/renderdoc/replay/replay_controller.h
index 598193183..312115298 100644
--- a/renderdoc/replay/replay_controller.h
+++ b/renderdoc/replay/replay_controller.h
@@ -235,8 +235,8 @@ private:
   APIProperties m_APIProps;
   rdcarray<rdcstr> m_GCNTargets;
 
-  volatile int32_t m_ReplayLoopCancel = 0;
-  volatile int32_t m_ReplayLoopFinished = 0;
+  int32_t m_ReplayLoopCancel = 0;
+  int32_t m_ReplayLoopFinished = 0;
 
   uint32_t m_EventID;
 
diff --git a/renderdoc/serialise/streamio_tests.cpp b/renderdoc/serialise/streamio_tests.cpp
index 8b87cf32c..7c04b61bb 100644
--- a/renderdoc/serialise/streamio_tests.cpp
+++ b/renderdoc/serialise/streamio_tests.cpp
@@ -174,7 +174,7 @@ TEST_CASE("Test stream I/O operations over the network", "[streamio][network]")
     rdcarray<uint64_t> list = {1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597};
 
     // Tracks the lifetime of each thread.
-    volatile int32_t threadA = 0, threadB = 0;
+    int32_t threadA = 0, threadB = 0;
 
     Threading::ThreadHandle recvThread =
         Threading::CreateThread([&threadA, &reader, &receivedValues]() {