diff --git a/dpf b/dpf
index 34d75db..3f242da 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 34d75db7f01fa6b3fb95a6620bf9f6452ad704ea
+Subproject commit 3f242dad0027fe532524615352b4368d138dd091
diff --git a/plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.hpp b/plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.hpp
index 5fe1c27..f736f1f 100644
--- a/plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.hpp
+++ b/plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.hpp
@@ -26,14 +26,10 @@
 #define DISTRHO_UI_AMPLITUDE_IMPOSER_HPP_INCLUDED
 
 #include "DistrhoUI.hpp"
-
-#include "ImageSlider.hpp"
+#include "ImageWidgets.hpp"
 
 #include "DistrhoArtworkAmplitudeImposer.hpp"
 
-using DGL::Image;
-using DGL::ImageSlider;
-
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
diff --git a/plugins/CycleShifter/DistrhoUICycleShifter.hpp b/plugins/CycleShifter/DistrhoUICycleShifter.hpp
index 632a391..2b0466d 100644
--- a/plugins/CycleShifter/DistrhoUICycleShifter.hpp
+++ b/plugins/CycleShifter/DistrhoUICycleShifter.hpp
@@ -26,14 +26,10 @@
 #define DISTRHO_UI_CYCLE_SHIFTER_HPP_INCLUDED
 
 #include "DistrhoUI.hpp"
-
-#include "ImageSlider.hpp"
+#include "ImageWidgets.hpp"
 
 #include "DistrhoArtworkCycleShifter.hpp"
 
-using DGL::Image;
-using DGL::ImageSlider;
-
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
diff --git a/plugins/SoulForce/DistrhoUISoulForce.hpp b/plugins/SoulForce/DistrhoUISoulForce.hpp
index b540946..951a5c3 100644
--- a/plugins/SoulForce/DistrhoUISoulForce.hpp
+++ b/plugins/SoulForce/DistrhoUISoulForce.hpp
@@ -26,18 +26,10 @@
 #define DISTRHO_UI_SOUL_FORCE_HPP_INCLUDED
 
 #include "DistrhoUI.hpp"
-
-#include "ImageButton.hpp"
-#include "ImageKnob.hpp"
-#include "ImageSwitch.hpp"
+#include "ImageWidgets.hpp"
 
 #include "DistrhoArtworkSoulForce.hpp"
 
-using DGL::Image;
-using DGL::ImageButton;
-using DGL::ImageKnob;
-using DGL::ImageSwitch;
-
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------