diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx
index cf4853f03b2b..14b900438bd6 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -1192,7 +1192,7 @@ void UseUniquePtr::CheckDeleteParmVar(const CXXDeleteExpr* deleteExpr, const Par
     if (fn == SRCDIR "/sd/source/ui/framework/tools/FrameworkHelper.cxx")
         return;
     // actually held via shared_ptr, uses protected deleter object
-    if (fn == SRCDIR "/sd/source/ui/presenter/CanvasUpdateRequester.cxx")
+    if (fn == SRCDIR "/sd/source/console/CanvasUpdateRequester.cxx")
         return;
     // actually held via shared_ptr, uses protected deleter object
     if (fn == SRCDIR "/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx")
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 8c64e181430c..be1cdbe5caa6 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -172,7 +172,7 @@ excludelist:
     sd/source/ui/inc/tools/SlotStateListener.hxx:
     # base class has to be a complete type
     - com/sun/star/frame/XStatusListener.hpp
-    sd/source/ui/presenter/PresenterCanvas.hxx:
+    sd/source/console/PresenterCanvas.hxx:
     # base class has to be a complete type
     - com/sun/star/rendering/XSpriteCanvas.hpp
     - com/sun/star/rendering/XBitmap.hpp
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 110a1debc2c5..c886e3e8cf8f 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -350,9 +350,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/func/unmovss \
 	sd/source/ui/func/unoaprms \
 	sd/source/ui/func/unprlout \
-	sd/source/ui/presenter/CanvasUpdateRequester \
-	sd/source/ui/presenter/PresenterCanvas \
-	sd/source/ui/presenter/PresenterHelper \
 	sd/source/ui/presenter/PresenterPreviewCache \
 	sd/source/ui/presenter/SlideRenderer \
 	sd/source/ui/sidebar/AllMasterPagesSelector \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index ac9b5aac6ebb..c3bc2af86994 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -96,9 +96,11 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
     sd/source/console/AccessibleNotes \
     sd/source/console/AccessibleObject \
     sd/source/console/AccessibleParagraph \
+    sd/source/console/CanvasUpdateRequester \
     sd/source/console/PresenterAccessibility \
     sd/source/console/PresenterBitmapContainer \
     sd/source/console/PresenterButton \
+    sd/source/console/PresenterCanvas \
     sd/source/console/PresenterCanvasHelper \
     sd/source/console/PresenterConfigurationAccess \
     sd/source/console/PresenterController \
@@ -106,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
     sd/source/console/PresenterFrameworkObserver \
     sd/source/console/PresenterGeometryHelper \
     sd/source/console/PresenterHelpView \
+    sd/source/console/PresenterHelper \
     sd/source/console/PresenterNotesView \
     sd/source/console/PresenterPaintManager \
     sd/source/console/PresenterPane \
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/console/CanvasUpdateRequester.cxx
similarity index 100%
rename from sd/source/ui/presenter/CanvasUpdateRequester.cxx
rename to sd/source/console/CanvasUpdateRequester.cxx
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/console/CanvasUpdateRequester.hxx
similarity index 100%
rename from sd/source/ui/presenter/CanvasUpdateRequester.hxx
rename to sd/source/console/CanvasUpdateRequester.hxx
diff --git a/sd/source/console/PresenterBitmapContainer.cxx b/sd/source/console/PresenterBitmapContainer.cxx
index 36c259efaa97..1a885df5dc1f 100644
--- a/sd/source/console/PresenterBitmapContainer.cxx
+++ b/sd/source/console/PresenterBitmapContainer.cxx
@@ -19,7 +19,7 @@
 
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterConfigurationAccess.hxx"
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"
 
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <utility>
diff --git a/sd/source/console/PresenterBitmapContainer.hxx b/sd/source/console/PresenterBitmapContainer.hxx
index 0d0532c02236..4e79f911545e 100644
--- a/sd/source/console/PresenterBitmapContainer.hxx
+++ b/sd/source/console/PresenterBitmapContainer.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
diff --git a/sd/source/console/PresenterButton.hxx b/sd/source/console/PresenterButton.hxx
index 2d3ee149c941..14b67ebd6d84 100644
--- a/sd/source/console/PresenterButton.hxx
+++ b/sd/source/console/PresenterButton.hxx
@@ -20,8 +20,8 @@
 #pragma once
 
 #include "PresenterBitmapContainer.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterTheme.hxx"
-#include <PresenterHelper.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XPaintListener.hpp>
 #include <com/sun/star/awt/XMouseListener.hpp>
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/console/PresenterCanvas.cxx
similarity index 100%
rename from sd/source/ui/presenter/PresenterCanvas.cxx
rename to sd/source/console/PresenterCanvas.cxx
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/console/PresenterCanvas.hxx
similarity index 100%
rename from sd/source/ui/presenter/PresenterCanvas.hxx
rename to sd/source/console/PresenterCanvas.hxx
diff --git a/sd/source/console/PresenterController.hxx b/sd/source/console/PresenterController.hxx
index b26ef47b7ed5..9b25152905b2 100644
--- a/sd/source/console/PresenterController.hxx
+++ b/sd/source/console/PresenterController.hxx
@@ -20,9 +20,10 @@
 #pragma once
 
 #include "PresenterAccessibility.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaneContainer.hxx"
 #include "PresenterTheme.hxx"
-#include <PresenterHelper.hxx>
+
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/awt/XKeyListener.hpp>
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/console/PresenterHelper.cxx
similarity index 99%
rename from sd/source/ui/presenter/PresenterHelper.cxx
rename to sd/source/console/PresenterHelper.cxx
index 609993b2255d..6bd20723713a 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/console/PresenterHelper.cxx
@@ -21,8 +21,9 @@
 
 #include <cstddef>
 
-#include <PresenterHelper.hxx>
 #include "PresenterCanvas.hxx"
+#include "PresenterHelper.hxx"
+
 #include <cppcanvas/vclfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
diff --git a/sd/inc/PresenterHelper.hxx b/sd/source/console/PresenterHelper.hxx
similarity index 98%
rename from sd/inc/PresenterHelper.hxx
rename to sd/source/console/PresenterHelper.hxx
index 35f1debd7a4c..5c80d70201ba 100644
--- a/sd/inc/PresenterHelper.hxx
+++ b/sd/source/console/PresenterHelper.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "sddllapi.h"
-
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -31,7 +29,7 @@ namespace com::sun::star::uno { class XComponentContext; }
 
 namespace sd::presenter {
 
-class SD_DLLPUBLIC PresenterHelper final
+class PresenterHelper final
 {
 public:
     PresenterHelper() = delete;
diff --git a/sd/source/console/PresenterPaintManager.hxx b/sd/source/console/PresenterPaintManager.hxx
index 0575f407a427..47dd0937f8f3 100644
--- a/sd/source/console/PresenterPaintManager.hxx
+++ b/sd/source/console/PresenterPaintManager.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPAINTMANAGER_HXX
 #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPAINTMANAGER_HXX
 
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"
 
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
diff --git a/sd/source/console/PresenterPane.cxx b/sd/source/console/PresenterPane.cxx
index 39d12d2f1acd..e46d960b2a9f 100644
--- a/sd/source/console/PresenterPane.cxx
+++ b/sd/source/console/PresenterPane.cxx
@@ -19,8 +19,9 @@
 
 #include "PresenterPane.hxx"
 #include "PresenterController.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaintManager.hxx"
-#include <PresenterHelper.hxx>
+
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/console/PresenterPaneBase.hxx b/sd/source/console/PresenterPaneBase.hxx
index 146b6d4add11..4a2508fe6fff 100644
--- a/sd/source/console/PresenterPaneBase.hxx
+++ b/sd/source/console/PresenterPaneBase.hxx
@@ -19,10 +19,9 @@
 
 #pragma once
 
+#include "PresenterHelper.hxx"
 #include "PresenterPaneBorderPainter.hxx"
 
-#include <PresenterHelper.hxx>
-
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <framework/AbstractPane.hxx>
diff --git a/sd/source/console/PresenterPaneBorderPainter.cxx b/sd/source/console/PresenterPaneBorderPainter.cxx
index 0354277632f6..9e42ce47ebeb 100644
--- a/sd/source/console/PresenterPaneBorderPainter.cxx
+++ b/sd/source/console/PresenterPaneBorderPainter.cxx
@@ -20,8 +20,8 @@
 #include "PresenterPaneBorderPainter.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterGeometryHelper.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterTheme.hxx"
-#include <PresenterHelper.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
diff --git a/sd/source/console/PresenterPaneContainer.hxx b/sd/source/console/PresenterPaneContainer.hxx
index 898389716b5f..cdb0f359d79a 100644
--- a/sd/source/console/PresenterPaneContainer.hxx
+++ b/sd/source/console/PresenterPaneContainer.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANECONTAINER_HXX
 #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANECONTAINER_HXX
 
+#include "PresenterHelper.hxx"
 #include "PresenterPaneBase.hxx"
-#include <PresenterHelper.hxx>
+
 #include <com/sun/star/awt/XWindow.hpp>
 #include <ResourceId.hxx>
 #include <framework/AbstractView.hxx>
diff --git a/sd/source/console/PresenterScrollBar.cxx b/sd/source/console/PresenterScrollBar.cxx
index 3a5cddb09af9..1b0f610ceda1 100644
--- a/sd/source/console/PresenterScrollBar.cxx
+++ b/sd/source/console/PresenterScrollBar.cxx
@@ -21,10 +21,10 @@
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterGeometryHelper.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaintManager.hxx"
 #include "PresenterTimer.hxx"
 #include "PresenterUIPainter.hxx"
-#include <PresenterHelper.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
diff --git a/sd/source/console/PresenterScrollBar.hxx b/sd/source/console/PresenterScrollBar.hxx
index 5ac3e31051d4..e7da561cc7aa 100644
--- a/sd/source/console/PresenterScrollBar.hxx
+++ b/sd/source/console/PresenterScrollBar.hxx
@@ -20,7 +20,8 @@
 #pragma once
 
 #include "PresenterBitmapContainer.hxx"
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"
+
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/sd/source/console/PresenterSlideShowView.cxx b/sd/source/console/PresenterSlideShowView.cxx
index 49e432cc2895..26244cba1f0e 100644
--- a/sd/source/console/PresenterSlideShowView.cxx
+++ b/sd/source/console/PresenterSlideShowView.cxx
@@ -21,8 +21,8 @@
 #include "PresenterSlideShowView.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterGeometryHelper.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaneContainer.hxx"
-#include <PresenterHelper.hxx>
 #include <DrawController.hxx>
 #include <framework/ConfigurationController.hxx>
 #include <strings.hrc>
diff --git a/sd/source/console/PresenterSpritePane.cxx b/sd/source/console/PresenterSpritePane.cxx
index 58b546a74a05..71f86e59ff1b 100644
--- a/sd/source/console/PresenterSpritePane.cxx
+++ b/sd/source/console/PresenterSpritePane.cxx
@@ -18,8 +18,9 @@
  */
 
 #include "PresenterController.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterSpritePane.hxx"
-#include <PresenterHelper.hxx>
+
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/console/PresenterTheme.cxx b/sd/source/console/PresenterTheme.cxx
index 2f45578130de..eee575fb56e3 100644
--- a/sd/source/console/PresenterTheme.cxx
+++ b/sd/source/console/PresenterTheme.cxx
@@ -21,7 +21,8 @@
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterConfigurationAccess.hxx"
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"
+
 #include <com/sun/star/rendering/PanoseWeight.hpp>
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 09b3814f9f4f..f7be6f61c5e5 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -9076,7 +9076,6 @@ sd/inc/CustomAnimationPreset.hxx
 sd/inc/EffectMigration.hxx
 sd/inc/FactoryIds.hxx
 sd/inc/OutlinerIterator.hxx
-sd/inc/PresenterHelper.hxx
 sd/inc/PresenterPreviewCache.hxx
 sd/inc/ResourceId.hxx
 sd/inc/SlideRenderer.hxx
@@ -9124,12 +9123,15 @@ sd/source/console/AccessibleObject.cxx
 sd/source/console/AccessibleObject.hxx
 sd/source/console/AccessibleParagraph.cxx
 sd/source/console/AccessibleParagraph.hxx
+sd/source/console/CanvasUpdateRequester.cxx
 sd/source/console/PresenterAccessibility.cxx
 sd/source/console/PresenterAccessibility.hxx
 sd/source/console/PresenterBitmapContainer.cxx
 sd/source/console/PresenterBitmapContainer.hxx
 sd/source/console/PresenterButton.cxx
 sd/source/console/PresenterButton.hxx
+sd/source/console/PresenterCanvas.cxx
+sd/source/console/PresenterCanvas.hxx
 sd/source/console/PresenterCanvasHelper.cxx
 sd/source/console/PresenterCanvasHelper.hxx
 sd/source/console/PresenterConfigurationAccess.cxx
@@ -9144,6 +9146,8 @@ sd/source/console/PresenterGeometryHelper.cxx
 sd/source/console/PresenterGeometryHelper.hxx
 sd/source/console/PresenterHelpView.cxx
 sd/source/console/PresenterHelpView.hxx
+sd/source/console/PresenterHelper.cxx
+sd/source/console/PresenterHelper.hxx
 sd/source/console/PresenterNotesView.cxx
 sd/source/console/PresenterNotesView.hxx
 sd/source/console/PresenterPaintManager.cxx
@@ -9563,10 +9567,6 @@ sd/source/ui/inc/unoprnms.hxx
 sd/source/ui/inc/unosrch.hxx
 sd/source/ui/inc/unprlout.hxx
 sd/source/ui/inc/vectdlg.hxx
-sd/source/ui/presenter/CanvasUpdateRequester.cxx
-sd/source/ui/presenter/PresenterCanvas.cxx
-sd/source/ui/presenter/PresenterCanvas.hxx
-sd/source/ui/presenter/PresenterHelper.cxx
 sd/source/ui/presenter/PresenterPreviewCache.cxx
 sd/source/ui/presenter/SlideRenderer.cxx
 sd/source/ui/remotecontrol/AvahiNetworkService.cxx