Cleanup some header inclusions

flightlessmango · Mar 29, 2022 · 8f801ce · 8f801ce
1 parent b8e2352
commit 8f801ce
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 27 deletions.
diff --git a/src/cpu.cpp b/src/cpu.cpp
@@ -11,9 +11,7 @@
 #include <inttypes.h>
 #include <spdlog/spdlog.h>
 #include "string_utils.h"
-#include "hud_elements.h"
-#include "overlay.h"
-#include "amdgpu.h"
+#include "gpu.h"
 
 #ifndef PROCDIR
 #define PROCDIR "/proc"

diff --git a/src/hud_elements.cpp b/src/hud_elements.cpp
@@ -10,7 +10,9 @@
 #include "battery.h"
 #include "gamepad.h"
 #include "cpu.h"
+#include "gpu.h"
 #include "memory.h"
+#include "iostats.h"
 #include "mesa/util/macros.h"
 #include "string_utils.h"
 #include "app/mangoapp.h"

diff --git a/src/overlay.cpp b/src/overlay.cpp
@@ -10,22 +10,18 @@
 #include <filesystem.h>
 #include <sys/stat.h>
 #include "overlay.h"
-#include "logging.h"
 #include "cpu.h"
 #include "gpu.h"
 #include "memory.h"
 #include "timing.hpp"
 #include "mesa/util/macros.h"
-#include "string_utils.h"
 #include "battery.h"
 #include "string_utils.h"
 #include "file_utils.h"
-#include "gpu.h"
-#include "logging.h"
-#include "cpu.h"
-#include "memory.h"
 #include "pci_ids.h"
-#include "timing.hpp"
+#include "iostats.h"
+#include "amdgpu.h"
+
 
 #ifdef __linux__
 #include <libgen.h>

diff --git a/src/overlay.h b/src/overlay.h
@@ -8,13 +8,9 @@
 #include <vector>
 #include <deque>
 #include <imgui.h>
+#include "version.h"
 #include "overlay_params.h"
-#include "iostats.h"
-#include "timing.hpp"
 #include "hud_elements.h"
-#include "version.h"
-#include "gpu.h"
-#include "amdgpu.h"
 
 #ifdef HAVE_DBUS
 #include "dbus_info.h"

diff --git a/src/vulkan.cpp b/src/vulkan.cpp
@@ -34,24 +34,18 @@
 #include <list>
 #include <array>
 #include <iomanip>
+#include <inttypes.h>
 #include <spdlog/spdlog.h>
+#include <imgui.h>
 
+#include "mesa/util/macros.h" // defines "restrict" for vk_util.h
+#include "mesa/util/os_socket.h"
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_layer.h>
-
-#include "imgui.h"
-
-#include "overlay.h"
-
-// #include "util/debug.h"
-#include <inttypes.h>
-#include "mesa/util/macros.h"
-#include "mesa/util/os_time.h"
-#include "mesa/util/os_socket.h"
-
-#include "vk_enum_to_str.h"
 #include <vulkan/vk_util.h>
+#include "vk_enum_to_str.h"
 
+#include "overlay.h"
 #include "notify.h"
 #include "blacklist.h"
 #include "pci_ids.h"