diff --git a/include/app_info.hpp b/include/app_info.hpp
index e8e898119..fa6385a21 100644
--- a/include/app_info.hpp
+++ b/include/app_info.hpp
@@ -19,11 +19,17 @@
 
 #pragma once
 
+#include <STTypes.h>
 #include <adwaita.h>
 #include <fmt/core.h>
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkicontheme.h>
+#include <unordered_map>
 #include "application.hpp"
-#include "node_info_holder.hpp"  // IWYU pragma: export
-#include "tags_resources.hpp"    // IWYU pragma: export
+#include "pipe_objects.hpp"
 
 namespace ui::app_info {
 
diff --git a/include/application_ui.hpp b/include/application_ui.hpp
index 18af1f1a0..4409329a5 100644
--- a/include/application_ui.hpp
+++ b/include/application_ui.hpp
@@ -20,6 +20,9 @@
 #pragma once
 
 #include <adwaita.h>
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glibconfig.h>
 
 namespace ui::application_window {
 
diff --git a/include/apps_box.hpp b/include/apps_box.hpp
index 717df9dc4..4a3b93151 100644
--- a/include/apps_box.hpp
+++ b/include/apps_box.hpp
@@ -20,11 +20,10 @@
 #pragma once
 
 #include <adwaita.h>
-#include <algorithm>
-#include <ranges>
-#include <string>
-#include <unordered_map>
-#include "app_info.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkicontheme.h>
 #include "application.hpp"
 #include "pipeline_type.hpp"
 
diff --git a/include/autogain_preset.hpp b/include/autogain_preset.hpp
index a9db7c86e..1172ca7d4 100644
--- a/include/autogain_preset.hpp
+++ b/include/autogain_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class AutoGainPreset : public PluginPresetBase {
  public:
diff --git a/include/autogain_ui.hpp b/include/autogain_ui.hpp
index 64f96727e..3660bf23e 100644
--- a/include/autogain_ui.hpp
+++ b/include/autogain_ui.hpp
@@ -20,7 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "autogain.hpp"
 
 namespace ui::autogain_box {
 
diff --git a/include/bass_enhancer_preset.hpp b/include/bass_enhancer_preset.hpp
index 10c27ecee..ed7239a6c 100644
--- a/include/bass_enhancer_preset.hpp
+++ b/include/bass_enhancer_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class BassEnhancerPreset : public PluginPresetBase {
  public:
diff --git a/include/bass_enhancer_ui.hpp b/include/bass_enhancer_ui.hpp
index 0e56a371f..94b031ccb 100644
--- a/include/bass_enhancer_ui.hpp
+++ b/include/bass_enhancer_ui.hpp
@@ -20,7 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "bass_enhancer.hpp"
 
 namespace ui::bass_enhancer_box {
 
diff --git a/include/bass_loudness_preset.hpp b/include/bass_loudness_preset.hpp
index 10345535d..fab472745 100644
--- a/include/bass_loudness_preset.hpp
+++ b/include/bass_loudness_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class BassLoudnessPreset : public PluginPresetBase {
  public:
diff --git a/include/bass_loudness_ui.hpp b/include/bass_loudness_ui.hpp
index 03507a292..08edc4f83 100644
--- a/include/bass_loudness_ui.hpp
+++ b/include/bass_loudness_ui.hpp
@@ -20,7 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "bass_loudness.hpp"
 
 namespace ui::bass_loudness_box {
 
diff --git a/include/blocklist_menu.hpp b/include/blocklist_menu.hpp
index 533b2f78a..17ae7af8e 100644
--- a/include/blocklist_menu.hpp
+++ b/include/blocklist_menu.hpp
@@ -20,7 +20,9 @@
 #pragma once
 
 #include <adwaita.h>
-#include <string>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkpopover.h>
 #include "application.hpp"
 #include "pipeline_type.hpp"
 
diff --git a/include/client_info_holder.hpp b/include/client_info_holder.hpp
index e9128cefb..fe34dd39a 100644
--- a/include/client_info_holder.hpp
+++ b/include/client_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/compressor.hpp b/include/compressor.hpp
index a7d188b87..9834360c0 100644
--- a/include/compressor.hpp
+++ b/include/compressor.hpp
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <pipewire/context.h>
+#include <pipewire/proxy.h>
 #include <sigc++/signal.h>
 #include <sys/types.h>
 #include <span>
diff --git a/include/compressor_preset.hpp b/include/compressor_preset.hpp
index 2b1aa9e18..0ba1a8d51 100644
--- a/include/compressor_preset.hpp
+++ b/include/compressor_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class CompressorPreset : public PluginPresetBase {
  public:
diff --git a/include/compressor_ui.hpp b/include/compressor_ui.hpp
index 7d152c883..dfa09d7a5 100644
--- a/include/compressor_ui.hpp
+++ b/include/compressor_ui.hpp
@@ -20,7 +20,13 @@
 #pragma once
 
 #include <adwaita.h>
-#include "effects_base.hpp"
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
+#include "compressor.hpp"
+#include "pipe_manager.hpp"
 
 namespace ui::compressor_box {
 
diff --git a/include/convolver_menu_combine.hpp b/include/convolver_menu_combine.hpp
index 4f3b78901..f2756ea2e 100644
--- a/include/convolver_menu_combine.hpp
+++ b/include/convolver_menu_combine.hpp
@@ -20,8 +20,10 @@
 #pragma once
 
 #include <adwaita.h>
-#include <execution>
-#include <numeric>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkpopover.h>
+#include <string>
 
 namespace ui::convolver_menu_combine {
 
diff --git a/include/convolver_menu_impulses.hpp b/include/convolver_menu_impulses.hpp
index 727610951..62a4b1e43 100644
--- a/include/convolver_menu_impulses.hpp
+++ b/include/convolver_menu_impulses.hpp
@@ -20,8 +20,11 @@
 #pragma once
 
 #include <adwaita.h>
-#include <filesystem>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkpopover.h>
 #include <sndfile.hh>
+#include <string>
 #include "application.hpp"
 
 namespace ui::convolver_menu_impulses {
diff --git a/include/convolver_preset.hpp b/include/convolver_preset.hpp
index e3aafe198..b607c806b 100644
--- a/include/convolver_preset.hpp
+++ b/include/convolver_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class ConvolverPreset : public PluginPresetBase {
  public:
diff --git a/include/convolver_ui.hpp b/include/convolver_ui.hpp
index 533f3bfbf..1f61ac59f 100644
--- a/include/convolver_ui.hpp
+++ b/include/convolver_ui.hpp
@@ -21,13 +21,14 @@
 
 #include <adwaita.h>
 #include <fftw3.h>
+#include <glib-object.h>
+#include <glibconfig.h>
 #include <gsl/gsl_spline.h>
-#include <algorithm>
-#include <mutex>
-#include <numbers>
-#include <ranges>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
 #include "application.hpp"
-#include "effects_base.hpp"
+#include "convolver.hpp"
 
 namespace ui::convolver_box {
 
diff --git a/include/convolver_ui_common.hpp b/include/convolver_ui_common.hpp
index 4a05aa6d0..fb1cf811c 100644
--- a/include/convolver_ui_common.hpp
+++ b/include/convolver_ui_common.hpp
@@ -20,6 +20,8 @@
 #pragma once
 
 #include <filesystem>
+#include <string>
+#include <tuple>
 #include <vector>
 
 namespace ui::convolver {
diff --git a/include/crossfeed_preset.hpp b/include/crossfeed_preset.hpp
index fa0a33138..f6c39b63e 100644
--- a/include/crossfeed_preset.hpp
+++ b/include/crossfeed_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class CrossfeedPreset : public PluginPresetBase {
  public:
diff --git a/include/crossfeed_ui.hpp b/include/crossfeed_ui.hpp
index 7d3095641..c0d6d008d 100644
--- a/include/crossfeed_ui.hpp
+++ b/include/crossfeed_ui.hpp
@@ -25,7 +25,7 @@
 #include <gtk/gtkbox.h>
 #include <memory>
 #include <string>
-#include "effects_base.hpp"
+#include "crossfeed.hpp"
 
 namespace ui::crossfeed_box {
 
diff --git a/include/crystalizer_preset.hpp b/include/crystalizer_preset.hpp
index 9a5d71760..fe79a1e43 100644
--- a/include/crystalizer_preset.hpp
+++ b/include/crystalizer_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class CrystalizerPreset : public PluginPresetBase {
  public:
diff --git a/include/crystalizer_ui.hpp b/include/crystalizer_ui.hpp
index bc6a9bd2f..af98d91b9 100644
--- a/include/crystalizer_ui.hpp
+++ b/include/crystalizer_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 "crystalizer.hpp"
 
 namespace ui::crystalizer_box {
 
diff --git a/include/deepfilternet_preset.hpp b/include/deepfilternet_preset.hpp
index 18ebd7eed..b19cd89fd 100644
--- a/include/deepfilternet_preset.hpp
+++ b/include/deepfilternet_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class DeepFilterNetPreset : public PluginPresetBase {
  public:
diff --git a/include/deepfilternet_ui.hpp b/include/deepfilternet_ui.hpp
index 85c6a8aed..88b2589e4 100644
--- a/include/deepfilternet_ui.hpp
+++ b/include/deepfilternet_ui.hpp
@@ -20,10 +20,12 @@
 #pragma once
 
 #include <adwaita.h>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkbox.h>
+#include <memory>
+#include <string>
 #include "deepfilternet.hpp"
-#include "effects_base.hpp"
-#include "tags_resources.hpp"
-#include "ui_helpers.hpp"
 
 namespace ui::deepfilternet_box {
 
diff --git a/include/deesser_preset.hpp b/include/deesser_preset.hpp
index c262a0d29..47b7b8273 100644
--- a/include/deesser_preset.hpp
+++ b/include/deesser_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class DeesserPreset : public PluginPresetBase {
  public:
diff --git a/include/deesser_ui.hpp b/include/deesser_ui.hpp
index f8f9f386e..d02ddae09 100644
--- a/include/deesser_ui.hpp
+++ b/include/deesser_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 "deesser.hpp"
 
 namespace ui::deesser_box {
 
diff --git a/include/delay.hpp b/include/delay.hpp
index bae1a1f8a..ed3cee399 100644
--- a/include/delay.hpp
+++ b/include/delay.hpp
@@ -19,6 +19,10 @@
 
 #pragma once
 
+#include <sys/types.h>
+#include <span>
+#include <string>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 
 class Delay : public PluginBase {
diff --git a/include/delay_preset.hpp b/include/delay_preset.hpp
index 3e93df428..59b563a27 100644
--- a/include/delay_preset.hpp
+++ b/include/delay_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class DelayPreset : public PluginPresetBase {
  public:
diff --git a/include/delay_ui.hpp b/include/delay_ui.hpp
index ed1c18107..33bd6f5b4 100644
--- a/include/delay_ui.hpp
+++ b/include/delay_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 "delay.hpp"
 
 namespace ui::delay_box {
 
diff --git a/include/echo_canceller.hpp b/include/echo_canceller.hpp
index ec1261d5f..89e712e28 100644
--- a/include/echo_canceller.hpp
+++ b/include/echo_canceller.hpp
@@ -20,11 +20,16 @@
 #pragma once
 
 #include <speex/speex_echo.h>
-#include <deque>
-#include <numeric>
+#include <climits>
+#include <span>
+#include <string>
+#include <vector>
+#include "pipe_manager.hpp"
 #include "plugin_base.hpp"
 
 #include <speex/speex_preprocess.h>
+#include <speex/speexdsp_config_types.h>
+#include <sys/types.h>
 
 class EchoCanceller : public PluginBase {
  public:
diff --git a/include/echo_canceller_preset.hpp b/include/echo_canceller_preset.hpp
index 0f8c888d2..c539118dc 100644
--- a/include/echo_canceller_preset.hpp
+++ b/include/echo_canceller_preset.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
+#include <nlohmann/json_fwd.hpp>
 #include "plugin_preset_base.hpp"
+#include "preset_type.hpp"
 
 class EchoCancellerPreset : public PluginPresetBase {
  public:
diff --git a/include/echo_canceller_ui.hpp b/include/echo_canceller_ui.hpp
index b9cd6dcbc..4524833ab 100644
--- a/include/echo_canceller_ui.hpp
+++ b/include/echo_canceller_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 "echo_canceller.hpp"
 
 namespace ui::echo_canceller_box {
 
diff --git a/include/effects_base.hpp b/include/effects_base.hpp
index 12d6bcbbb..25d720ed4 100644
--- a/include/effects_base.hpp
+++ b/include/effects_base.hpp
@@ -29,38 +29,36 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "autogain.hpp"              // IWYU pragma: export
-#include "bass_enhancer.hpp"         // IWYU pragma: export
-#include "bass_loudness.hpp"         // IWYU pragma: export
-#include "compressor.hpp"            // IWYU pragma: export
-#include "convolver.hpp"             // IWYU pragma: export
-#include "crossfeed.hpp"             // IWYU pragma: export
-#include "crystalizer.hpp"           // IWYU pragma: export
-#include "deepfilternet.hpp"         // IWYU pragma: export
-#include "deesser.hpp"               // IWYU pragma: export
-#include "delay.hpp"                 // IWYU pragma: export
-#include "echo_canceller.hpp"        // IWYU pragma: export
-#include "equalizer.hpp"             // IWYU pragma: export
-#include "exciter.hpp"               // IWYU pragma: export
-#include "expander.hpp"              // IWYU pragma: export
-#include "filter.hpp"                // IWYU pragma: export
-#include "gate.hpp"                  // IWYU pragma: export
-#include "limiter.hpp"               // IWYU pragma: export
-#include "loudness.hpp"              // IWYU pragma: export
-#include "maximizer.hpp"             // IWYU pragma: export
-#include "multiband_compressor.hpp"  // IWYU pragma: export
-#include "multiband_gate.hpp"        // IWYU pragma: export
-#include "output_level.hpp"          // IWYU pragma: export
-#include "pipe_manager.hpp"          // IWYU pragma: export
-#include "pitch.hpp"                 // IWYU pragma: export
-#include "plugin_base.hpp"           // IWYU pragma: export
-#include "reverb.hpp"                // IWYU pragma: export
-#include "rnnoise.hpp"               // IWYU pragma: export
-#include "spectrum.hpp"              // IWYU pragma: export
-#include "speex.hpp"                 // IWYU pragma: export
-#include "stereo_tools.hpp"          // IWYU pragma: export
-#include "tags_resources.hpp"        // IWYU pragma: export
-#include "tags_schema.hpp"           // IWYU pragma: export
+#include "autogain.hpp"
+#include "bass_enhancer.hpp"
+#include "bass_loudness.hpp"
+#include "compressor.hpp"
+#include "convolver.hpp"
+#include "crossfeed.hpp"
+#include "crystalizer.hpp"
+#include "deepfilternet.hpp"
+#include "deesser.hpp"
+#include "delay.hpp"
+#include "echo_canceller.hpp"
+#include "equalizer.hpp"
+#include "exciter.hpp"
+#include "expander.hpp"
+#include "filter.hpp"
+#include "gate.hpp"
+#include "limiter.hpp"
+#include "loudness.hpp"
+#include "maximizer.hpp"
+#include "multiband_compressor.hpp"
+#include "multiband_gate.hpp"
+#include "output_level.hpp"
+#include "pipe_manager.hpp"
+#include "pitch.hpp"
+#include "plugin_base.hpp"
+#include "reverb.hpp"
+#include "rnnoise.hpp"
+#include "spectrum.hpp"
+#include "speex.hpp"
+#include "stereo_tools.hpp"
 
 class EffectsBase {
  public:
diff --git a/src/app_info.cpp b/src/app_info.cpp
index a63932164..228509a9c 100644
--- a/src/app_info.cpp
+++ b/src/app_info.cpp
@@ -50,6 +50,7 @@
 #include "pipe_objects.hpp"
 #include "tags_app.hpp"
 #include "tags_pipewire.hpp"
+#include "tags_resources.hpp"
 #include "ui_helpers.hpp"
 #include "util.hpp"
 
diff --git a/src/effects_base.cpp b/src/effects_base.cpp
index 6415f6ec3..45b8784e9 100644
--- a/src/effects_base.cpp
+++ b/src/effects_base.cpp
@@ -26,9 +26,40 @@
 #include <ranges>
 #include <string>
 #include <utility>
+#include "autogain.hpp"
+#include "bass_enhancer.hpp"
+#include "bass_loudness.hpp"
+#include "compressor.hpp"
+#include "convolver.hpp"
+#include "crossfeed.hpp"
+#include "crystalizer.hpp"
+#include "deepfilternet.hpp"
+#include "deesser.hpp"
+#include "delay.hpp"
+#include "echo_canceller.hpp"
+#include "equalizer.hpp"
+#include "exciter.hpp"
+#include "expander.hpp"
+#include "filter.hpp"
+#include "gate.hpp"
 #include "level_meter.hpp"
+#include "limiter.hpp"
+#include "loudness.hpp"
+#include "maximizer.hpp"
+#include "multiband_compressor.hpp"
+#include "multiband_gate.hpp"
+#include "output_level.hpp"
+#include "pipe_manager.hpp"
+#include "pitch.hpp"
+#include "plugin_base.hpp"
+#include "reverb.hpp"
+#include "rnnoise.hpp"
+#include "spectrum.hpp"
+#include "speex.hpp"
+#include "stereo_tools.hpp"
 #include "tags_app.hpp"
 #include "tags_plugin_name.hpp"
+#include "tags_schema.hpp"
 #include "util.hpp"
 
 EffectsBase::EffectsBase(std::string tag, const std::string& schema, PipeManager* pipe_manager)
diff --git a/src/equalizer.cpp b/src/equalizer.cpp
index c1c9ebe25..eead48c32 100644
--- a/src/equalizer.cpp
+++ b/src/equalizer.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "equalizer.hpp"
-#include <bits/basic_string.h>
 #include <gio/gio.h>
 #include <glib-object.h>
 #include <glib.h>
diff --git a/src/stream_output_effects.cpp b/src/stream_output_effects.cpp
index 1b06f73d1..a967abf84 100644
--- a/src/stream_output_effects.cpp
+++ b/src/stream_output_effects.cpp
@@ -34,9 +34,11 @@
 #include <thread>
 #include <vector>
 #include "effects_base.hpp"
+#include "pipe_manager.hpp"
 #include "pipe_objects.hpp"
 #include "tags_pipewire.hpp"
 #include "tags_plugin_name.hpp"
+#include "tags_schema.hpp"
 #include "util.hpp"
 
 StreamOutputEffects::StreamOutputEffects(PipeManager* pipe_manager)