diff --git a/server/TracyImGui.cpp b/server/TracyImGui.cpp
index b7104f15..ba331a23 100644
--- a/server/TracyImGui.cpp
+++ b/server/TracyImGui.cpp
@@ -1,6 +1,12 @@
 #include <assert.h>
 #include <algorithm>
 
+#ifdef _WIN32
+#  include <malloc.h>
+#else
+#  include <alloca.h>
+#endif
+
 #include "TracyPrint.hpp"
 #include "TracyImGui.hpp"
 
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 0f0e141c..87516de6 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -2,37 +2,23 @@
 #  pragma warning( disable: 4267 )  // conversion from don't care to whatever, possible loss of data
 #endif
 
-#ifdef _WIN32
-#  include <malloc.h>
-#else
-#  include <alloca.h>
-#endif
-
 #ifdef __MINGW32__
 #  define __STDC_FORMAT_MACROS
 #endif
 #include <algorithm>
 #include <assert.h>
-#include <chrono>
 #include <inttypes.h>
-#include <limits>
 #include <math.h>
 #include <mutex>
-#include <numeric>
-#include <sstream>
-#include <stddef.h>
-#include <stdlib.h>
-#include <time.h>
 
-#include "tracy_pdqsort.h"
-#include "TracyColor.hpp"
+#include "imgui.h"
+
 #include "TracyFileRead.hpp"
 #include "TracyFilesystem.hpp"
-#include "TracyMouse.hpp"
-#include "TracyPopcnt.hpp"
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
-#include "TracySort.hpp"
 #include "TracySourceView.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 #include "../common/TracyStackFrames.hpp"
 
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index 07e7b976..81962a65 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -3,29 +3,25 @@
 
 #include <atomic>
 #include <functional>
-#include <map>
 #include <memory>
 #include <string>
 #include <thread>
 #include <vector>
 
+#include "imgui.h"
+
 #include "TracyBadVersion.hpp"
 #include "TracyBuzzAnim.hpp"
 #include "TracyDecayValue.hpp"
 #include "TracyFileWrite.hpp"
-#include "TracyImGui.hpp"
 #include "TracyShortPtr.hpp"
 #include "TracySourceContents.hpp"
-#include "TracyTexture.hpp"
 #include "TracyUserData.hpp"
 #include "TracyVector.hpp"
 #include "TracyViewData.hpp"
 #include "TracyWorker.hpp"
 #include "tracy_robin_hood.h"
 
