diff --git a/client/TracyRingBuffer.hpp b/client/TracyRingBuffer.hpp
index bc905115..e9100e2d 100644
--- a/client/TracyRingBuffer.hpp
+++ b/client/TracyRingBuffer.hpp
@@ -1,4 +1,14 @@
+#include <atomic>
+#include <assert.h>
 #include <errno.h>
+#include <linux/perf_event.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+#include "TracyDebug.hpp"
 
 namespace tracy
 {
diff --git a/client/TracySysTrace.cpp b/client/TracySysTrace.cpp
index 30cf3e96..3dc5a3a4 100644
--- a/client/TracySysTrace.cpp
+++ b/client/TracySysTrace.cpp
@@ -618,6 +618,7 @@ void SysTraceGetExternalName( uint64_t thread, const char*& threadName, const ch
 
 #  elif defined __linux__
 
+#    include <cpuid.h>
 #    include <sys/types.h>
 #    include <sys/stat.h>
 #    include <sys/wait.h>
diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp
index 4deb1910..afa50544 100644
--- a/common/TracyQueue.hpp
+++ b/common/TracyQueue.hpp
@@ -1,6 +1,7 @@
 #ifndef __TRACYQUEUE_HPP__
 #define __TRACYQUEUE_HPP__
 
+#include <stddef.h>
 #include <stdint.h>
 
 namespace tracy
diff --git a/common/TracySocket.hpp b/common/TracySocket.hpp
index 4de4cca1..01d1a6fa 100644
--- a/common/TracySocket.hpp
+++ b/common/TracySocket.hpp
@@ -2,6 +2,7 @@
 #define __TRACYSOCKET_HPP__
 
 #include <atomic>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "TracyForceInline.hpp"
diff --git a/server/TracyFileHeader.hpp b/server/TracyFileHeader.hpp
index c5971019..a9f3d27f 100644
--- a/server/TracyFileHeader.hpp
+++ b/server/TracyFileHeader.hpp
@@ -1,6 +1,8 @@
 #ifndef __TRACYFILEHEADER_HPP__
 #define __TRACYFILEHEADER_HPP__
 
+#include <stdint.h>
+
 #include "../common/TracyForceInline.hpp"
 
 namespace tracy
diff --git a/server/TracyPrint.hpp b/server/TracyPrint.hpp
index edff5627..0ec4b416 100644
--- a/server/TracyPrint.hpp
+++ b/server/TracyPrint.hpp
@@ -24,6 +24,9 @@
 #  include <stdio.h>
 #endif
 
+#include <stdint.h>
+#include <string.h>
+
 #include "../common/TracyForceInline.hpp"
 
 namespace tracy
diff --git a/server/TracySlab.hpp b/server/TracySlab.hpp
index 17afce72..58277fb0 100644
--- a/server/TracySlab.hpp
+++ b/server/TracySlab.hpp
@@ -2,9 +2,11 @@
 #define __TRACYSLAB_HPP__
 
 #include <assert.h>
+#include <stdint.h>
 #include <vector>
 
 #include "TracyMemory.hpp"
+#include "../common/TracyForceInline.hpp"
 
 namespace tracy
 {
diff --git a/server/TracySourceView.hpp b/server/TracySourceView.hpp
index 57d3a697..572add8d 100644
--- a/server/TracySourceView.hpp
+++ b/server/TracySourceView.hpp
@@ -5,6 +5,8 @@
 #include <string>
 #include <vector>
 
+#include <imgui.h>
+
 #include "tracy_robin_hood.h"
 #include "TracyCharUtil.hpp"
 #include "TracyDecayValue.hpp"
diff --git a/server/TracyStringDiscovery.hpp b/server/TracyStringDiscovery.hpp
index 0428fed0..6b280c01 100644
--- a/server/TracyStringDiscovery.hpp
+++ b/server/TracyStringDiscovery.hpp
@@ -4,6 +4,7 @@
 #include "../common/TracyForceInline.hpp"
 #include "tracy_robin_hood.h"
 #include "TracyCharUtil.hpp"
+#include "TracyEvent.hpp"
 #include "TracyVector.hpp"
 
 namespace tracy
diff --git a/server/TracyTextureCompression.hpp b/server/TracyTextureCompression.hpp
index 179a4fa0..d5db71f4 100644
--- a/server/TracyTextureCompression.hpp
+++ b/server/TracyTextureCompression.hpp
@@ -5,6 +5,7 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "TracySlab.hpp"