diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj
index 23761818..aef83464 100644
--- a/capture/build/win32/capture.vcxproj
+++ b/capture/build/win32/capture.vcxproj
@@ -144,7 +144,9 @@
     <ClInclude Include="..\..\..\common\TracyQueue.hpp" />
     <ClInclude Include="..\..\..\common\TracySocket.hpp" />
     <ClInclude Include="..\..\..\common\TracySystem.hpp" />
+    <ClInclude Include="..\..\..\common\tracy_benaphore.h" />
     <ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
+    <ClInclude Include="..\..\..\common\tracy_sema.h" />
     <ClInclude Include="..\..\..\server\TracyCharUtil.hpp" />
     <ClInclude Include="..\..\..\server\TracyEvent.hpp" />
     <ClInclude Include="..\..\..\server\TracyFileWrite.hpp" />
@@ -153,9 +155,7 @@
     <ClInclude Include="..\..\..\server\TracySlab.hpp" />
     <ClInclude Include="..\..\..\server\TracyVector.hpp" />
     <ClInclude Include="..\..\..\server\TracyWorker.hpp" />
-    <ClInclude Include="..\..\..\server\tracy_benaphore.h" />
     <ClInclude Include="..\..\..\server\tracy_flat_hash_map.hpp" />
-    <ClInclude Include="..\..\..\server\tracy_sema.h" />
     <ClInclude Include="..\..\src\getopt.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/capture/build/win32/capture.vcxproj.filters b/capture/build/win32/capture.vcxproj.filters
index e9183070..01444809 100644
--- a/capture/build/win32/capture.vcxproj.filters
+++ b/capture/build/win32/capture.vcxproj.filters
@@ -59,15 +59,9 @@
     <ClInclude Include="..\..\..\common\TracySystem.hpp">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\server\tracy_benaphore.h">
-      <Filter>server</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\server\tracy_flat_hash_map.hpp">
       <Filter>server</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\server\tracy_sema.h">
-      <Filter>server</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\server\TracyCharUtil.hpp">
       <Filter>server</Filter>
     </ClInclude>
@@ -98,5 +92,11 @@
     <ClInclude Include="..\..\..\common\TracyAlign.hpp">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\common\tracy_benaphore.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\tracy_sema.h">
+      <Filter>common</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/capture/src/capture.cpp b/capture/src/capture.cpp
index 17e673ad..46dff6ca 100644
--- a/capture/src/capture.cpp
+++ b/capture/src/capture.cpp
@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../../server/tracy_benaphore.h"
 #include "../../server/TracyFileWrite.hpp"
 #include "../../server/TracyMemory.hpp"
 #include "../../server/TracyWorker.hpp"
diff --git a/server/tracy_benaphore.h b/common/tracy_benaphore.h
similarity index 100%
rename from server/tracy_benaphore.h
rename to common/tracy_benaphore.h
diff --git a/server/tracy_sema.h b/common/tracy_sema.h
similarity index 100%
rename from server/tracy_sema.h
rename to common/tracy_sema.h
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index 6b930e32..0c3a74c2 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -7,9 +7,9 @@
 #include <thread>
 #include <vector>
 
+#include "../common/tracy_benaphore.h"
 #include "TracyVector.hpp"
 #include "TracyWorker.hpp"
-#include "tracy_benaphore.h"
 #include "tracy_flat_hash_map.hpp"
 
 struct ImVec2;
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index 6ff1c3bc..9c0cae1a 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -8,11 +8,11 @@
 #include <thread>
 #include <vector>
 
+#include "../common/tracy_benaphore.h"
 #include "../common/tracy_lz4.hpp"
 #include "../common/TracyForceInline.hpp"
 #include "../common/TracyQueue.hpp"
 #include "../common/TracySocket.hpp"
-#include "tracy_benaphore.h"
 #include "tracy_flat_hash_map.hpp"
 #include "TracyEvent.hpp"
 #include "TracySlab.hpp"
diff --git a/standalone/build/win32/Tracy.vcxproj b/standalone/build/win32/Tracy.vcxproj
index 50e15091..9b5101fc 100644
--- a/standalone/build/win32/Tracy.vcxproj
+++ b/standalone/build/win32/Tracy.vcxproj
@@ -103,7 +103,9 @@
     <ClInclude Include="..\..\..\common\TracyQueue.hpp" />
     <ClInclude Include="..\..\..\common\TracySocket.hpp" />
     <ClInclude Include="..\..\..\common\TracySystem.hpp" />
+    <ClInclude Include="..\..\..\common\tracy_benaphore.h" />
     <ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
+    <ClInclude Include="..\..\..\common\tracy_sema.h" />
     <ClInclude Include="..\..\..\imgui\imconfig.h" />
     <ClInclude Include="..\..\..\imgui\imgui.h" />
     <ClInclude Include="..\..\..\imgui\imgui_internal.h" />
@@ -124,10 +126,8 @@
     <ClInclude Include="..\..\..\server\TracyVector.hpp" />
     <ClInclude Include="..\..\..\server\TracyView.hpp" />
     <ClInclude Include="..\..\..\server\TracyWorker.hpp" />
-    <ClInclude Include="..\..\..\server\tracy_benaphore.h" />
     <ClInclude Include="..\..\..\server\tracy_flat_hash_map.hpp" />
     <ClInclude Include="..\..\..\server\tracy_pdqsort.h" />
-    <ClInclude Include="..\..\..\server\tracy_sema.h" />
     <ClInclude Include="..\..\libs\gl3w\GL\gl3w.h" />
     <ClInclude Include="..\..\libs\gl3w\GL\glcorearb.h" />
     <ClInclude Include="..\..\src\imgui_impl_glfw_gl3.h" />
diff --git a/standalone/build/win32/Tracy.vcxproj.filters b/standalone/build/win32/Tracy.vcxproj.filters
index 0fdd0304..fe6814c7 100644
--- a/standalone/build/win32/Tracy.vcxproj.filters
+++ b/standalone/build/win32/Tracy.vcxproj.filters
@@ -146,12 +146,6 @@
     <ClInclude Include="..\..\..\server\TracyPopcnt.hpp">
       <Filter>server</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\server\tracy_benaphore.h">
-      <Filter>server</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\server\tracy_sema.h">
-      <Filter>server</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\server\tracy_flat_hash_map.hpp">
       <Filter>server</Filter>
     </ClInclude>
@@ -167,6 +161,12 @@
     <ClInclude Include="..\..\..\common\TracyAlign.hpp">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\common\tracy_benaphore.h">
+      <Filter>imgui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\common\tracy_sema.h">
+      <Filter>imgui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="DebugVis.natvis" />