-struct ImVec2;
-struct ImFont;
-
 namespace tracy
 {
 
diff --git a/server/TracyView_Annotations.cpp b/server/TracyView_Annotations.cpp
index 4664ae33..392bb364 100644
--- a/server/TracyView_Annotations.cpp
+++ b/server/TracyView_Annotations.cpp
@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 
diff --git a/server/TracyView_Callstack.cpp b/server/TracyView_Callstack.cpp
index 20554806..c12330bf 100644
--- a/server/TracyView_Callstack.cpp
+++ b/server/TracyView_Callstack.cpp
@@ -1,6 +1,7 @@
 #include <inttypes.h>
 
 #include "../common/TracyStackFrames.hpp"
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 
diff --git a/server/TracyView_Compare.cpp b/server/TracyView_Compare.cpp
index 4fed77ea..ac152d4b 100644
--- a/server/TracyView_Compare.cpp
+++ b/server/TracyView_Compare.cpp
@@ -2,6 +2,7 @@
 #  include "../nfd/nfd.h"
 #endif
 
+#include "TracyImGui.hpp"
 #include "TracyFileRead.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_ConnectionState.cpp b/server/TracyView_ConnectionState.cpp
index 5b7d0f88..fe79c85b 100644
--- a/server/TracyView_ConnectionState.cpp
+++ b/server/TracyView_ConnectionState.cpp
@@ -2,7 +2,9 @@
 #  include "../nfd/nfd.h"
 #endif
 
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 
 namespace tracy
diff --git a/server/TracyView_ContextSwitch.cpp b/server/TracyView_ContextSwitch.cpp
index a7400486..095b78f9 100644
--- a/server/TracyView_ContextSwitch.cpp
+++ b/server/TracyView_ContextSwitch.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_CpuData.cpp b/server/TracyView_CpuData.cpp
index f0751d74..335d7699 100644
--- a/server/TracyView_CpuData.cpp
+++ b/server/TracyView_CpuData.cpp
@@ -1,4 +1,7 @@
+#include <math.h>
+
 #include "TracyColor.hpp"
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_FrameOverview.cpp b/server/TracyView_FrameOverview.cpp
index 0e5d65f6..cab989df 100644
--- a/server/TracyView_FrameOverview.cpp
+++ b/server/TracyView_FrameOverview.cpp
@@ -1,5 +1,7 @@
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 
 namespace tracy
diff --git a/server/TracyView_FrameTimeline.cpp b/server/TracyView_FrameTimeline.cpp
index a510bf33..f99a7c0a 100644
--- a/server/TracyView_FrameTimeline.cpp
+++ b/server/TracyView_FrameTimeline.cpp
@@ -1,7 +1,10 @@
 #include <algorithm>
+#include <math.h>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 
 namespace tracy
diff --git a/server/TracyView_FrameTree.cpp b/server/TracyView_FrameTree.cpp
index e92e4843..17c11d3a 100644
--- a/server/TracyView_FrameTree.cpp
+++ b/server/TracyView_FrameTree.cpp
@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 
diff --git a/server/TracyView_Locks.cpp b/server/TracyView_Locks.cpp
index 0a9171d7..2f841a3a 100644
--- a/server/TracyView_Locks.cpp
+++ b/server/TracyView_Locks.cpp
@@ -1,6 +1,7 @@
 #include <inttypes.h>
 
 #include "TracyFilesystem.hpp"
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_Memory.cpp b/server/TracyView_Memory.cpp
index d103c80a..752a7b23 100644
--- a/server/TracyView_Memory.cpp
+++ b/server/TracyView_Memory.cpp
@@ -1,5 +1,6 @@
 #include <inttypes.h>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_Messages.cpp b/server/TracyView_Messages.cpp
index 684fa5ed..ec1203d0 100644
--- a/server/TracyView_Messages.cpp
+++ b/server/TracyView_Messages.cpp
@@ -1,4 +1,6 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 
 namespace tracy
diff --git a/server/TracyView_NotificationArea.cpp b/server/TracyView_NotificationArea.cpp
index 6f5b7356..8a421ec5 100644
--- a/server/TracyView_NotificationArea.cpp
+++ b/server/TracyView_NotificationArea.cpp
@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_Options.cpp b/server/TracyView_Options.cpp
index 8cba8fc9..11a012c9 100644
--- a/server/TracyView_Options.cpp
+++ b/server/TracyView_Options.cpp
@@ -2,6 +2,7 @@
 #include <random>
 
 #include "TracyFilesystem.hpp"
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_Playback.cpp b/server/TracyView_Playback.cpp
index 0bfccbb3..eb92f96b 100644
--- a/server/TracyView_Playback.cpp
+++ b/server/TracyView_Playback.cpp
@@ -1,4 +1,6 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 
 namespace tracy
diff --git a/server/TracyView_Plots.cpp b/server/TracyView_Plots.cpp
index b21006fc..01d96932 100644
--- a/server/TracyView_Plots.cpp
+++ b/server/TracyView_Plots.cpp
@@ -1,5 +1,6 @@
 #include <inttypes.h>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_Ranges.cpp b/server/TracyView_Ranges.cpp
index 5cc10d86..c6141e93 100644
--- a/server/TracyView_Ranges.cpp
+++ b/server/TracyView_Ranges.cpp
@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_Samples.cpp b/server/TracyView_Samples.cpp
index 8a56284f..b7f4c836 100644
--- a/server/TracyView_Samples.cpp
+++ b/server/TracyView_Samples.cpp
@@ -1,6 +1,8 @@
 #include <inttypes.h>
+#include <math.h>
 
 #include "TracyFilesystem.hpp"
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracySourceView.hpp"
diff --git a/server/TracyView_Statistics.cpp b/server/TracyView_Statistics.cpp
index bf01e260..4eb8b7fa 100644
--- a/server/TracyView_Statistics.cpp
+++ b/server/TracyView_Statistics.cpp
@@ -1,4 +1,5 @@
 #include "TracyFilesystem.hpp"
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 
diff --git a/server/TracyView_Timeline.cpp b/server/TracyView_Timeline.cpp
index 80b45ed5..a343dbe7 100644
--- a/server/TracyView_Timeline.cpp
+++ b/server/TracyView_Timeline.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracySourceView.hpp"
diff --git a/server/TracyView_TraceInfo.cpp b/server/TracyView_TraceInfo.cpp
index 569ae7fb..373b8e08 100644
--- a/server/TracyView_TraceInfo.cpp
+++ b/server/TracyView_TraceInfo.cpp
@@ -1,5 +1,6 @@
 #include <inttypes.h>
 
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 
diff --git a/server/TracyView_ZoneInfo.cpp b/server/TracyView_ZoneInfo.cpp
index ddc65e9b..45f4a8e4 100644
--- a/server/TracyView_ZoneInfo.cpp
+++ b/server/TracyView_ZoneInfo.cpp
@@ -1,6 +1,7 @@
 #include <inttypes.h>
 
 #include "TracyFilesystem.hpp"
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyMouse.hpp"
 #include "TracyView.hpp"
diff --git a/server/TracyView_ZoneTimeline.cpp b/server/TracyView_ZoneTimeline.cpp
index 23f8a105..cc837c09 100644
--- a/server/TracyView_ZoneTimeline.cpp
+++ b/server/TracyView_ZoneTimeline.cpp
@@ -1,6 +1,7 @@
 #include <inttypes.h>
 
 #include "TracyColor.hpp"
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"