Cleanup TracyView includes.

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"
 

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"
 

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
 {
 

server/TracyView_Annotations.cpp

@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 

server/TracyView_Callstack.cpp

@@ -1,6 +1,7 @@
 #include <inttypes.h>
 
 #include "../common/TracyStackFrames.hpp"
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 

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"

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

server/TracyView_ContextSwitch.cpp

@@ -1,5 +1,6 @@
 #include <algorithm>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"

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"

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

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

server/TracyView_FrameTree.cpp

@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 

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"

server/TracyView_Memory.cpp

@@ -1,5 +1,6 @@
 #include <inttypes.h>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"

server/TracyView_Messages.cpp

@@ -1,4 +1,6 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 
 namespace tracy

server/TracyView_NotificationArea.cpp

@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"

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"

server/TracyView_Playback.cpp

@@ -1,4 +1,6 @@
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
+#include "TracyTexture.hpp"
 #include "TracyView.hpp"
 
 namespace tracy

server/TracyView_Plots.cpp

@@ -1,5 +1,6 @@
 #include <inttypes.h>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"

server/TracyView_Ranges.cpp

@@ -1,3 +1,4 @@
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"

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"

server/TracyView_Statistics.cpp

@@ -1,4 +1,5 @@
 #include "TracyFilesystem.hpp"
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 

server/TracyView_Timeline.cpp

@@ -1,5 +1,6 @@
 #include <algorithm>
 
+#include "TracyImGui.hpp"
 #include "TracyMouse.hpp"
 #include "TracyPrint.hpp"
 #include "TracySourceView.hpp"

server/TracyView_TraceInfo.cpp

@@ -1,5 +1,6 @@
 #include <inttypes.h>
 
+#include "TracyImGui.hpp"
 #include "TracyPrint.hpp"
 #include "TracyView.hpp"
 

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"

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"