diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index c6f448e5..0615cf6c 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -22,7 +22,6 @@
 #include "../common/TracySocket.hpp"
 #include "../common/TracySystem.hpp"
 #include "tracy_rpmalloc.hpp"
-#include "TracyAlloc.hpp"
 #include "TracyScoped.hpp"
 #include "TracyProfiler.hpp"
 #include "TracyThread.hpp"
diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp
index aa2e8bc8..44a92d20 100644
--- a/client/TracyProfiler.hpp
+++ b/client/TracyProfiler.hpp
@@ -9,7 +9,7 @@
 #include "concurrentqueue.h"
 #include "../common/tracy_lz4.hpp"
 #include "../common/TracyQueue.hpp"
-#include "TracyAlloc.hpp"
+#include "../common/TracyAlloc.hpp"
 
 #if defined _MSC_VER || defined __CYGWIN__
 #  include <intrin.h>
diff --git a/client/TracyScoped.hpp b/client/TracyScoped.hpp
index 263cd507..c445eaaa 100644
--- a/client/TracyScoped.hpp
+++ b/client/TracyScoped.hpp
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include "../common/TracySystem.hpp"
-#include "TracyAlloc.hpp"
+#include "../common/TracyAlloc.hpp"
 #include "TracyProfiler.hpp"
 
 namespace tracy
diff --git a/client/concurrentqueue.h b/client/concurrentqueue.h
index b947d718..37b11f3d 100644
--- a/client/concurrentqueue.h
+++ b/client/concurrentqueue.h
@@ -38,7 +38,7 @@
 #  define tracy_force_inline inline
 #endif
 
-#include "TracyAlloc.hpp"
+#include "../common/TracyAlloc.hpp"
 
 #if defined(__GNUC__)
 // Disable -Wconversion warnings (spuriously triggered when Traits::size_t and
diff --git a/client/TracyAlloc.hpp b/common/TracyAlloc.hpp
similarity index 56%
rename from client/TracyAlloc.hpp
rename to common/TracyAlloc.hpp
index 15e5b6ce..8e57c8bd 100644
--- a/client/TracyAlloc.hpp
+++ b/common/TracyAlloc.hpp
@@ -1,19 +1,29 @@
 #ifndef __TRACYALLOC_HPP__
 #define __TRACYALLOC_HPP__
 
-#include "tracy_rpmalloc.hpp"
+#ifdef TRACY_ENABLE
+#  include "../client/tracy_rpmalloc.hpp"
+#endif
 
 namespace tracy
 {
 
 static inline void* tracy_malloc( size_t size )
 {
+#ifdef TRACY_ENABLE
     return rpmalloc( size );
+#else
+    return malloc( size );
+#endif
 }
 
 static inline void tracy_free( void* ptr )
 {
+#ifdef TRACY_ENABLE
     rpfree( ptr );
+#else
+    free( ptr );
+#endif
 }
 
 }