diff --git a/include/maximizer.hpp b/include/maximizer.hpp
index 5fbbab038..a0edab9df 100644
--- a/include/maximizer.hpp
+++ b/include/maximizer.hpp
@@ -19,6 +19,11 @@
 
 #pragma once
 
+#include <sigc++/signal.h>
+#include <sys/types.h>
+#include <span>
+#include <string>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 
 class Maximizer : public PluginBase {
diff --git a/include/maximizer_preset.hpp b/include/maximizer_preset.hpp
index cacc44ff1..0744b86f3 100644
--- a/include/maximizer_preset.hpp
+++ b/include/maximizer_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class MaximizerPreset : public PluginPresetBase {
  public:
diff --git a/include/maximizer_ui.hpp b/include/maximizer_ui.hpp
index 72ae573d5..a085a5454 100644
--- a/include/maximizer_ui.hpp
+++ b/include/maximizer_ui.hpp
@@ -20,9 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "maximizer.hpp"
 
 namespace ui::maximizer_box {
 
diff --git a/include/module_info_holder.hpp b/include/module_info_holder.hpp
index 70f90d2d9..de2236bf2 100644
--- a/include/module_info_holder.hpp
+++ b/include/module_info_holder.hpp
@@ -19,8 +19,12 @@
 
 #pragma once
 
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gobject/gobject.h>
 #include <gtk/gtk.h>
-#include "pipe_manager.hpp"
+#include <sigc++/signal.h>
+#include "pipe_objects.hpp"
 
 namespace ui::holders {
 
diff --git a/include/multiband_compressor.hpp b/include/multiband_compressor.hpp
index c067f9b4c..2d48c9f22 100644
--- a/include/multiband_compressor.hpp
+++ b/include/multiband_compressor.hpp
@@ -19,6 +19,19 @@
 
 #pragma once
 
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <pipewire/context.h>
+#include <sigc++/signal.h>
+#include <sys/types.h>
+#include <array>
+#include <cstddef>
+#include <span>
+#include <string>
+#include <utility>
+#include <vector>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 #include "tags_multiband_compressor.hpp"
 
diff --git a/include/multiband_compressor_band_box.hpp b/include/multiband_compressor_band_box.hpp
index 3afcbfcb1..0d5a96640 100644
--- a/include/multiband_compressor_band_box.hpp
+++ b/include/multiband_compressor_band_box.hpp
@@ -20,10 +20,11 @@
 #pragma once
 
 #include <adwaita.h>
+#include <gio/gio.h>
+#include <glib-object.h>
 #include <glib/gi18n.h>
-#include "tags_multiband_compressor.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
 
 namespace ui::multiband_compressor_band_box {
 
diff --git a/include/multiband_compressor_preset.hpp b/include/multiband_compressor_preset.hpp
index d0035f25e..f9bcb31f1 100644
--- a/include/multiband_compressor_preset.hpp
+++ b/include/multiband_compressor_preset.hpp
@@ -19,7 +19,10 @@
 
 #pragma once
 
+#include <sys/types.h>
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 #include "tags_multiband_compressor.hpp"
 
 class MultibandCompressorPreset : public PluginPresetBase {
diff --git a/include/multiband_compressor_ui.hpp b/include/multiband_compressor_ui.hpp
index 40ddfb540..2c769d97c 100644
--- a/include/multiband_compressor_ui.hpp
+++ b/include/multiband_compressor_ui.hpp
@@ -20,11 +20,13 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
-#include "multiband_compressor_band_box.hpp"
-#include "node_info_holder.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "multiband_compressor.hpp"
+#include "pipe_manager.hpp"
 
 namespace ui::multiband_compressor_box {
 
diff --git a/include/multiband_gate.hpp b/include/multiband_gate.hpp
index 35d3e4417..5b33e88d6 100644
--- a/include/multiband_gate.hpp
+++ b/include/multiband_gate.hpp
@@ -19,6 +19,19 @@
 
 #pragma once
 
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <pipewire/context.h>
+#include <sigc++/signal.h>
+#include <sys/types.h>
+#include <array>
+#include <cstddef>
+#include <span>
+#include <string>
+#include <utility>
+#include <vector>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 #include "tags_multiband_gate.hpp"
 
diff --git a/include/multiband_gate_band_box.hpp b/include/multiband_gate_band_box.hpp
index 9a6bc180e..2b77f3d53 100644
--- a/include/multiband_gate_band_box.hpp
+++ b/include/multiband_gate_band_box.hpp
@@ -20,10 +20,11 @@
 #pragma once
 
 #include <adwaita.h>
+#include <gio/gio.h>
+#include <glib-object.h>
 #include <glib/gi18n.h>
-#include "tags_multiband_gate.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
 
 namespace ui::multiband_gate_band_box {
 
diff --git a/include/multiband_gate_preset.hpp b/include/multiband_gate_preset.hpp
index 0d59ef453..d66dbdb53 100644
--- a/include/multiband_gate_preset.hpp
+++ b/include/multiband_gate_preset.hpp
@@ -19,7 +19,10 @@
 
 #pragma once
 
+#include <sys/types.h>
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 #include "tags_multiband_gate.hpp"
 
 class MultibandGatePreset : public PluginPresetBase {
diff --git a/include/multiband_gate_ui.hpp b/include/multiband_gate_ui.hpp
index b61581115..578b4aeb6 100644
--- a/include/multiband_gate_ui.hpp
+++ b/include/multiband_gate_ui.hpp
@@ -20,11 +20,13 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
-#include "multiband_gate_band_box.hpp"
-#include "node_info_holder.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "multiband_gate.hpp"
+#include "pipe_manager.hpp"
 
 namespace ui::multiband_gate_box {
 
diff --git a/include/node_info_holder.hpp b/include/node_info_holder.hpp
index a490b5f66..66ff411bd 100644
--- a/include/node_info_holder.hpp
+++ b/include/node_info_holder.hpp
@@ -19,8 +19,13 @@
 
 #pragma once
 
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gobject/gobject.h>
 #include <gtk/gtk.h>
-#include "pipe_manager.hpp"
+#include <sigc++/signal.h>
+#include <string>
+#include "pipe_objects.hpp"
 
 namespace ui::holders {
 
diff --git a/include/output_level.hpp b/include/output_level.hpp
index f1518297c..43ca85510 100644
--- a/include/output_level.hpp
+++ b/include/output_level.hpp
@@ -19,6 +19,9 @@
 
 #pragma once
 
+#include <span>
+#include <string>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 
 class OutputLevel : public PluginBase {
diff --git a/include/pitch.hpp b/include/pitch.hpp
index ca34900df..dd1aa8ebb 100644
--- a/include/pitch.hpp
+++ b/include/pitch.hpp
@@ -19,8 +19,13 @@
 
 #pragma once
 
+#include <STTypes.h>
 #include <deque>
+#include <span>
+#include <string>
+#include <vector>
 #include "SoundTouch.h"
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 
 class Pitch : public PluginBase {
diff --git a/include/pitch_preset.hpp b/include/pitch_preset.hpp
index e54d85700..cb15447b5 100644
--- a/include/pitch_preset.hpp
+++ b/include/pitch_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class PitchPreset : public PluginPresetBase {
  public:
diff --git a/include/pitch_ui.hpp b/include/pitch_ui.hpp
index 2ad80362d..a165b7dc0 100644
--- a/include/pitch_ui.hpp
+++ b/include/pitch_ui.hpp
@@ -20,9 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "pitch.hpp"
 
 namespace ui::pitch_box {
 
diff --git a/include/plugins_menu.hpp b/include/plugins_menu.hpp
index de1ba00fc..cbc7f35fb 100644
--- a/include/plugins_menu.hpp
+++ b/include/plugins_menu.hpp
@@ -20,13 +20,11 @@
 #pragma once
 
 #include <adwaita.h>
-#include <string>
-#include <unordered_map>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkpopover.h>
 #include "application.hpp"
 #include "pipeline_type.hpp"
-#include "tags_plugin_name.hpp"
-#include "tags_resources.hpp"
-#include "util.hpp"
 
 namespace ui::plugins_menu {
 
diff --git a/include/preferences_general.hpp b/include/preferences_general.hpp
index 2597dd1a5..ea3f7bcb6 100644
--- a/include/preferences_general.hpp
+++ b/include/preferences_general.hpp
@@ -20,12 +20,8 @@
 #pragma once
 
 #include <adwaita.h>
-#include <filesystem>
-#include <fstream>
-#include <string>
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
-#include "util.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
 
 #ifdef ENABLE_LIBPORTAL
 #include "libportal.hpp"
diff --git a/include/preferences_spectrum.hpp b/include/preferences_spectrum.hpp
index bd92b52c6..124947e81 100644
--- a/include/preferences_spectrum.hpp
+++ b/include/preferences_spectrum.hpp
@@ -20,10 +20,8 @@
 #pragma once
 
 #include <adwaita.h>
-#include "tags_resources.hpp"
-#include "tags_schema.hpp"
-#include "ui_helpers.hpp"
-#include "util.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
 
 namespace ui::preferences::spectrum {
 
diff --git a/include/preferences_window.hpp b/include/preferences_window.hpp
index a48518611..f9cb56c9f 100644
--- a/include/preferences_window.hpp
+++ b/include/preferences_window.hpp
@@ -19,8 +19,9 @@
 
 #pragma once
 
-#include "preferences_general.hpp"
-#include "preferences_spectrum.hpp"
+#include <adwaita.h>
+#include <glib-object.h>
+#include <glibconfig.h>
 
 namespace ui::preferences::window {
 
diff --git a/include/presets_autoloading_holder.hpp b/include/presets_autoloading_holder.hpp
index 9a47459f7..e9a61956d 100644
--- a/include/presets_autoloading_holder.hpp
+++ b/include/presets_autoloading_holder.hpp
@@ -19,8 +19,11 @@
 
 #pragma once
 
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gobject/gobject.h>
 #include <gtk/gtk.h>
-#include "util.hpp"
+#include <string>
 
 namespace ui::holders {
 
diff --git a/include/presets_menu.hpp b/include/presets_menu.hpp
index 7ca0b0fc6..253c8ea81 100644
--- a/include/presets_menu.hpp
+++ b/include/presets_menu.hpp
@@ -20,10 +20,11 @@
 #pragma once
 
 #include <adwaita.h>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkpopover.h>
 #include "application.hpp"
-#include "config.h"
 #include "preset_type.hpp"
-#include "tags_resources.hpp"
 
 namespace ui::presets_menu {
 
diff --git a/include/resampler.hpp b/include/resampler.hpp
index 9a3830de4..b3d040ece 100644
--- a/include/resampler.hpp
+++ b/include/resampler.hpp
@@ -21,7 +21,6 @@
 
 #include <samplerate.h>
 #include <cmath>
-#include <span>
 #include <vector>
 
 class Resampler {
diff --git a/include/reverb.hpp b/include/reverb.hpp
index 81c261d12..92096fb6f 100644
--- a/include/reverb.hpp
+++ b/include/reverb.hpp
@@ -19,6 +19,9 @@
 
 #pragma once
 
+#include <span>
+#include <string>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 
 class Reverb : public PluginBase {
diff --git a/include/reverb_preset.hpp b/include/reverb_preset.hpp
index b5fe4c0e9..83b193b43 100644
--- a/include/reverb_preset.hpp
+++ b/include/reverb_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class ReverbPreset : public PluginPresetBase {
  public:
diff --git a/include/reverb_ui.hpp b/include/reverb_ui.hpp
index 32cb955af..1761507c2 100644
--- a/include/reverb_ui.hpp
+++ b/include/reverb_ui.hpp
@@ -20,9 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "reverb.hpp"
 
 namespace ui::reverb_box {
 
diff --git a/include/rnnoise.hpp b/include/rnnoise.hpp
index 6d261b381..da94656a1 100644
--- a/include/rnnoise.hpp
+++ b/include/rnnoise.hpp
@@ -19,6 +19,16 @@
 
 #pragma once
 
+#include <sigc++/signal.h>
+#include <sys/types.h>
+#include <algorithm>
+#include <climits>
+#include <cstddef>
+#include <memory>
+#include <span>
+#include <string>
+#include <vector>
+#include "pipe_manager.hpp"
 #ifdef ENABLE_RNNOISE
 #include <rnnoise.h>
 #endif
diff --git a/include/rnnoise_preset.hpp b/include/rnnoise_preset.hpp
index 55e66ed3a..f5e456a59 100644
--- a/include/rnnoise_preset.hpp
+++ b/include/rnnoise_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class RNNoisePreset : public PluginPresetBase {
  public:
diff --git a/include/rnnoise_ui.hpp b/include/rnnoise_ui.hpp
index c0a7d97ba..527ebe1af 100644
--- a/include/rnnoise_ui.hpp
+++ b/include/rnnoise_ui.hpp
@@ -20,11 +20,13 @@
 #pragma once
 
 #include <adwaita.h>
-#include <filesystem>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
 #include "application.hpp"
-#include "effects_base.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include "rnnoise.hpp"
 
 namespace ui::rnnoise_box {
 
diff --git a/include/speex.hpp b/include/speex.hpp
index 43c8717cf..2dd600fe3 100644
--- a/include/speex.hpp
+++ b/include/speex.hpp
@@ -20,9 +20,15 @@
 #pragma once
 
 #include <speex/speex_preprocess.h>
-
-#include <deque>
+#include <speex/speexdsp_config_types.h>
+#include <sys/types.h>
+#include <climits>
+#include <span>
+#include <string>
+#include <vector>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
+
 class Speex : public PluginBase {
  public:
   Speex(const std::string& tag, const std::string& schema, const std::string& schema_path, PipeManager* pipe_manager);
@@ -56,5 +62,4 @@ class Speex : public PluginBase {
   SpeexPreprocessState *state_left = nullptr, *state_right = nullptr;
 
   void free_speex();
-
 };
diff --git a/include/speex_preset.hpp b/include/speex_preset.hpp
index c38c1bfb0..7ee6683a1 100644
--- a/include/speex_preset.hpp
+++ b/include/speex_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class SpeexPreset : public PluginPresetBase {
  public:
diff --git a/include/speex_ui.hpp b/include/speex_ui.hpp
index 3d81d492c..dd67566dd 100644
--- a/include/speex_ui.hpp
+++ b/include/speex_ui.hpp
@@ -20,10 +20,13 @@
 #pragma once
 
 #include <adwaita.h>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
 #include "application.hpp"
-#include "effects_base.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include "speex.hpp"
 
 namespace ui::speex_box {
 
diff --git a/include/stereo_tools.hpp b/include/stereo_tools.hpp
index a2fb8984a..20de0e5fa 100644
--- a/include/stereo_tools.hpp
+++ b/include/stereo_tools.hpp
@@ -19,6 +19,9 @@
 
 #pragma once
 
+#include <span>
+#include <string>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 
 class StereoTools : public PluginBase {
diff --git a/include/stereo_tools_preset.hpp b/include/stereo_tools_preset.hpp
index d8146c4e9..a087b1de7 100644
--- a/include/stereo_tools_preset.hpp
+++ b/include/stereo_tools_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class StereoToolsPreset : public PluginPresetBase {
  public:
diff --git a/include/stereo_tools_ui.hpp b/include/stereo_tools_ui.hpp
index 59cc1cad0..01862d160 100644
--- a/include/stereo_tools_ui.hpp
+++ b/include/stereo_tools_ui.hpp
@@ -20,9 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "stereo_tools.hpp"
 
 namespace ui::stereo_tools_box {
 
diff --git a/include/stream_input_effects.hpp b/include/stream_input_effects.hpp
index 2038cff1b..0bfcd3c35 100644
--- a/include/stream_input_effects.hpp
+++ b/include/stream_input_effects.hpp
@@ -20,6 +20,8 @@
 #pragma once
 
 #include "effects_base.hpp"
+#include "pipe_manager.hpp"
+#include "pipe_objects.hpp"
 
 class StreamInputEffects : public EffectsBase {
  public:
diff --git a/include/stream_output_effects.hpp b/include/stream_output_effects.hpp
index 6238fa577..8d2f2991e 100644
--- a/include/stream_output_effects.hpp
+++ b/include/stream_output_effects.hpp
@@ -20,6 +20,8 @@
 #pragma once
 
 #include "effects_base.hpp"
+#include "pipe_manager.hpp"
+#include "pipe_objects.hpp"
 
 class StreamOutputEffects : public EffectsBase {
  public:
diff --git a/include/tags_app.hpp b/include/tags_app.hpp
index f5f33711e..bd1c096ce 100644
--- a/include/tags_app.hpp
+++ b/include/tags_app.hpp
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <string>
-
 namespace tags::app {
 
 inline constexpr auto minimum_pw_version = "0.3.44";
diff --git a/include/tags_plugin_name.hpp b/include/tags_plugin_name.hpp
index 8b4868337..ca2e8809b 100644
--- a/include/tags_plugin_name.hpp
+++ b/include/tags_plugin_name.hpp
@@ -20,11 +20,11 @@
 #pragma once
 
 #include <glib/gi18n.h>
+#include <sys/types.h>
 #include <array>
-#include <iostream>
 #include <map>
-#include <regex>
-#include "util.hpp"
+#include <string>
+#include <string_view>
 
 namespace tags::plugin_package {
 
diff --git a/include/test_signals.hpp b/include/test_signals.hpp
index 82908a418..b5eb3d2b7 100644
--- a/include/test_signals.hpp
+++ b/include/test_signals.hpp
@@ -19,10 +19,13 @@
 
 #pragma once
 
+#include <pipewire/context.h>
 #include <pipewire/filter.h>
-#include <numbers>
+#include <pipewire/proxy.h>
+#include <spa/utils/hook.h>
+#include <sys/types.h>
 #include <random>
-#include <span>
+#include <vector>
 #include "pipe_manager.hpp"
 
 enum class TestSignalType { sine_wave, gaussian, pink };